commit kernel-source for openSUSE:Factory
Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2017-02-25 00:48:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2017-02-20 13:10:30.759141290 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes 2017-02-25 00:48:10.729776118 +0100 @@ -1,0 +2,6 @@ +Mon Feb 20 14:08:30 CET 2017 - jeffm@suse.com + +- Update to 4.10-final. +- commit 12a7a6d + +------------------------------------------------------------------- @@ -13,0 +20,13 @@ +Thu Feb 16 17:33:27 CET 2017 - jeffm@suse.com + +- btrfs: use the new VFS super_block_dev (bnc#865869). +- commit f064a41 + +------------------------------------------------------------------- +Thu Feb 16 17:33:14 CET 2017 - jeffm@suse.com + +- fs/super.c: add new super block sub devices super_block_dev + (bnc#865869). +- commit 47c7d30 + +------------------------------------------------------------------- @@ -35,0 +55,15 @@ +Mon Feb 13 15:04:27 CET 2017 - jeffm@suse.com + +- Update to 4.10-rc8. +- Eliminated 1 patch. +- commit e195904 + +------------------------------------------------------------------- +Fri Feb 10 10:29:43 CET 2017 - jslaby@suse.cz + +- Refresh patches.suse/DWARF-EH-frame-based-stack-unwinding.patch. + Refactoring of the code. It is readable, understandable and a heap + faster. More to come later. +- commit 0a72883 + +------------------------------------------------------------------- @@ -52,0 +87,6 @@ +Tue Feb 7 16:58:58 CET 2017 - afaerber@suse.de + +- config: armv6hl: Enable RASPBERRYPI_POWER +- commit 7c28efb + +------------------------------------------------------------------- @@ -57 +97,7 @@ -- commit 25d564c +- commit 12d02bb + +------------------------------------------------------------------- +Tue Feb 7 16:33:47 CET 2017 - afaerber@suse.de + +- config: Make VIRTIO_CONSOLE built-in +- commit 2f30d33 @@ -66,0 +113,14 @@ +Tue Feb 7 01:41:38 CET 2017 - jeffm@suse.com + +- btrfs: fix btrfs_compat_ioctl failures on non-compat ioctls + (bsc#1018100). +- commit d9294c3 + +------------------------------------------------------------------- +Mon Feb 6 16:59:33 CET 2017 - jeffm@suse.com + +- Update to 4.10-rc7. +- Eliminated 1 patch. +- commit bbf896d + +------------------------------------------------------------------- @@ -72,0 +133,8 @@ +Fri Feb 3 00:08:25 CET 2017 - jkosina@suse.cz + +- Refresh + patches.fixes/x86-efi-Always-map-the-first-physical-page-into-the-EFI-pagetables.patch: + update references +- commit 4e3d085 + +------------------------------------------------------------------- @@ -81,0 +150,9 @@ +Thu Feb 2 13:07:26 CET 2017 - jslaby@suse.cz + +- Update config files. +- Refresh patches.suse/DWARF-EH-frame-based-stack-unwinding.patch. +- fix for save_stack_trace (lockdep et al.) +- depends on !KASAN (too slow) +- commit 2e68dd0 + +------------------------------------------------------------------- @@ -113,0 +191,10 @@ +Tue Jan 31 10:45:34 CET 2017 - jslaby@suse.cz + +- Update config files. +- Refresh patches.suse/DWARF-EH-frame-based-stack-unwinding.patch. +- Refresh patches.suse/stack-unwind-disable-kasan.patch. + Update dwarf unwinder. It fixes a build failure when disabled and + moves files around. +- commit 18f6269 + +------------------------------------------------------------------- @@ -124,0 +212,7 @@ +Mon Jan 30 17:46:39 CET 2017 - jeffm@suse.com + +- Update to 4.10-rc6. +- Eliminated 1 patch. +- commit 85b893c + +------------------------------------------------------------------- @@ -131,0 +226,7 @@ +Mon Jan 30 10:20:52 CET 2017 - jkosina@suse.cz + +- [tip:efi/urgent] x86/efi: Always map the first physical page + into the EFI pagetables. +- commit 33e3495 + +------------------------------------------------------------------- @@ -135 +236 @@ -- commit cf15f28 +- commit c67d673 @@ -157,0 +259,6 @@ +Mon Jan 23 16:14:41 CET 2017 - jeffm@suse.com + +- Update to 4.10-rc5. +- commit 7dca981 + +------------------------------------------------------------------- @@ -165,0 +273,11 @@ +Wed Jan 18 14:48:20 CET 2017 - jslaby@suse.cz + +- Update config files (bnc#1011884). + Kill FRAME_POINTER. Thanks to the stack traces generation rewrite in + 4.9 & DWARF unwinding port, frame pointers are no longer needed for + stack traces. We can shoot them down now. I am going to implement + generation of DWARF info for assembly rather soon. + If issues occur, please revert this and let me know. +- commit 911f899 + +------------------------------------------------------------------- @@ -183,0 +302,15 @@ +Mon Jan 16 03:39:22 CET 2017 - jeffm@suse.com + +- Update to 3.10-rc4. +- commit 4f824f1 + +------------------------------------------------------------------- +Mon Jan 16 03:36:40 CET 2017 - jeffm@suse.com + +- Delete + patches.suse/revert-btrfs-fix-lockdep-warning-on-deadlock-against-an-inode-s-log-mutex.patch. +- Delete + patches.suse/revert-btrfs-improve-performance-on-fsync-against-new-inode-after-rename-unlink.patch. +- commit a282581 + +------------------------------------------------------------------- @@ -193 +326,7 @@ -- commit 1a627d7 +- commit 26c1d96 + +------------------------------------------------------------------- +Fri Jan 13 16:42:07 CET 2017 - jeffm@suse.com + +- reiserfs: fix race in prealloc discard (bsc#987576). +- commit 5e5739e @@ -201,0 +341,9 @@ +Fri Jan 13 16:29:18 CET 2017 - tiwai@suse.de + +- rpm/kernel-docs.spec.in: Fix building docs +- Fix html and pdf creation in Documetation/media/* +- Add graphviz to buildreq for image conversion +- Fix file list to remove REPORTING-BUGS +- commit e189683 + +------------------------------------------------------------------- @@ -213 +361 @@ -- commit 2c7dfab +- commit 1ed7879 @@ -223,0 +372,43 @@ +Wed Jan 11 16:16:15 CET 2017 - jeffm@suse.com + +- Delete + patches.suse/btrfs-fix-extent-tree-corruption-due-to-relocation.patch. + The issue being investigated with resolved with upstream commit + 054570a1dc94 (Btrfs: fix relocation incorrectly dropping data references). +- commit ed9b04a + +------------------------------------------------------------------- +Wed Jan 11 11:27:06 CET 2017 - jslaby@suse.cz + +- Refresh patches.suse/DWARF-EH-frame-based-stack-unwinding.patch. +- Delete patches.suse/unwind-use-thread_return-on-i386. + Fix a warning and unwinding of blocked tasks. thread_return fix not + needed anymore. +- commit abd21b1 + +------------------------------------------------------------------- +Mon Jan 9 18:07:38 CET 2017 - jeffm@suse.com + +- unwind: use thread_return on i386 + This fixes a build failure. I don't have an i386 environment set up for + testing. ++++ 277 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes dtb-armv6l.changes: same change dtb-armv7l.changes: same change kernel-64kb.changes: same change kernel-debug.changes: same change kernel-default.changes: same change kernel-docs.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-syzkaller.changes: same change kernel-vanilla.changes: same change Old: ---- linux-4.9.tar.xz New: ---- linux-4.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.048508077 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.052507467 +0100 @@ -16,14 +16,15 @@ # -%define patchversion 4.9.11 +%define patchversion 4.10.0 +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros Name: dtb-aarch64 -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -31,7 +32,11 @@ License: GPL-2.0 Group: System/Boot Url: http://www.kernel.org/ +%if %vanilla_only +BuildRequires: kernel-source-vanilla +%else BuildRequires: kernel-source +%endif ExclusiveArch: aarch64 BuildRequires: cpp BuildRequires: dtc >= 1.4.0 @@ -50,6 +55,15 @@ %description -n dtb-al Device Tree files for Alpine Labs based arm64 systems. +%package -n dtb-allwinner +Summary: Allwinner based arm64 systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-allwinner +Device Tree files for Allwinner based arm64 systems. + %package -n dtb-altera Summary: Altera based arm64 systems Group: System/Boot @@ -235,18 +249,31 @@ %description -n dtb-xilinx Device Tree files for Xilinx based arm64 systems. +%package -n dtb-zte +Summary: ZTE based arm64 systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-zte +Device Tree files for ZTE based arm64 systems. + %prep %build -cp %{_prefix}/src/linux/COPYING . +source=/usr/src/linux-%kernelrelease +%if %vanilla_only +source=$source-vanilla +%endif +cp $source/COPYING . mkdir pp PPDIR=`pwd`/pp export DTC_FLAGS="-R 4 -p 0x1000" -cd %{_prefix}/src/linux/arch/arm64/boot/dts -for dts in al/*.dts altera/*.dts amd/*.dts amlogic/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts ; do +cd $source/arch/arm64/boot/dts +for dts in al/*.dts allwinner/*.dts altera/*.dts amd/*.dts amlogic/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts zte/*.dts ; do target=${dts%*.dts} mkdir -p $PPDIR/$(dirname $target) cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I. -I./include/ -P $target.dts -o $PPDIR/$target.dts @@ -258,7 +285,7 @@ %install cd pp -for dts in al/*.dts altera/*.dts amd/*.dts amlogic/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts ; do +for dts in al/*.dts allwinner/*.dts altera/*.dts amd/*.dts amlogic/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts zte/*.dts ; do target=${dts%*.dts} install -m 700 -d %{buildroot}%{dtbdir}/$(dirname $target) install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) @@ -279,6 +306,13 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%kernelrelease dtb +%post -n dtb-allwinner +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%kernelrelease dtb + %post -n dtb-altera cd /boot # If /boot/dtb is a symlink, remove it, so that we can replace it. @@ -419,6 +453,13 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%kernelrelease dtb +%post -n dtb-zte +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%kernelrelease dtb + %ifarch aarch64 %files -n dtb-al -f dtb-al.list %else @@ -432,6 +473,18 @@ %{dtbdir}/al/*.dtb %ifarch aarch64 +%files -n dtb-allwinner -f dtb-allwinner.list +%else +%files -n dtb-allwinner +%endif +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%dir %{dtbdir}/allwinner +%{dtbdir}/allwinner/*.dtb + +%ifarch aarch64 %files -n dtb-altera -f dtb-altera.list %else %files -n dtb-altera @@ -671,4 +724,16 @@ %dir %{dtbdir}/xilinx %{dtbdir}/xilinx/*.dtb +%ifarch aarch64 +%files -n dtb-zte -f dtb-zte.list +%else +%files -n dtb-zte +%endif +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%dir %{dtbdir}/zte +%{dtbdir}/zte/*.dtb + %changelog ++++++ dtb-armv6l.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.088501980 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.092501371 +0100 @@ -16,14 +16,15 @@ # -%define patchversion 4.9.11 +%define patchversion 4.10.0 +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros Name: dtb-armv6l -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -31,7 +32,11 @@ License: GPL-2.0 Group: System/Boot Url: http://www.kernel.org/ +%if %vanilla_only +BuildRequires: kernel-source-vanilla +%else BuildRequires: kernel-source +%endif ExclusiveArch: armv6l armv6hl BuildRequires: cpp BuildRequires: dtc >= 1.4.0 @@ -55,12 +60,16 @@ %prep %build -cp %{_prefix}/src/linux/COPYING . +source=/usr/src/linux-%kernelrelease +%if %vanilla_only +source=$source-vanilla +%endif +cp $source/COPYING . mkdir pp PPDIR=`pwd`/pp export DTC_FLAGS="-R 4 -p 0x1000" -cd %{_prefix}/src/linux/arch/arm/boot/dts +cd $source/arch/arm/boot/dts for dts in bcm2835*.dts ; do target=${dts%*.dts} mkdir -p $PPDIR/$(dirname $target) ++++++ dtb-armv7l.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.124496494 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.128495884 +0100 @@ -16,14 +16,15 @@ # -%define patchversion 4.9.11 +%define patchversion 4.10.0 +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros Name: dtb-armv7l -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -31,7 +32,11 @@ License: GPL-2.0 Group: System/Boot Url: http://www.kernel.org/ +%if %vanilla_only +BuildRequires: kernel-source-vanilla +%else BuildRequires: kernel-source +%endif ExclusiveArch: armv7l armv7hl BuildRequires: cpp BuildRequires: dtc >= 1.4.0 @@ -268,6 +273,15 @@ %description -n dtb-rk3 Device Tree files for Rockchip RK3xxx based systems. +%package -n dtb-socfpga +Summary: Altera SoC FPGA based systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-socfpga +Device Tree files for Altera SoC FPGA based systems. + %package -n dtb-ste Summary: ST Ericsson based systems Group: System/Boot @@ -417,13 +431,17 @@ %prep %build -cp %{_prefix}/src/linux/COPYING . +source=/usr/src/linux-%kernelrelease +%if %vanilla_only +source=$source-vanilla +%endif +cp $source/COPYING . mkdir pp PPDIR=`pwd`/pp export DTC_FLAGS="-R 4 -p 0x1000" -cd %{_prefix}/src/linux/arch/arm/boot/dts -for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts keystone-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do +cd $source/arch/arm/boot/dts +for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts keystone-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts socfpga_*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do target=${dts%*.dts} mkdir -p $PPDIR/$(dirname $target) cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I. -I./include/ -P $target.dts -o $PPDIR/$target.dts @@ -435,7 +453,7 @@ %install cd pp -for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts keystone-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do +for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts keystone-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts socfpga_*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do target=${dts%*.dts} install -m 700 -d %{buildroot}%{dtbdir}/$(dirname $target) install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) @@ -624,6 +642,13 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%kernelrelease dtb +%post -n dtb-socfpga +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%kernelrelease dtb + %post -n dtb-ste cd /boot # If /boot/dtb is a symlink, remove it, so that we can replace it. @@ -1012,6 +1037,17 @@ %{dtbdir}/rk3*.dtb %ifarch aarch64 +%files -n dtb-socfpga -f dtb-socfpga.list +%else +%files -n dtb-socfpga +%endif +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%{dtbdir}/socfpga_*.dtb + +%ifarch aarch64 %files -n dtb-ste -f dtb-ste.list %else %files -n dtb-ste ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.180487959 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.184487349 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.9 -%define patchversion 4.9.11 +%define srcversion 4.10 +%define patchversion 4.10.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0 Group: System/Kernel -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -518,16 +518,17 @@ MAKE_ARGS="$MAKE_ARGS D=2" %endif +mkdir -p %_topdir/OTHER +log=%_topdir/OTHER/make-stderr.log while true; do - make all $MAKE_ARGS 2>&1 \ - | tee buildlog + make all $MAKE_ARGS 2> >(tee "$log") if test "${PIPESTATUS[0]}" -eq 0; then break fi # In the linux-next and vanilla branches, we try harder to build a # package. if test 0%vanilla_only -gt 0 && - %_sourcedir/try-disable-staging-driver buildlog; then + %_sourcedir/try-disable-staging-driver "$log"; then echo "Retrying make" else exit 1 kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.296470279 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.296470279 +0100 @@ -16,7 +16,7 @@ # -%define patchversion 4.9.11 +%define patchversion 4.10.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -29,18 +29,28 @@ %define use_sphinx 0 %endif +# copy the whole tree to generate some images (sigh...) +%define local_copy 1 +%if %local_copy +%define linux_src . +%else +%define linux_src /usr/src/linux%variant +%define make_arg "-C %linux_src" +%endif + Name: kernel-docs Summary: Kernel Documentation (man pages) License: GPL-2.0 Group: Documentation/Man -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif BuildRequires: kernel-source%variant %if %use_sphinx +BuildRequires: graphviz BuildRequires: python-Sphinx # rst2pdf is broken with Sphinx 1.3.x, so disabled for now # BuildRequires: python-rst2pdf @@ -98,6 +108,10 @@ EOF %endif %setup -T -c +%if %local_copy +# FIXME: need to copy locally to generate some images... +cp -a /usr/src/linux%variant/* . +%endif %build %if !%use_fop @@ -106,15 +120,15 @@ %endif export LANG=en_US mkdir -p man -make -C /usr/src/linux%variant O=$PWD/man mandocs %{?jobs:-j%jobs} +make %{?make_arg} O=$PWD/man mandocs %{?jobs:-j%jobs} mkdir -p html -make -C /usr/src/linux%variant O=$PWD/html htmldocs %{?jobs:-j%jobs} +make %{?make_arg} O=$PWD/html htmldocs mkdir -p pdf make \ %if %use_fop - XMLTOFLAGS="-m /usr/src/linux%{variant}/Documentation/DocBook/stylesheet.xsl --skip-validation --with-fop" \ + XMLTOFLAGS="-m %linux_src/Documentation/DocBook/stylesheet.xsl --skip-validation --with-fop" \ %endif - -C /usr/src/linux%variant O=$PWD/pdf pdfdocs %{?jobs:-j%jobs} + %{?make_arg} O=$PWD/pdf pdfdocs %install install -d $RPM_BUILD_ROOT/%{_mandir}/man9 @@ -152,14 +166,16 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/DocBook/*/*.proc install -d $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst %if %use_sphinx -cp -a html/Documentation/output/html/* $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst || true +cp -a html/Documentation/output/* $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst || true %endif -cp -a /usr/src/linux%variant/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} . +%if !%local_copy +cp -a %linux_src/{COPYING,CREDITS,MAINTAINERS,README} . +%endif %files %defattr(-,root,root) -%doc COPYING CREDITS MAINTAINERS README REPORTING-BUGS +%doc COPYING CREDITS MAINTAINERS README %{_mandir}/man9/* %files pdf ++++++ kernel-lpae.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.328465402 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.328465402 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.9 -%define patchversion 4.9.11 +%define srcversion 4.10 +%define patchversion 4.10.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel for LPAE enabled systems License: GPL-2.0 Group: System/Kernel -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -516,16 +516,17 @@ MAKE_ARGS="$MAKE_ARGS D=2" %endif +mkdir -p %_topdir/OTHER +log=%_topdir/OTHER/make-stderr.log while true; do - make all $MAKE_ARGS 2>&1 \ - | tee buildlog + make all $MAKE_ARGS 2> >(tee "$log") if test "${PIPESTATUS[0]}" -eq 0; then break fi # In the linux-next and vanilla branches, we try harder to build a # package. if test 0%vanilla_only -gt 0 && - %_sourcedir/try-disable-staging-driver buildlog; then + %_sourcedir/try-disable-staging-driver "$log"; then echo "Retrying make" else exit 1 ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.364459916 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.368459306 +0100 @@ -19,8 +19,9 @@ #!BuildIgnore: post-build-checks -%define patchversion 4.9.11 +%define patchversion 4.10.0 %define variant %{nil} +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -30,9 +31,14 @@ BuildRequires: util-linux %if 0%{?suse_version} +%if %vanilla_only +BuildRequires: kernel-vanilla +%define kernel_flavor -vanilla +%else BuildRequires: kernel-default %define kernel_flavor -default %endif +%endif %if 0%{?rhel_version} BuildRequires: kernel @@ -51,9 +57,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.404453820 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.408453210 +0100 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 4.9.11 +%define patchversion 4.10.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.448447113 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.452446504 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.9 -%define patchversion 4.9.11 +%define srcversion 4.10 +%define patchversion 4.10.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -544,16 +544,17 @@ MAKE_ARGS="$MAKE_ARGS D=2" %endif +mkdir -p %_topdir/OTHER +log=%_topdir/OTHER/make-stderr.log while true; do - make all $MAKE_ARGS 2>&1 \ - | tee buildlog + make all $MAKE_ARGS 2> >(tee "$log") if test "${PIPESTATUS[0]}" -eq 0; then break fi # In the linux-next and vanilla branches, we try harder to build a # package. if test 0%vanilla_only -gt 0 && - %_sourcedir/try-disable-staging-driver buildlog; then + %_sourcedir/try-disable-staging-driver "$log"; then echo "Retrying make" else exit 1 ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.476442846 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.480442236 +0100 @@ -17,8 +17,8 @@ # icecream 0 -%define srcversion 4.9 -%define patchversion 4.9.11 +%define srcversion 4.10 +%define patchversion 4.10.0 %define variant %{nil} %define vanilla_only 0 @@ -30,9 +30,9 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.512437359 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.516436750 +0100 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 4.9.11 +Version: 4.10.0 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif ++++++ kernel-syzkaller.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.552431263 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.556430654 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.9 -%define patchversion 4.9.11 +%define srcversion 4.10 +%define patchversion 4.10.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel used for fuzzing by syzkaller License: GPL-2.0 Group: System/Kernel -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -517,16 +517,17 @@ MAKE_ARGS="$MAKE_ARGS D=2" %endif +mkdir -p %_topdir/OTHER +log=%_topdir/OTHER/make-stderr.log while true; do - make all $MAKE_ARGS 2>&1 \ - | tee buildlog + make all $MAKE_ARGS 2> >(tee "$log") if test "${PIPESTATUS[0]}" -eq 0; then break fi # In the linux-next and vanilla branches, we try harder to build a # package. if test 0%vanilla_only -gt 0 && - %_sourcedir/try-disable-staging-driver buildlog; then + %_sourcedir/try-disable-staging-driver "$log"; then echo "Retrying make" else exit 1 kernel-vanilla.spec: same change ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.860384322 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.864383711 +0100 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=4.9 +SRCVERSION=4.10 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against @@ -8,3 +8,6 @@ OBS_PROJECT_PPC=openSUSE:Factory:PowerPC IBS_PROJECT=SUSE:Factory:Head IBS_PROJECT_ARM=Devel:ARM:Factory +# Bugzilla info +BUGZILLA_SERVER="apibugzilla.suse.com" +BUGZILLA_PRODUCT="openSUSE Tumbleweed" ++++++ config.tar.bz2 ++++++ ++++ 13186 lines of diff (skipped) ++++++ dtb.spec.in.in ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.464292267 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.468291658 +0100 @@ -17,6 +17,7 @@ %define patchversion @PATCHVERSION@ +%define vanilla_only @VANILLA_ONLY@ %include %_sourcedir/kernel-spec-macros @@ -31,7 +32,11 @@ License: GPL-2.0 Group: System/Boot Url: http://www.kernel.org/ +%if %vanilla_only +BuildRequires: kernel-source-vanilla +%else BuildRequires: kernel-source +%endif $ARCH_RESTRICTIONS BuildRequires: cpp BuildRequires: dtc >= 1.4.0 @@ -46,12 +51,16 @@ %prep %build -cp %{_prefix}/src/linux/COPYING . +source=/usr/src/linux-%kernelrelease +%if %vanilla_only +source=$source-vanilla +%endif +cp $source/COPYING . mkdir pp PPDIR=`pwd`/pp export DTC_FLAGS="-R 4 -p 0x1000" -cd %{_prefix}/src/$DTS_folder +cd $source/$DTS_folder for dts in $ALL_SUPPORTED_DTB; do target=${dts%*.dts} mkdir -p $PPDIR/$(dirname $target) ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.580274588 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.584273978 +0100 @@ -387,16 +387,17 @@ MAKE_ARGS="$MAKE_ARGS D=2" %endif +mkdir -p %_topdir/OTHER +log=%_topdir/OTHER/make-stderr.log while true; do - make all $MAKE_ARGS 2>&1 \ - | tee buildlog + make all $MAKE_ARGS 2> >(tee "$log") if test "${PIPESTATUS[0]}" -eq 0; then break fi # In the linux-next and vanilla branches, we try harder to build a # package. if test 0%vanilla_only -gt 0 && - %_sourcedir/try-disable-staging-driver buildlog; then + %_sourcedir/try-disable-staging-driver "$log"; then echo "Retrying make" else exit 1 ++++++ kernel-docs.spec.in ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.632266663 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.632266663 +0100 @@ -29,6 +29,15 @@ %define use_sphinx 0 %endif +# copy the whole tree to generate some images (sigh...) +%define local_copy 1 +%if %local_copy +%define linux_src . +%else +%define linux_src /usr/src/linux%variant +%define make_arg "-C %linux_src" +%endif + Name: kernel-docs@VARIANT@ Summary: Kernel Documentation (man pages) License: GPL-2.0 @@ -41,6 +50,7 @@ %endif BuildRequires: kernel-source%variant %if %use_sphinx +BuildRequires: graphviz BuildRequires: python-Sphinx # rst2pdf is broken with Sphinx 1.3.x, so disabled for now # BuildRequires: python-rst2pdf @@ -98,6 +108,10 @@ EOF %endif %setup -T -c +%if %local_copy +# FIXME: need to copy locally to generate some images... +cp -a /usr/src/linux%variant/* . +%endif %build %if !%use_fop @@ -106,15 +120,15 @@ %endif export LANG=en_US mkdir -p man -make -C /usr/src/linux%variant O=$PWD/man mandocs %{?jobs:-j%jobs} +make %{?make_arg} O=$PWD/man mandocs %{?jobs:-j%jobs} mkdir -p html -make -C /usr/src/linux%variant O=$PWD/html htmldocs %{?jobs:-j%jobs} +make %{?make_arg} O=$PWD/html htmldocs mkdir -p pdf make \ %if %use_fop - XMLTOFLAGS="-m /usr/src/linux%{variant}/Documentation/DocBook/stylesheet.xsl --skip-validation --with-fop" \ + XMLTOFLAGS="-m %linux_src/Documentation/DocBook/stylesheet.xsl --skip-validation --with-fop" \ %endif - -C /usr/src/linux%variant O=$PWD/pdf pdfdocs %{?jobs:-j%jobs} + %{?make_arg} O=$PWD/pdf pdfdocs %install install -d $RPM_BUILD_ROOT/%{_mandir}/man9 @@ -152,14 +166,16 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/DocBook/*/*.proc install -d $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst %if %use_sphinx -cp -a html/Documentation/output/html/* $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst || true +cp -a html/Documentation/output/* $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst || true %endif -cp -a /usr/src/linux%variant/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} . +%if !%local_copy +cp -a %linux_src/{COPYING,CREDITS,MAINTAINERS,README} . +%endif %files %defattr(-,root,root) -%doc COPYING CREDITS MAINTAINERS README REPORTING-BUGS +%doc COPYING CREDITS MAINTAINERS README %{_mandir}/man9/* %files pdf ++++++ kernel-obs-build.spec.in ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.688258128 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.692257518 +0100 @@ -21,6 +21,7 @@ %define patchversion @PATCHVERSION@ %define variant @VARIANT@%{nil} +%define vanilla_only @VANILLA_ONLY@ %include %_sourcedir/kernel-spec-macros @@ -30,9 +31,14 @@ BuildRequires: util-linux %if 0%{?suse_version} +%if %vanilla_only +BuildRequires: kernel-vanilla +%define kernel_flavor -vanilla +%else BuildRequires: kernel-default %define kernel_flavor -default %endif +%endif %if 0%{?rhel_version} BuildRequires: kernel ++++++ kernel-spec-macros ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.792242277 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.792242277 +0100 @@ -19,7 +19,7 @@ # If the rebuild counter is > 1, obsolete all previous rebuilds (boo#867595) %define obsolete_rebuilds() %( %{verbose:set -x} \ set -- $(echo %release | sed -rn 's/(.*\\.)([0-9]+)($|\\.[^.]*[^.0-9][^.]*$)/\\1 \\2 \\3/p') \ - if test $2 -gt 99; then echo "warning: Rebuild counter too high in %release" >&2; exit 0; fi \ + if test -n "$2" && test "$2" -gt 99; then echo "warning: Rebuild counter too high in %release" >&2; exit 0; fi \ seq 1 $(($2-1)) | sed "s/.*/Obsoletes: %1 = %version-$1&$3/" \ ) %endif ++++++ linux-4.9.tar.xz -> linux-4.10.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-4.9.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new/linux-4.10.tar.xz differ: char 25, line 1 ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.948218501 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.952217892 +0100 @@ -171,29 +171,34 @@ } # kernel-obs-*.spec -{ - my @default_archs = arch2rpm(@{$flavor_archs{default}}); +if (!$variant) { + my @default_archs; + + if ($vanilla_only) { + @default_archs = arch2rpm(@{$flavor_archs{vanilla}}); + } else { + @default_archs = arch2rpm(@{$flavor_archs{default}}); + } # No kernel-obs-* for 32bit ppc @default_archs = grep { $_ ne "ppc" } @default_archs; my $default_archs = join(" ", @default_archs); - if (!$variant) { - do_spec('obs-build', "kernel-obs-build.spec", %macros, - ARCHS => $default_archs); - do_spec('obs-qa', "kernel-obs-qa.spec", %macros, - ARCHS => $default_archs); - } + do_spec('obs-build', "kernel-obs-build.spec", %macros, + ARCHS => $default_archs); + do_spec('obs-qa', "kernel-obs-qa.spec", %macros, + ARCHS => $default_archs); } # dtb-*.spec -do_spec('dtb', "dtb.spec.in", %macros); -print "./mkspec-dtb\n"; -system("./mkspec-dtb\n"); -unlink("$dir/dtb.spec.in"); -if ($?) { - exit(($? >> 8) || ($? & 127 + 128) || 1); +if (!$variant) { + do_spec('dtb', "dtb.spec.in", %macros); + print "./mkspec-dtb\n"; + system("./mkspec-dtb\n"); + unlink("$dir/dtb.spec.in"); + if ($?) { + exit(($? >> 8) || ($? & 127 + 128) || 1); + } } - copy_changes(); # _constraints ++++++ mkspec-dtb ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.988212405 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.992211796 +0100 @@ -32,6 +32,7 @@ ['dtb-omap5', 'omap5*.dts', "TI OMAP5 based systems"], ['dtb-qcom', 'qcom-*.dts', "Qualcomm Snapdragon based systems"], ['dtb-rk3', 'rk3*.dts', "Rockchip RK3xxx based systems"], + ['dtb-socfpga', 'socfpga_*.dts', "Altera SoC FPGA based systems"], ['dtb-ste', 'ste-*.dts', "ST Ericsson based systems"], ['dtb-sun4i', 'sun4i-*.dts', "Allwinner sun4i based systems"], ['dtb-sun5i', 'sun5i-*.dts', "Allwinner sun5i based systems"], @@ -58,6 +59,7 @@ # DTB packages names my @aarch64_package_list = ( ['dtb-al', 'al/*.dts', "Alpine Labs based arm64 systems"], + ['dtb-allwinner', 'allwinner/*.dts', "Allwinner based arm64 systems"], ['dtb-altera', 'altera/*.dts', "Altera based arm64 systems"], ['dtb-amd', 'amd/*.dts', "AMD based arm64 systems"], ['dtb-amlogic', 'amlogic/*.dts', "Amlogic based arm64 systems"], @@ -78,6 +80,7 @@ ['dtb-socionext', 'socionext/*.dts', "Socionext based arm64 systems"], ['dtb-sprd', 'sprd/*.dts', "Spreadtrum based arm64 systems"], ['dtb-xilinx', 'xilinx/*.dts', "Xilinx based arm64 systems"], + ['dtb-zte', 'zte/*.dts', "ZTE based arm64 systems"], ); sub generate_spec($$$) @@ -97,9 +100,9 @@ my $subpkg_post = ""; my $subpkg_files = ""; my $all_supported_dtb = ""; - my $DTS_folder = "linux/arch/arm/boot/dts"; + my $DTS_folder = "arch/arm/boot/dts"; if ($exclusive_arch =~ /aarch64/) { - $DTS_folder = "linux/arch/arm64/boot/dts"; + $DTS_folder = "arch/arm64/boot/dts"; } foreach my $NAME (@$package_list) { ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/drm-reference-count-event-completion new/patches.drivers/drm-reference-count-event-completion --- old/patches.drivers/drm-reference-count-event-completion 2017-02-09 11:55:53.000000000 +0100 +++ new/patches.drivers/drm-reference-count-event-completion 2017-01-30 17:46:39.000000000 +0100 @@ -50,7 +50,7 @@ --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c -@@ -1382,6 +1382,15 @@ static int stall_checks(struct drm_crtc +@@ -1389,6 +1389,15 @@ static int stall_checks(struct drm_crtc return ret < 0 ? ret : 0; } @@ -66,7 +66,7 @@ /** * drm_atomic_helper_setup_commit - setup possibly nonblocking commit * @state: new modeset state to be committed -@@ -1474,6 +1483,8 @@ int drm_atomic_helper_setup_commit(struc +@@ -1481,6 +1490,8 @@ int drm_atomic_helper_setup_commit(struc } crtc_state->event->base.completion = &commit->flip_done; @@ -77,7 +77,7 @@ return 0; --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c -@@ -686,8 +686,8 @@ void drm_send_event_locked(struct drm_de +@@ -689,8 +689,8 @@ void drm_send_event_locked(struct drm_de assert_spin_locked(&dev->event_lock); if (e->completion) { @@ -89,11 +89,11 @@ --- a/include/drm/drmP.h +++ b/include/drm/drmP.h -@@ -361,6 +361,7 @@ struct drm_ioctl_desc { +@@ -360,6 +360,7 @@ struct drm_ioctl_desc { /* Event queued up for userspace to read */ struct drm_pending_event { struct completion *completion; + void (*completion_release)(struct completion *completion); struct drm_event *event; - struct fence *fence; + struct dma_fence *fence; struct list_head link; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br new/patches.drivers/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br --- old/patches.drivers/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br 2017-02-09 11:55:53.000000000 +0100 +++ new/patches.drivers/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br 1970-01-01 01:00:00.000000000 +0100 @@ -1,170 +0,0 @@ -From e950267ab802c8558f1100eafd4087fd039ad634 Mon Sep 17 00:00:00 2001 -From: Henrik Ingo <henrik.ingo@avoinelama.fi> -Date: Sun, 29 May 2016 17:58:00 -0300 -Subject: [PATCH] [media] uvcvideo: uvc_scan_fallback() for webcams with broken chain -Git-commit: e950267ab802c8558f1100eafd4087fd039ad634 -Patch-mainline: 4.10-rc1 -References: bsc#1021474 - -Some devices have invalid baSourceID references, causing uvc_scan_chain() -to fail, but if we just take the entities we can find and put them -together in the most sensible chain we can think of, turns out they do -work anyway. Note: This heuristic assumes there is a single chain. - -At the time of writing, devices known to have such a broken chain are - - Acer Integrated Camera (5986:055a) - - Realtek rtl157a7 (0bda:57a7) - -Signed-off-by: Henrik Ingo <henrik.ingo@avoinelama.fi> -Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> -Acked-by: Takashi Iwai <tiwai@suse.de> - ---- - drivers/media/usb/uvc/uvc_driver.c | 118 +++++++++++++++++++++++++++++++++++-- - 1 file changed, 112 insertions(+), 6 deletions(-) - ---- a/drivers/media/usb/uvc/uvc_driver.c -+++ b/drivers/media/usb/uvc/uvc_driver.c -@@ -1595,6 +1595,114 @@ static const char *uvc_print_chain(struc - return buffer; - } - -+static struct uvc_video_chain *uvc_alloc_chain(struct uvc_device *dev) -+{ -+ struct uvc_video_chain *chain; -+ -+ chain = kzalloc(sizeof(*chain), GFP_KERNEL); -+ if (chain == NULL) -+ return NULL; -+ -+ INIT_LIST_HEAD(&chain->entities); -+ mutex_init(&chain->ctrl_mutex); -+ chain->dev = dev; -+ v4l2_prio_init(&chain->prio); -+ -+ return chain; -+} -+ -+/* -+ * Fallback heuristic for devices that don't connect units and terminals in a -+ * valid chain. -+ * -+ * Some devices have invalid baSourceID references, causing uvc_scan_chain() -+ * to fail, but if we just take the entities we can find and put them together -+ * in the most sensible chain we can think of, turns out they do work anyway. -+ * Note: This heuristic assumes there is a single chain. -+ * -+ * At the time of writing, devices known to have such a broken chain are -+ * - Acer Integrated Camera (5986:055a) -+ * - Realtek rtl157a7 (0bda:57a7) -+ */ -+static int uvc_scan_fallback(struct uvc_device *dev) -+{ -+ struct uvc_video_chain *chain; -+ struct uvc_entity *iterm = NULL; -+ struct uvc_entity *oterm = NULL; -+ struct uvc_entity *entity; -+ struct uvc_entity *prev; -+ -+ /* -+ * Start by locating the input and output terminals. We only support -+ * devices with exactly one of each for now. -+ */ -+ list_for_each_entry(entity, &dev->entities, list) { -+ if (UVC_ENTITY_IS_ITERM(entity)) { -+ if (iterm) -+ return -EINVAL; -+ iterm = entity; -+ } -+ -+ if (UVC_ENTITY_IS_OTERM(entity)) { -+ if (oterm) -+ return -EINVAL; -+ oterm = entity; -+ } -+ } -+ -+ if (iterm == NULL || oterm == NULL) -+ return -EINVAL; -+ -+ /* Allocate the chain and fill it. */ -+ chain = uvc_alloc_chain(dev); -+ if (chain == NULL) -+ return -ENOMEM; -+ -+ if (uvc_scan_chain_entity(chain, oterm) < 0) -+ goto error; -+ -+ prev = oterm; -+ -+ /* -+ * Add all Processing and Extension Units with two pads. The order -+ * doesn't matter much, use reverse list traversal to connect units in -+ * UVC descriptor order as we build the chain from output to input. This -+ * leads to units appearing in the order meant by the manufacturer for -+ * the cameras known to require this heuristic. -+ */ -+ list_for_each_entry_reverse(entity, &dev->entities, list) { -+ if (entity->type != UVC_VC_PROCESSING_UNIT && -+ entity->type != UVC_VC_EXTENSION_UNIT) -+ continue; -+ -+ if (entity->num_pads != 2) -+ continue; -+ -+ if (uvc_scan_chain_entity(chain, entity) < 0) -+ goto error; -+ -+ prev->baSourceID[0] = entity->id; -+ prev = entity; -+ } -+ -+ if (uvc_scan_chain_entity(chain, iterm) < 0) -+ goto error; -+ -+ prev->baSourceID[0] = iterm->id; -+ -+ list_add_tail(&chain->list, &dev->chains); -+ -+ uvc_trace(UVC_TRACE_PROBE, -+ "Found a video chain by fallback heuristic (%s).\n", -+ uvc_print_chain(chain)); -+ -+ return 0; -+ -+error: -+ kfree(chain); -+ return -EINVAL; -+} -+ - /* - * Scan the device for video chains and register video devices. - * -@@ -1617,15 +1725,10 @@ static int uvc_scan_device(struct uvc_de - if (term->chain.next || term->chain.prev) - continue; - -- chain = kzalloc(sizeof(*chain), GFP_KERNEL); -+ chain = uvc_alloc_chain(dev); - if (chain == NULL) - return -ENOMEM; - -- INIT_LIST_HEAD(&chain->entities); -- mutex_init(&chain->ctrl_mutex); -- chain->dev = dev; -- v4l2_prio_init(&chain->prio); -- - term->flags |= UVC_ENTITY_FLAG_DEFAULT; - - if (uvc_scan_chain(chain, term) < 0) { -@@ -1639,6 +1742,9 @@ static int uvc_scan_device(struct uvc_de - list_add_tail(&chain->list, &dev->chains); - } - -+ if (list_empty(&dev->chains)) -+ uvc_scan_fallback(dev); -+ - if (list_empty(&dev->chains)) { - uvc_printk(KERN_INFO, "No valid video chain found.\n"); - return -1; ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/drm-Use-u64-for-intermediate-dotclock-calculations.patch new/patches.fixes/drm-Use-u64-for-intermediate-dotclock-calculations.patch --- old/patches.fixes/drm-Use-u64-for-intermediate-dotclock-calculations.patch 2017-02-18 18:59:27.000000000 +0100 +++ new/patches.fixes/drm-Use-u64-for-intermediate-dotclock-calculations.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri, 21 Oct 2016 15:15:40 +0100 -Subject: drm: Use u64 for intermediate dotclock calculations -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Git-commit: 8a5bbf327aa16025c78491266a6425807c7fbee0 -Patch-mainline: v4.10-rc1 -References: bnc#1006472 - -We have reached the era where monitor bandwidths now exceed 31bits in -frequency calculations, though as we stored them in kHz units we are -safe from overflow in the modelines for some time. - -[ 48.723720] UBSAN: Undefined behaviour in ../drivers/gpu/drm/drm_modes.c:325:49 -[ 48.726943] signed integer overflow: -[ 48.728503] 2240 * 1000000 cannot be represented in type 'int' - -Reported-by: Martin Liška <marxin.liska@gmail.com> -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98372 -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> -Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> -Link: http://patchwork.freedesktop.org/patch/msgid/20161021141540.26837-1-chris@ch... -Signed-off-by: Jiri Slaby <jslaby@suse.cz> ---- - drivers/gpu/drm/drm_modes.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/drivers/gpu/drm/drm_modes.c -+++ b/drivers/gpu/drm/drm_modes.c -@@ -165,6 +165,7 @@ struct drm_display_mode *drm_cvt_mode(st - unsigned int vfieldrate, hperiod; - int hdisplay_rnd, hmargin, vdisplay_rnd, vmargin, vsync; - int interlace; -+ u64 tmp; - - /* allocate the drm_display_mode structure. If failure, we will - * return directly -@@ -322,8 +323,11 @@ struct drm_display_mode *drm_cvt_mode(st - drm_mode->vsync_end = drm_mode->vsync_start + vsync; - } - /* 15/13. Find pixel clock frequency (kHz for xf86) */ -- drm_mode->clock = drm_mode->htotal * HV_FACTOR * 1000 / hperiod; -- drm_mode->clock -= drm_mode->clock % CVT_CLOCK_STEP; -+ tmp = drm_mode->htotal; /* perform intermediate calcs in u64 */ -+ tmp *= HV_FACTOR * 1000; -+ do_div(tmp, hperiod); -+ tmp -= drm_mode->clock % CVT_CLOCK_STEP; -+ drm_mode->clock = tmp; - /* 18/16. Find actual vertical frame frequency */ - /* ignore - just set the mode flag for interlaced */ - if (interlaced) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/ipc-msg-make-msgrcv-work-with-LONG_MIN.patch new/patches.fixes/ipc-msg-make-msgrcv-work-with-LONG_MIN.patch --- old/patches.fixes/ipc-msg-make-msgrcv-work-with-LONG_MIN.patch 2017-02-18 18:59:27.000000000 +0100 +++ new/patches.fixes/ipc-msg-make-msgrcv-work-with-LONG_MIN.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,67 +0,0 @@ -From: Jiri Slaby <jslaby@suse.cz> -Date: Wed, 14 Dec 2016 15:06:07 -0800 -Subject: ipc: msg, make msgrcv work with LONG_MIN -Git-commit: 999898355e08ae3b92dfd0a08db706e0c6703d30 -Patch-mainline: v4.10-rc1 -References: bnc#1005918 - -When LONG_MIN is passed to msgrcv, one would expect to recieve any -message. But convert_mode does *msgtyp = -*msgtyp and -LONG_MIN is -undefined. In particular, with my gcc -LONG_MIN produces -LONG_MIN -again. - -So handle this case properly by assigning LONG_MAX to *msgtyp if -LONG_MIN was specified as msgtyp to msgrcv. - -This code: - long msg[] = { 100, 200 }; - int m = msgget(IPC_PRIVATE, IPC_CREAT | 0644); - msgsnd(m, &msg, sizeof(msg), 0); - msgrcv(m, &msg, sizeof(msg), LONG_MIN, 0); - -produces currently nothing: - - msgget(IPC_PRIVATE, IPC_CREAT|0644) = 65538 - msgsnd(65538, {100, "\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}, 16, 0) = 0 - msgrcv(65538, ... - -Except a UBSAN warning: - - UBSAN: Undefined behaviour in ipc/msg.c:745:13 - negation of -9223372036854775808 cannot be represented in type 'long int': - -With the patch, I see what I expect: - - msgget(IPC_PRIVATE, IPC_CREAT|0644) = 0 - msgsnd(0, {100, "\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}, 16, 0) = 0 - msgrcv(0, {100, "\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}, 16, -9223372036854775808, 0) = 16 - -Link: http://lkml.kernel.org/r/20161024082633.10148-1-jslaby@suse.cz -Signed-off-by: Jiri Slaby <jslaby@suse.cz> -Cc: Davidlohr Bueso <dave@stgolabs.net> -Cc: Manfred Spraul <manfred@colorfullife.com> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---- - ipc/msg.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ipc/msg.c b/ipc/msg.c -index 32e9bd837cde..e3e52ce01123 100644 ---- a/ipc/msg.c -+++ b/ipc/msg.c -@@ -763,7 +763,10 @@ static inline int convert_mode(long *msgtyp, int msgflg) - if (*msgtyp == 0) - return SEARCH_ANY; - if (*msgtyp < 0) { -- *msgtyp = -*msgtyp; -+ if (*msgtyp == LONG_MIN) /* -LONG_MIN is undefined */ -+ *msgtyp = LONG_MAX; -+ else -+ *msgtyp = -*msgtyp; - return SEARCH_LESSEQUAL; - } - if (msgflg & MSG_EXCEPT) --- -2.11.0 - ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 38256 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ ++++ 2951 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:21.572123399 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:21.580122179 +0100 @@ -27,17 +27,6 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## - patches.kernel.org/patch-4.9.1 - patches.kernel.org/patch-4.9.1-2 - patches.kernel.org/patch-4.9.2-3 - patches.kernel.org/patch-4.9.3-4 - patches.kernel.org/patch-4.9.4-5 - patches.kernel.org/patch-4.9.5-6 - patches.kernel.org/patch-4.9.6-7 - patches.kernel.org/patch-4.9.7-8 - patches.kernel.org/patch-4.9.8-9 - patches.kernel.org/patch-4.9.9-10 - patches.kernel.org/patch-4.9.10-11 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -153,13 +142,13 @@ ######################################################## patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch - patches.arch/arm-refresh-mach-types.diff ++dmueller patches.arch/arm-refresh-mach-types.diff patches.arch/arm-arndale-usb.patch - patches.arch/arm-exynos-dwmmc-modalias.patch ++agraf patches.arch/arm-exynos-dwmmc-modalias.patch patches.arch/arm64-0006-arm64-Select-reboot-driver-for-X-Gene-platform.patch # arm64 fix efifb to relocate the fb on BAR move - patches.arch/arm64-Relocate-screen_info.lfb_base-on-PCI-BAR-alloc.patch ++agraf patches.arch/arm64-Relocate-screen_info.lfb_base-on-PCI-BAR-alloc.patch ######################################################## # S/390 @@ -179,7 +168,6 @@ ######################################################## # IPC patches ######################################################## - patches.fixes/ipc-msg-make-msgrcv-work-with-LONG_MIN.patch ######################################################## # nfsacl protocol (agruen) @@ -251,10 +239,11 @@ ######################################################## # btrfs ######################################################## + + # SUSE-specific patches.suse/btrfs-provide-super_operations-get_inode_dev - patches.suse/revert-btrfs-fix-lockdep-warning-on-deadlock-against-an-inode-s-log-mutex.patch - patches.suse/revert-btrfs-improve-performance-on-fsync-against-new-inode-after-rename-unlink.patch - patches.suse/btrfs-fix-extent-tree-corruption-due-to-relocation.patch + patches.suse/btrfs-fs-super.c-add-new-super-block-devices-super_block_d.patch + patches.suse/btrfs-btrfs-use-the-new-VFS-super_block_dev.patch ######################################################## # Reiserfs Patches @@ -324,13 +313,11 @@ # DRM/Video ######################################################## patches.fixes/drm-i915-Fix-S4-resume-breakage - patches.fixes/drm-Use-u64-for-intermediate-dotclock-calculations.patch patches.drivers/drm-reference-count-event-completion ######################################################## # video4linux ######################################################## - patches.drivers/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br ######################################################## # Network ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:21.632114254 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:21.632114254 +0100 @@ -1,3 +1,3 @@ -2017-02-18 18:59:27 +0100 -GIT Revision: cf9c6703e2b91aab27b2bb654ea57b05ede902de +2017-02-20 17:47:26 +0100 +GIT Revision: 81ace5a7f749b84cf86ee1d200b2561de377319f GIT Branch: stable
participants (1)
-
root@hilbertn.suse.de