Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2015-04-27 22:07:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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/kernel-debug.changes 2015-04-15 17:42:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2015-04-27 22:08:43.000000000 +0200 @@ -1,0 +2,57 @@ +Wed Apr 22 16:37:02 CEST 2015 - [email protected] + +- ftrace/x86/xen: use kernel identity mapping only when really needed + (bsc#873195, bsc#886272, bsc#903727, bsc#927725) +- commit 63ed720 + +------------------------------------------------------------------- +Wed Apr 22 13:54:15 CEST 2015 - [email protected] + +- scripts/refresh: Obsoleted by refresh_patch.sh +- commit d1dd729 + +------------------------------------------------------------------- +Wed Apr 22 09:26:15 CEST 2015 - [email protected] + +- rpm/kernel-obs-build.spec.in: Add .build.hostarch.kvm to the filelist +- commit c65f3ca + +------------------------------------------------------------------- +Tue Apr 21 17:04:11 CEST 2015 - [email protected] + +- Update Xen patches to 4.0-final. +- commit eee4e07 + +------------------------------------------------------------------- +Tue Apr 21 16:33:44 CEST 2015 - [email protected] + +- rpm/mkspec: Do not build kernel-obs-* on 32bit ppc + The buildservice uses the ppc64 kernel-obs-build package for 32bit + workers. +- commit d1e0beb + +------------------------------------------------------------------- +Tue Apr 21 16:23:11 CEST 2015 - [email protected] + +- create .build.hostarch.kvm for kernel-obs-build + OBS needs to know hostarch, with ppc64/ppc64le this is not that easy. + Lets create a marker file to help with it. + See obs-build commit: e47399d738e51 +- commit e5d9da9 + +------------------------------------------------------------------- +Tue Apr 14 15:36:11 CEST 2015 - [email protected] + +- rpm/kernel-obs-qa.spec.in: Do not fail if the kernel versions do not match +- commit 28e9e74 + +------------------------------------------------------------------- +Tue Apr 14 08:32:12 CEST 2015 - [email protected] + +- Update config files. (boo#925479) + Do not set CONFIG_SYSTEM_TRUSTED_KEYRING until we need it in future + openSUSE version: + e.g. MODULE_SIG, IMA, PKCS7(new), KEXEC_BZIMAGE_VERIFY_SIG(new) +- commit 5c4d917 + +------------------------------------------------------------------- @@ -10,0 +68,6 @@ +Mon Apr 13 16:11:20 CEST 2015 - [email protected] + +- Update to 4.0-final. +- commit 6dbc1a6 + +------------------------------------------------------------------- @@ -16,0 +80,20 @@ +Fri Apr 10 16:44:35 CEST 2015 - [email protected] + +- Update to 4.0-rc7. +- Config changes: + - x86_64/pv: + - CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512 (default) +- commit 1925449 + +------------------------------------------------------------------- +Thu Apr 9 21:17:01 CEST 2015 - [email protected] + +- of: Fix size when dma-range is not used. +- of: Move of_dma_configure() to device.c to help re-use. +- of: iommu: Add ptr to OF node arg to of_iommu_configure(). +- PCI: Add helper functions pci_get[put]_host_bridge_device(). +- PCI: Update DMA configuration from DT. +- of/pci: Add of_pci_dma_configure() to update DMA configuration. +- commit 7d1f328 + +------------------------------------------------------------------- @@ -20 +103 @@ -- commit 0f5134a +- commit ba5700e @@ -34,0 +118,97 @@ +Tue Apr 7 18:45:12 CEST 2015 - [email protected] + +- Update XGBE-A0 support to latest code +- commit 2121347 + +------------------------------------------------------------------- +Mon Apr 6 11:40:41 CEST 2015 - [email protected] + +- ARMv7: config: Enable more features + Sync over config settings that have been enabled on x86_64 in the + last few years also to ARMv7 +- commit d480a34 + +------------------------------------------------------------------- +Sun Apr 5 18:06:56 CEST 2015 - [email protected] + +- ARMv8: config: Enable more modules / feature flags +- commit 107eae5 + +------------------------------------------------------------------- +Sun Apr 5 06:25:25 CEST 2015 - [email protected] + +- ARM64: config: Disable CONFIG_INPUT_E3X0_BUTTON +- commit 9774a1b + +------------------------------------------------------------------- +Sun Apr 5 06:16:00 CEST 2015 - [email protected] + +- ARMv6/v7/v8: config: Disable ISA bus related drivers + There is no ISA bus here +- commit 469d5c3 + +------------------------------------------------------------------- +Sun Apr 5 06:09:18 CEST 2015 - [email protected] + +- ARMv7/v8: config: Disable IIO dummy drivers + Not enabled on any other arch either. +- commit b10b70d + +------------------------------------------------------------------- +Sun Apr 5 05:59:33 CEST 2015 - [email protected] + +- ARMv7: config: Disable accessibility + Its not enabled on any other architecture, and enablement was + an accident. +- commit 7197f38 + +------------------------------------------------------------------- +Sun Apr 5 05:47:29 CEST 2015 - [email protected] + +- ARMv6/v7/v8: config: Disable debug/compat/self test options + Disable those options that shouldn't be enabled on a production + kernel and are not either enabled on x86_64 +- commit 5f7e741 + +------------------------------------------------------------------- +Sun Apr 5 05:04:45 CEST 2015 - [email protected] + +- ARMv8/v7: config: Sync more features from x86_64 + Enable various feature flags on ARM if they're also set on x86_64 + to ensure that the feature sets available is roughly compareable +- commit f250654 + +------------------------------------------------------------------- +Sat Apr 4 14:39:27 CEST 2015 - [email protected] + +- ARMv6/v7: config: build uncommon HID drivers as modules + 92db3f1ad forgot to update ARM configs accordingly. +- commit a83ec68 + +------------------------------------------------------------------- +Sat Apr 4 13:46:11 CEST 2015 - [email protected] + +- ARM64: config: Sync vanilla with default config +- commit 7be032d + +------------------------------------------------------------------- +Sat Apr 4 13:40:00 CEST 2015 - [email protected] + +- ARM64/ARMv6/ARMv7: config: Sync tunables with x86_64 + Set numeric tunables to the same values as on x86_64 if they're + available for both platforms. +- commit e4e34f2 + +------------------------------------------------------------------- +Fri Apr 3 17:49:40 CEST 2015 - [email protected] + +- Automatically Provide/Obsolete all subpackages of old flavors (bnc#925567) +- commit e3547a5 + +------------------------------------------------------------------- +Thu Apr 2 13:32:51 CEST 2015 - [email protected] + +- ARMv6: config: Update and reenable for 4.0-rc6 +- commit e32301a + +------------------------------------------------------------------- @@ -41 +221,7 @@ -- commit a30f81d +- commit f54483c + +------------------------------------------------------------------- +Tue Mar 31 22:38:51 CEST 2015 - [email protected] + +- ARM: config: Enable Stack Protector +- commit 0f06efd @@ -52 +238,26 @@ -- commit b5dbf85 ++++ 500 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa-xen.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-pv.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change Old: ---- linux-3.19.tar.xz New: ---- linux-4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -149,7 +149,11 @@ Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +%ifarch ppc64 +Provides: kernel-kdump-base = 2.6.28 +Obsoletes: kernel-kdump-base <= 2.6.28 +%endif +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -955,7 +959,10 @@ Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd - +%ifarch ppc64 +Provides: kernel-kdump-base = 2.6.28 +Obsoletes: kernel-kdump-base <= 2.6.28 +%endif %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif @@ -994,7 +1001,10 @@ Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd - +%ifarch ppc64 +Provides: kernel-kdump-extra = 2.6.28 +Obsoletes: kernel-kdump-extra <= 2.6.28 +%endif Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) %ifarch %ix86 Conflicts: libc.so.6()(64bit) @@ -1046,7 +1056,10 @@ Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) - +%ifarch ppc64 +Provides: kernel-kdump-devel = 2.6.28 +Obsoletes: kernel-kdump-devel <= 2.6.28 +%endif PreReq: coreutils %description devel ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -150,8 +150,6 @@ Obsoletes: kernel-smp <= 2.6.17 Provides: kernel-trace = 3.13 Obsoletes: kernel-trace <= 3.13 -Provides: kernel-trace-base = 3.13 -Obsoletes: kernel-trace-base <= 3.13 %endif %ifarch ppc64 Provides: kernel-kdump = 2.6.28 @@ -160,20 +158,34 @@ %ifarch s390x Provides: kernel-trace = 3.13 Obsoletes: kernel-trace <= 3.13 -Provides: kernel-trace-base = 3.13 -Obsoletes: kernel-trace-base <= 3.13 %endif %ifarch x86_64 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 Provides: kernel-trace = 3.13 Obsoletes: kernel-trace <= 3.13 -Provides: kernel-trace-base = 3.13 -Obsoletes: kernel-trace-base <= 3.13 Provides: kernel-bigsmp = 3.1 Obsoletes: kernel-bigsmp <= 3.1 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +%ifarch %ix86 +Provides: kernel-trace-base = 3.13 +Obsoletes: kernel-trace-base <= 3.13 +%endif +%ifarch ppc64 +Provides: kernel-kdump-base = 2.6.28 +Obsoletes: kernel-kdump-base <= 2.6.28 +%endif +%ifarch s390x +Provides: kernel-trace-base = 3.13 +Obsoletes: kernel-trace-base <= 3.13 +%endif +%ifarch x86_64 +Provides: kernel-trace-base = 3.13 +Obsoletes: kernel-trace-base <= 3.13 +Provides: kernel-bigsmp-base = 3.1 +Obsoletes: kernel-bigsmp-base <= 3.1 +%endif +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -978,7 +990,24 @@ Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd - +%ifarch %ix86 +Provides: kernel-trace-base = 3.13 +Obsoletes: kernel-trace-base <= 3.13 +%endif +%ifarch ppc64 +Provides: kernel-kdump-base = 2.6.28 +Obsoletes: kernel-kdump-base <= 2.6.28 +%endif +%ifarch s390x +Provides: kernel-trace-base = 3.13 +Obsoletes: kernel-trace-base <= 3.13 +%endif +%ifarch x86_64 +Provides: kernel-trace-base = 3.13 +Obsoletes: kernel-trace-base <= 3.13 +Provides: kernel-bigsmp-base = 3.1 +Obsoletes: kernel-bigsmp-base <= 3.1 +%endif %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif @@ -1020,6 +1049,10 @@ Provides: kernel-trace-extra = 3.13 Obsoletes: kernel-trace-extra <= 3.13 %endif +%ifarch ppc64 +Provides: kernel-kdump-extra = 2.6.28 +Obsoletes: kernel-kdump-extra <= 2.6.28 +%endif %ifarch s390x Provides: kernel-trace-extra = 3.13 Obsoletes: kernel-trace-extra <= 3.13 @@ -1027,6 +1060,8 @@ %ifarch x86_64 Provides: kernel-trace-extra = 3.13 Obsoletes: kernel-trace-extra <= 3.13 +Provides: kernel-bigsmp-extra = 3.1 +Obsoletes: kernel-bigsmp-extra <= 3.1 %endif Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) %ifarch %ix86 @@ -1082,6 +1117,10 @@ Provides: kernel-trace-devel = 3.13 Obsoletes: kernel-trace-devel <= 3.13 %endif +%ifarch ppc64 +Provides: kernel-kdump-devel = 2.6.28 +Obsoletes: kernel-kdump-devel <= 2.6.28 +%endif %ifarch s390x Provides: kernel-trace-devel = 3.13 Obsoletes: kernel-trace-devel <= 3.13 @@ -1089,6 +1128,8 @@ %ifarch x86_64 Provides: kernel-trace-devel = 3.13 Obsoletes: kernel-trace-devel <= 3.13 +Provides: kernel-bigsmp-devel = 3.1 +Obsoletes: kernel-bigsmp-devel <= 3.1 %endif PreReq: coreutils ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: Kernel optimized for the desktop License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -146,7 +146,8 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz + +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -16,7 +16,7 @@ # -%define patchversion 3.19.4 +%define patchversion 4.0.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -27,9 +27,9 @@ Summary: Kernel Documentation (man pages) License: GPL-2.0 Group: Documentation/Man -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The Amazon EC2 Xen Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -146,7 +146,8 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz + +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 3.19.4 +%define patchversion 4.0.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -33,7 +33,7 @@ %ifarch %ix86 x86_64 BuildRequires: kernel-xen %endif -ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le s390x x86_64 %if 0%{?suse_version} < 1315 # For SLE 11 BuildRequires: mkinitrd @@ -45,9 +45,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -147,9 +147,14 @@ cp -v /tmp/initrd.xen $RPM_BUILD_ROOT/.build.initrd.xen %endif +#inform worker about arch +#see obs-build commit e47399d738e51 +uname -m > $RPM_BUILD_ROOT/.build.hostarch.kvm + %files %defattr(-,root,root) /.build.kernel.* /.build.initrd.* +/.build.hostarch.* %changelog ++++++ kernel-obs-qa-xen.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 3.19.4 +%define patchversion 4.0.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: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -59,15 +59,12 @@ # test suites should be packaged in other packages, but build required # and called here. -if ! /sbin/modprobe loop; then - echo "ERROR: Unable to load the kernel loop module." - echo "Usually the wrong kernel is running, this is atm" - cat /proc/version - echo "Installed kernel modules are:" - rpm -q kernel-xen - exit 1 +krel=$(uname -r) +if test ! -d "/lib/modules/$krel/kernel"; then + echo "Kernel package for $krel not installed; exiting" + exit 0 fi - +/sbin/modprobe loop %install mkdir -p %{buildroot}/usr/share/%name ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 3.19.4 +%define patchversion 4.0.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -28,7 +28,7 @@ # here as well to avoid that qa and build package build parallel BuildRequires: kernel-obs-build BuildRequires: modutils -ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le s390x x86_64 %if 0%{?suse_version} < 1200 # for SLE 11 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -59,15 +59,12 @@ # test suites should be packaged in other packages, but build required # and called here. -if ! /sbin/modprobe loop; then - echo "ERROR: Unable to load the kernel loop module." - echo "Usually the wrong kernel is running, this is atm" - cat /proc/version - echo "Installed kernel modules are:" - rpm -q kernel-default - exit 1 +krel=$(uname -r) +if test ! -d "/lib/modules/$krel/kernel"; then + echo "Kernel package for $krel not installed; exiting" + exit 0 fi - +/sbin/modprobe loop %install mkdir -p %{buildroot}/usr/share/%name ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -151,7 +151,11 @@ Provides: kernel-vmi = 2.6.38 Obsoletes: kernel-vmi <= 2.6.38 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +%ifarch %ix86 +Provides: kernel-vmi-base = 2.6.38 +Obsoletes: kernel-vmi-base <= 2.6.38 +%endif +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -1011,7 +1015,10 @@ Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd - +%ifarch %ix86 +Provides: kernel-vmi-extra = 2.6.38 +Obsoletes: kernel-vmi-extra <= 2.6.38 +%endif Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) %ifarch %ix86 Conflicts: libc.so.6()(64bit) @@ -1069,7 +1076,10 @@ Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) - +%ifarch %ix86 +Provides: kernel-vmi-devel = 2.6.38 +Obsoletes: kernel-vmi-devel <= 2.6.38 +%endif PreReq: coreutils %description devel ++++++ kernel-pv.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The para-virtualized Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -146,7 +146,8 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz + +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -17,8 +17,8 @@ # icecream 0 -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.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: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -45,7 +45,7 @@ Provides: %name = %version-%source_rel Provides: linux Provides: multiversion(kernel) -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 3.19.4 +Version: 4.0.0 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -146,7 +146,8 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz + +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The Xen Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -149,7 +149,8 @@ Provides: kernel-xenpae = 2.6.17 Obsoletes: kernel-xenpae <= 2.6.17 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz + +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=3.19 +SRCVERSION=4.0 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ ++++ 30154 lines of diff (skipped) ++++++ guards ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -53,7 +53,17 @@ my $dh = new FileHandle; my (@files, $file); - + # @<file> syntax + if ($path =~ s/^@//) { + my $fh; + open($fh, '<', $path) or die "$path: $!\n"; + @files = <$fh>; + close($fh); + chomp(@files); + s:^$dir:: for @files; + return @files; + } + $path = slashme($path); opendir $dh, length("$dir$path") ? "$dir$path" : '.' or die "$dir$path: $!\n"; while ($file = readdir($dh)) { @@ -112,8 +122,8 @@ print "SYNOPSIS: $0 [--prefix=dir] [--path=dir1:dir2:...]\n" . " [--default=0|1] [--check|--list] [--invert-match]\n" . " [--with-guards] [--config=file] symbol ...\n\n" . - " (Default values: --path='" . join(':', @path) . "', " . - "--default=$default)\n"; + " Defaults: --default=$default\n" . + " Use --path=\@<file> to read the list of entries from <file>\n"; exit 0; } @@ -158,7 +168,7 @@ my @files; foreach (@path) { - @files = (@files, files_in($dir, slashme($_))); + @files = (@files, files_in($dir,$_)); } my %files = map { $_ => 0 } @files; @@ -167,7 +177,11 @@ if (exists $files{$patch}) { $files{$patch}++; } else { - print "Not found: $dir$patch\n"; + if ($config eq '-') { + print "Not found: $dir$patch\n"; + } else { + print "Not found in $config: $dir$patch\n"; + } $problems++; }}); ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -146,6 +146,7 @@ %endif Provides: kernel = %version-%source_rel @PROVIDES_OBSOLETES@ +@PROVIDES_OBSOLETES_BASE@ @SOURCES@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: @ARCHS@ ++++++ kernel-obs-build.spec.in ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -147,9 +147,14 @@ cp -v /tmp/initrd.xen $RPM_BUILD_ROOT/.build.initrd.xen %endif +#inform worker about arch +#see obs-build commit e47399d738e51 +uname -m > $RPM_BUILD_ROOT/.build.hostarch.kvm + %files %defattr(-,root,root) /.build.kernel.* /.build.initrd.* +/.build.hostarch.* %changelog ++++++ kernel-obs-qa.spec.in ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -59,15 +59,12 @@ # test suites should be packaged in other packages, but build required # and called here. -if ! /sbin/modprobe loop; then - echo "ERROR: Unable to load the kernel loop module." - echo "Usually the wrong kernel is running, this is atm" - cat /proc/version - echo "Installed kernel modules are:" - rpm -q kernel-@FLAVOR@ - exit 1 +krel=$(uname -r) +if test ! -d "/lib/modules/$krel/kernel"; then + echo "Kernel package for $krel not installed; exiting" + exit 0 fi - +/sbin/modprobe loop %install mkdir -p %{buildroot}/usr/share/%name ++++++ linux-3.19.tar.xz -> linux-4.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-3.19.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new/linux-4.0.tar.xz differ: char 26, line 1 ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -99,19 +99,19 @@ $description = $binary_descriptions{"kernel-$flavor"}->[1]; } + my %obsolete_macros; + for my $subpac ("", "-base", "-extra", "-devel", "-hmac") { + (my $macro = "PROVIDES_OBSOLETES" . uc($subpac)) =~ s/-/_/; + $obsolete_macros{$macro} = + provides_obsoletes($flavor, $subpac, @{$flavor_archs{$flavor}}); + } + do_spec('binary', "kernel-$flavor.spec", %macros, FLAVOR => $flavor, SUMMARY => $summary, DESCRIPTION => $description, ARCHS => join(" ", arch2rpm(@{$flavor_archs{$flavor}})), - PROVIDES_OBSOLETES => - provides_obsoletes($flavor, @{$flavor_archs{$flavor}}), - PROVIDES_OBSOLETES_BASE => - provides_obsoletes("$flavor-base", @{$flavor_archs{$flavor}}), - PROVIDES_OBSOLETES_EXTRA => - provides_obsoletes("$flavor-extra", @{$flavor_archs{$flavor}}), - PROVIDES_OBSOLETES_DEVEL => - provides_obsoletes("$flavor-devel", @{$flavor_archs{$flavor}}), + %obsolete_macros ); } # kernel-source.spec @@ -144,7 +144,10 @@ # kernel-obs-*.spec { - my $default_archs = join(" ", arch2rpm(@{$flavor_archs{default}})); + my @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); my $xen_archs = join(" ", arch2rpm(@{$flavor_archs{xen} || []})); if (!$variant) { do_spec('obs-build', "kernel-obs-build.spec", %macros, @@ -329,22 +332,34 @@ sub provides_obsoletes { my $flavor = shift; + my $subpac = shift; my @archs = @_; my $res = ""; for my $arch (@archs) { my @packs = @{$obsolete_packages{$arch}{$flavor} || []}; + my $printed; + next if (!@packs); my $rpmarch = arch2rpm($arch); chomp $rpmarch; - $res .= "\%ifarch $rpmarch\n"; for my $pack (@packs) { - my $name = $pack->[0]; + my $name = $pack->[0] . $subpac; my $version = $pack->[1]; + if ($subpac) { + # The -base and -extra split has been + # introduced in SLE11 (2.6.27) + my ($v1, $v2, $v3) = split(/\./, $version); + next if ($v1 <= 2 && $v2 <= 6 && $v3 < 27); + } + if (!$printed) { + $res .= "\%ifarch $rpmarch\n"; + $printed = 1; + } $res .= "Provides: $name = $version\n"; $res .= "Obsoletes: $name <= $version\n"; } - $res .= "\%endif\n"; + $res .= "\%endif\n" if $printed; } chomp $res; return $res; ++++++ old-flavors ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -26,21 +26,11 @@ # SLES 11 GA only / 11.4 i386/pae vmi 2.6.38 -i386/pae-base vmi-base 2.6.38 # SLES 11 SP3 / openSUSE 13.1 i386/default trace 3.13 -i386/default trace-base 3.13 -i386/default-extra trace-extra 3.13 -i386/default-devel trace-devel 3.13 x86_64/default trace 3.13 -x86_64/default trace-base 3.13 -x86_64/default-extra trace-extra 3.13 -x86_64/default-devel trace-devel 3.13 x86_64/default bigsmp 3.1 s390x/default trace 3.13 -s390x/default trace-base 3.13 -s390x/default-extra trace-extra 3.13 -s390x/default-devel trace-devel 3.13 ++++++ patches.arch.tar.bz2 ++++++ ++++ 8653 lines of diff (skipped) ++++++ patches.drivers.tar.bz2 ++++++ ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch new/patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch --- old/patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch 2015-04-08 15:45:02.000000000 +0200 +++ new/patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -From f06b6b4778a54a4b5af39b59af01ff6106c8ab68 Mon Sep 17 00:00:00 2001 -From: Michal Marek <[email protected]> -Date: Mon, 26 Jan 2015 11:25:26 +0100 -Subject: [PATCH] DocBook: Do not exceed argument list limit -Patch-mainline: Submitted 2015-01-26 - -Use find + xargs to compress the generated manpages. Without this patch, -the build can fail with - - gzip -f Documentation/DocBook/man/*.9 - /bin/bash: /usr/bin/gzip: Argument list too long - -This happened with qemu user mode emulation on aarch64. - -Signed-off-by: Michal Marek <[email protected]> ---- - Documentation/DocBook/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile -index 9c7d92d..b6a6a2e 100644 ---- a/Documentation/DocBook/Makefile -+++ b/Documentation/DocBook/Makefile -@@ -56,7 +56,7 @@ htmldocs: $(HTML) - - MAN := $(patsubst %.xml, %.9, $(BOOKS)) - mandocs: $(MAN) -- $(if $(wildcard $(obj)/man/*.9),gzip -f $(obj)/man/*.9) -+ find $(obj)/man -name '*.9' | xargs gzip -f - - installmandocs: mandocs - mkdir -p /usr/local/man/man9/ --- -2.1.2 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/btrfs-simplify-insert_orphan_item.patch new/patches.fixes/btrfs-simplify-insert_orphan_item.patch --- old/patches.fixes/btrfs-simplify-insert_orphan_item.patch 2015-04-08 15:45:02.000000000 +0200 +++ new/patches.fixes/btrfs-simplify-insert_orphan_item.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -From: David Sterba <[email protected]> -Date: Fri, 2 Jan 2015 19:12:57 +0100 -Subject: [PATCH 13/97] btrfs: simplify insert_orphan_item -References: boo#926385 -Git-commit: 9c4f61f01d269815bb7c37be3ede59c5587747c6 -Patch-mainline: 4.0 - -We can search and add the orphan item in one go, -btrfs_insert_orphan_item will find out if the item already exists. - -[Bug introduced in 3.19.1 stable, depends on -381cf6587f8a8a8e981bc0c1aaaa8859b51dc756 ] - -Signed-off-by: David Sterba <[email protected]> ---- - fs/btrfs/tree-log.c | 16 ++++------------ - 1 file changed, 4 insertions(+), 12 deletions(-) - -diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c -index 5be45c12dd71..25a1c363a5f4 100644 ---- a/fs/btrfs/tree-log.c -+++ b/fs/btrfs/tree-log.c -@@ -1254,21 +1254,13 @@ out: - } - - static int insert_orphan_item(struct btrfs_trans_handle *trans, -- struct btrfs_root *root, u64 offset) -+ struct btrfs_root *root, u64 ino) - { - int ret; -- struct btrfs_path *path; -- -- path = btrfs_alloc_path(); -- if (!path) -- return -ENOMEM; - -- ret = btrfs_find_item(root, path, BTRFS_ORPHAN_OBJECTID, -- offset, BTRFS_ORPHAN_ITEM_KEY, NULL); -- if (ret > 0) -- ret = btrfs_insert_orphan_item(trans, root, offset); -- -- btrfs_free_path(path); -+ ret = btrfs_insert_orphan_item(trans, root, ino); -+ if (ret == -EEXIST) -+ ret = 0; - - return ret; - } --- -2.1.3 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/drm-Fixup-racy-refcounting-in-plane_force_disable new/patches.fixes/drm-Fixup-racy-refcounting-in-plane_force_disable --- old/patches.fixes/drm-Fixup-racy-refcounting-in-plane_force_disable 2015-04-08 15:45:02.000000000 +0200 +++ new/patches.fixes/drm-Fixup-racy-refcounting-in-plane_force_disable 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -From 8218c3f4df3bb1c637c17552405039a6dd3c1ee1 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <[email protected]> -Date: Fri, 27 Feb 2015 12:58:13 +0100 -Subject: [PATCH] drm: Fixup racy refcounting in plane_force_disable -Git-commit: 8218c3f4df3bb1c637c17552405039a6dd3c1ee1 -Patch-mainline: 4.0-rc6 -References: boo#925946 - -Originally it was impossible to be dropping the last refcount in this -function since there was always one around still from the idr. But in - -commit 83f45fc360c8e16a330474860ebda872d1384c8c -Author: Daniel Vetter <[email protected]> -Date: Wed Aug 6 09:10:18 2014 +0200 - - drm: Don't grab an fb reference for the idr - -we've switched to weak references, broke that assumption but forgot to -fix it up. - -Since we still force-disable planes it's only possible to hit this -when racing multiple rmfb with fbdev restoring or similar evil things. -As long as userspace is nice it's impossible to hit the BUG_ON. - -But the BUG_ON would most likely be hit from fbdev code, which usually -invovles the console_lock besides all modeset locks. So very likely -we'd never get the bug reports if this was hit in the wild, hence -better be safe than sorry and backport. - -Spotted by Matt Roper while reviewing other patches. - -[airlied: pull this back into 4.0 - the oops happens there] - -Cc: [email protected] -Cc: Matt Roper <[email protected]> -Reviewed-by: Matt Roper <[email protected]> -Signed-off-by: Daniel Vetter <[email protected]> -Signed-off-by: Dave Airlie <[email protected]> -Acked-by: Takashi Iwai <[email protected]> - ---- - drivers/gpu/drm/drm_crtc.c | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - ---- a/drivers/gpu/drm/drm_crtc.c -+++ b/drivers/gpu/drm/drm_crtc.c -@@ -531,17 +531,6 @@ void drm_framebuffer_reference(struct dr - } - EXPORT_SYMBOL(drm_framebuffer_reference); - --static void drm_framebuffer_free_bug(struct kref *kref) --{ -- BUG(); --} -- --static void __drm_framebuffer_unreference(struct drm_framebuffer *fb) --{ -- DRM_DEBUG("%p: FB ID: %d (%d)\n", fb, fb->base.id, atomic_read(&fb->refcount.refcount)); -- kref_put(&fb->refcount, drm_framebuffer_free_bug); --} -- - /** - * drm_framebuffer_unregister_private - unregister a private fb from the lookup idr - * @fb: fb to unregister -@@ -1322,7 +1311,7 @@ void drm_plane_force_disable(struct drm_ - return; - } - /* disconnect the plane from the fb and crtc: */ -- __drm_framebuffer_unreference(plane->old_fb); -+ drm_framebuffer_unreference(plane->old_fb); - plane->old_fb = NULL; - plane->fb = NULL; - plane->crtc = NULL; ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 22023 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/ftrace-x86-xen-use-kernel-identity-mapping-only-when.patch new/patches.suse/ftrace-x86-xen-use-kernel-identity-mapping-only-when.patch --- old/patches.suse/ftrace-x86-xen-use-kernel-identity-mapping-only-when.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/ftrace-x86-xen-use-kernel-identity-mapping-only-when.patch 2015-04-24 13:46:53.000000000 +0200 @@ -0,0 +1,82 @@ +From: Petr Mladek <[email protected]> +Date: Tue, 3 Jun 2014 16:19:24 +0200 +Subject: [PATCH 3/3] ftrace/x86/xen: use kernel identity mapping only when + really needed +Patch-mainline: Cleaner solution is needed once the related Xen part gets upstream +Reference: bsc#873195, bsc#886272, bsc#903727, bsc#927725 + +The dynamic ftrace is not correctly initialized when the kernel is being loaded +using the Xen hypervisor: + +[ 0.150025] ftrace: allocating 27371 entries in 107 pages +[ 0.156405] ------------[ cut here ]------------ +[ 0.156594] WARNING: CPU: 0 PID: 0 at kernel/trace/ftrace.c:1759 ftrace_bug+0x21f/0x250() +[ 0.156909] Modules linked in: +[ 0.157126] Supported: Yes +[ 0.157282] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.12.20-77.gb9ca132-xen+ #402 +[ 0.157563] Hardware name: /DG965WH, BIOS MQ96510J.86A.1687.2007.0510.0258 05/10/2007 +[ 0.157869] ffffffff809c4902 ffffffff80c2fee8 ffffffff80737e9d ffffffff80c2fee8 +[ 0.158406] ffffffff800361bc ffff880000004018 0000000000000000 ffffffff80004018 +[ 0.158915] 0000000000000000 ffff8800abc87820 0000000000000000 ffffffff80004018 +[ 0.159426] Call Trace: +[ 0.159616] [<ffffffff80008e38>] dump_trace+0x78/0x1c0 +[ 0.159808] [<ffffffff80008b00>] show_stack_log_lvl+0xf0/0x150 +[ 0.160000] [<ffffffff8000a5b5>] show_stack+0x25/0x50 +[ 0.160000] [<ffffffff80737e9d>] dump_stack+0x6a/0x7d +[ 0.160000] [<ffffffff800361bc>] warn_slowpath_common+0x8c/0xc0 +[ 0.160000] [<ffffffff800d835f>] ftrace_bug+0x21f/0x250 +[ 0.160000] [<ffffffff800d8642>] ftrace_update_code+0x212/0x330 +[ 0.160000] [<ffffffff800dac29>] ftrace_process_locs+0x1b9/0x270 +[ 0.160000] [<ffffffff80d27ed4>] ftrace_init+0xd2/0x15e +[ 0.160000] [<ffffffff80d14cff>] start_kernel+0x407/0x4c8 +[ 0.160000] ---[ end trace 0b1cf71181aff5a9 ]--- +[ 0.160000] ftrace faulted on writing [<ffffffff80004018>] do_one_initcall+0x18/0x1e0 + +The problem is that the kernel identity mapping is set read only very early +in this situation, see make_readonly() that is called from xen_init_pt(). + +This patch uses the fact that the kernel text mapping is set read only in +kernel_init() that is called after ftrace_init(). Therefore we could safely +use the kernel text mapping during the ftrace initialization. + +The change of the kernel text mapping permissions is signalized by the global +variable "kernel_set_to_readonly", see mark_rodata_ro(). + +A cleaner solution would be to introduce another global variable that would +signalize the change of permissions in the kernel identity mapping. Then we +could create another helper functions that could modify permission only +of the kernel identity mapping and call them from ftrace_init(). Note that +the existing set_kernel_text_rw() and set_kernel_text_ro() modify the kernel +text mapping as well. But this is complicated and can not be accepted upstream +because the Xen code is still not there. + +Signed-off-by: Petr Mladek <[email protected]> +--- + arch/x86/kernel/ftrace.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +--- a/arch/x86/kernel/ftrace.c ++++ b/arch/x86/kernel/ftrace.c +@@ -84,12 +84,20 @@ static unsigned long text_ip_addr(unsign + * CONFIG_DEBUG_RODATA. So we use the kernel identity mapping instead + * of the kernel text mapping to modify the kernel text. + * ++ * This is not needed when the kernel is not set read only. In fact, ++ * the kernel text mapping might be read only when this function is ++ * called from ftrace_init() and the kernel was loaded under ++ * Xen hypervisor. In this situation, we could safely use the ++ * kernel text mapping. ++ * + * For 32bit kernels, these mappings are same and we can use + * kernel identity mapping to modify code. + */ +- if (within(ip, (unsigned long)_text, (unsigned long)_etext)) ++#ifdef CONFIG_DEBUG_RODATA ++ if (kernel_set_to_readonly && ++ within(ip, (unsigned long)_text, (unsigned long)_etext)) + ip = (unsigned long)__va(__pa_symbol(ip)); +- ++#endif + return ip; + } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/supported-flag new/patches.suse/supported-flag --- old/patches.suse/supported-flag 2015-01-21 19:22:32.000000000 +0100 +++ new/patches.suse/supported-flag 2015-04-24 13:46:53.000000000 +0200 @@ -48,9 +48,9 @@ --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt @@ -843,6 +843,18 @@ can be ORed together: - 8192 - An unsigned module has been loaded in a kernel supporting module signature. 16384 - A soft lockup has previously occurred on the system. + 32768 - The kernel has been live patched. + 0x40000000 - An unsupported kernel module was loaded. + 0x80000000 - An kernel module with external support was loaded. + @@ -93,8 +93,8 @@ /* * Only to be used by arch init code. If the user over-wrote the default @@ -472,6 +475,15 @@ extern enum system_states { - #define TAINT_UNSIGNED_MODULE 13 #define TAINT_SOFTLOCKUP 14 + #define TAINT_LIVEPATCH 15 +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED +/* @@ -322,9 +322,9 @@ --- a/kernel/panic.c +++ b/kernel/panic.c @@ -226,6 +226,10 @@ static const struct tnt tnts[] = { - { TAINT_OOT_MODULE, 'O', ' ' }, { TAINT_UNSIGNED_MODULE, 'E', ' ' }, { TAINT_SOFTLOCKUP, 'L', ' ' }, + { TAINT_LIVEPATCH, 'K', ' ' }, +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED + { TAINT_NO_SUPPORT, 'N', ' ' }, + { TAINT_EXTERNAL_SUPPORT, 'X', ' ' }, @@ -333,9 +333,9 @@ /** @@ -246,6 +250,8 @@ static const struct tnt tnts[] = { - * 'O' - Out-of-tree module has been loaded. * 'E' - Unsigned module has been loaded. * 'L' - A soft lockup has previously occurred. + * 'K' - Kernel has been live patched. + * 'N' - Unsuported modules loaded. + * 'X' - Modules with external support loaded. * ++++++ patches.xen.tar.bz2 ++++++ ++++ 11480 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:55.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:55.000000000 +0200 @@ -27,10 +27,6 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## - patches.kernel.org/patch-3.19.1 - patches.kernel.org/patch-3.19.1-2 - patches.kernel.org/patch-3.19.2-3 - patches.kernel.org/patch-3.19.3-4 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -66,7 +62,6 @@ patches.suse/supported-flag-external patches.suse/genksyms-add-override-flag.diff patches.suse/kconfig-automate-kernel-desktop - patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch ######################################################## # Simple export additions/removals @@ -174,8 +169,26 @@ patches.arch/arm64-0007-arm64-Do-not-call-enable-PCI-resources-when-specify-.patch patches.arch/arm64-0010-KVM-ARM-Hack-to-enable-VGIC-mapping-on-64k-PAGE_SIZE.patch patches.arch/arm64-0011-Enable-CONFIG_COMPAT-also-for-64k-page-size.patch - patches.arch/arm64-0012-generic-pci.patch - patches.arch/arm64-fix-mmap2-compat-syscall.patch + patches.arch/arm64-0012-fix-mmap2-compat-syscall.patch + + # Generic PCIe host bridge, necessary for QEMU and Seattle, upstreaming wip + patches.arch/arm64-gpex-0001-device-core-Introduce-per-device-MSI-domain-pointer.patch + patches.arch/arm64-gpex-0002-PCI-MSI-add-hooks-to-populate-the-msi_domain-field.patch + patches.arch/arm64-gpex-0003-PCI-MSI-of-add-support-for-OF-provided-msi_domain.patch + patches.arch/arm64-gpex-0004-PCI-MSI-Let-pci_msi_get_domain-use-struct-device-s-m.patch + patches.arch/arm64-gpex-0005-irqchip-GICv2m-Get-rid-of-struct-msi_controller.patch + patches.arch/arm64-gpex-0006-irqchip-gicv3-its-Get-rid-of-struct-msi_controller.patch + patches.arch/arm64-gpex-0007-PCI-MSI-Drop-domain-field-from-msi_controller.patch + patches.arch/arm64-gpex-0008-PCI-MSI-of-Allow-msi_domain-lookup-using-the-PHB-nod.patch + patches.arch/arm64-gpex-0009-pci-Enable-pci-host-generic-support-for-ARM64.patch + + # DMA Cache coherency fixups with PCIe, necessary for m400, all are backports from 4.1 + patches.arch/arm64-pci-0001-of-pci-Add-of_pci_dma_configure-to-update-DMA-config.patch + patches.arch/arm64-pci-0002-PCI-Update-DMA-configuration-from-DT.patch + patches.arch/arm64-pci-0003-PCI-Add-helper-functions-pci_get-put-_host_bridge_de.patch + patches.arch/arm64-pci-0004-of-iommu-Add-ptr-to-OF-node-arg-to-of_iommu_configur.patch + patches.arch/arm64-pci-0005-of-Move-of_dma_configure-to-device.c-to-help-re-use.patch + patches.arch/arm64-pci-0006-of-Fix-size-when-dma-range-is-not-used.patch ######################################################## # S/390 @@ -261,7 +274,6 @@ # btrfs ######################################################## patches.suse/btrfs-use-correct-device-for-maps.patch - patches.fixes/btrfs-simplify-insert_orphan_item.patch patches.fixes/btrfs-fix-inode-eviction-infinite-loop-after-cloning.patch ######################################################## @@ -347,7 +359,6 @@ # DRM/Video ######################################################## +jeffm patches.fixes/nouveau-fix-race-with-fence-signaling - patches.fixes/drm-Fixup-racy-refcounting-in-plane_force_disable ######################################################## # video4linux @@ -486,6 +497,9 @@ # Performance Monitoring, Tracing etc ######################################################## + # failed to initialize ftrace in kernel-xen (bsc#873195) + patches.suse/ftrace-x86-xen-use-kernel-identity-mapping-only-when.patch + ######################################################## # KVM patches ######################################################## @@ -588,6 +602,7 @@ patches.xen/xen3-patch-3.17 patches.xen/xen3-patch-3.18 patches.xen/xen3-patch-3.19 + patches.xen/xen3-patch-4.0 # ports of other patches patches.xen/xen3-stack-unwind ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:56.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:56.000000000 +0200 @@ -1,3 +1,3 @@ -2015-04-14 06:39:50 +0200 -GIT Revision: 74c332ba11409dc319e7ed43fbf41416eabe8534 +2015-04-24 14:39:28 +0200 +GIT Revision: 27299c0b9ca0fe19144d2e22df9bbf0acfa01938 GIT Branch: stable
