Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2012-09-26 16:31:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source", Maintainer is "kernel-maintainers@forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-cubox.changes 2012-08-05 15:14:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-cubox.changes 2012-09-26 16:31:20.000000000 +0200 @@ -1,0 +2,350 @@ +Tue Sep 25 22:29:37 CEST 2012 - jeffm@suse.com + +- Update to 3.6-rc7. + Eliminated one patch. +- commit 91c0ddc + +------------------------------------------------------------------- +Tue Sep 25 12:22:19 CEST 2012 - mmarek@suse.cz + +- Delete scripts/config.sh, rpm/config.sh has all the needed information +- commit 06c7ff0 + +------------------------------------------------------------------- +Thu Sep 20 16:23:37 CEST 2012 - jeffm@suse.com + +- x86/kbuild: archscripts depends on scripts_basic. + patches.rpmify/makefile-fix-scripts_basic-archscripts-build-order is + now obsolete. +- commit 33eb1e6 + +------------------------------------------------------------------- +Wed Sep 19 19:38:11 CEST 2012 - jeffm@suse.com + +- Makefile: Fix scripts_basic / archscripts build order. +- commit 65590b3 + +------------------------------------------------------------------- +Wed Sep 19 10:19:49 CEST 2012 - agraf@suse.de + +- Delete patches.arch/arm-phys-offset.patch. +- commit 50837bd + +------------------------------------------------------------------- +Mon Sep 17 15:57:42 CEST 2012 - jeffm@suse.com + +- Update to 3.6-rc6. +- Eliminated 1 patch. + patches.arch/arm-phys-offset.patch needs review. +- commit d6432fe + +------------------------------------------------------------------- +Tue Sep 11 21:09:59 CEST 2012 - dmueller@suse.com + +- (ARM/tegra) remove non-building module from config +- commit 4cdd491 + +------------------------------------------------------------------- +Tue Sep 11 03:39:18 CEST 2012 - jeffm@suse.com + +- config: disabled MFD drivers that aren't buildable as modules + This allows MFD_CORE to be modular on all arch/flavors except for + ARM and the non-PAE flavors on i386, since it's used with the OLPC XO-1. +- commit ff91de4 + +------------------------------------------------------------------- +Mon Sep 10 19:22:00 CEST 2012 - jeffm@suse.com + +- Update to 3.6-rc5. +- commit 11b8e7e + +------------------------------------------------------------------- +Mon Sep 10 10:20:23 CEST 2012 - jbeulich@novell.com + +- patches.arch/s390-message-catalog.diff: Properly handle pr_cont() and fold + in the below two trivial fixes. +- Delete patches.arch/s390-message-catalog-fix.diff. +- Delete patches.arch/s390-message-catalog-perl-fix.diff. +- Refresh patches.arch/kmsg-fix-parameter-limitations. +- commit 71b4cc3 + +------------------------------------------------------------------- +Fri Sep 7 15:46:33 CEST 2012 - dmueller@suse.com + +- fix build of imx51 flavor by removing irrelevant drivers +- commit 7ea6615 + +------------------------------------------------------------------- +Fri Sep 7 15:42:48 CEST 2012 - dmueller@suse.com + +- remove drivers that do not exist and do not build on ARM (default) +- commit 2319db4 + +------------------------------------------------------------------- +Thu Sep 6 20:35:49 CEST 2012 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-identify-virtual-pc-in-ata_piix.patch. +- commit fb4b7f9 + +------------------------------------------------------------------- +Thu Sep 6 20:12:46 CEST 2012 - ohering@suse.de + +- identify Virtual PC guests in ata_piix (bnc#737532). +- commit 13500ed + +------------------------------------------------------------------- +Thu Sep 6 14:00:37 CEST 2012 - mmarek@suse.cz + +- rpm/package-descriptions: Fix typo +- commit c08c34b + +------------------------------------------------------------------- +Thu Sep 6 10:35:01 CEST 2012 - jbeulich@novell.com + +- Update Xen patches to 3.6-rc4 and c/s 1188. +- config.conf: Re-enable Xen configs. +- Update x86 config files. +- commit 4cdebd8 + +------------------------------------------------------------------- +Tue Sep 4 20:29:36 CEST 2012 - jeffm@suse.com + +- Update to 3.6-rc4. +- Eliminated one patch. +- commit 9fe3afb + +------------------------------------------------------------------- +Tue Sep 4 10:47:47 CEST 2012 - mmarek@suse.cz + +- Disable CONFIG_KMSG_IDS on s390x, because it is currently broken +- commit c1db24a + +------------------------------------------------------------------- +Mon Sep 3 10:59:37 CEST 2012 - jslaby@suse.cz + +- Update config files. (vanilla ones) +- commit ca19bfb + +------------------------------------------------------------------- +Fri Aug 31 23:20:23 CEST 2012 - dmueller@suse.com + +- ARM(omap2plus): Remove optional parts that don't compile +- commit 77105c2 + +------------------------------------------------------------------- +Fri Aug 31 15:18:07 CEST 2012 - jslaby@suse.cz + +- i2c/busses: Fix build error if CONFIG_I2C_DESIGNWARE_PLATFORM=y + && CONFIG_I2C_DESIGN. +- Delete + patches.fixes/i2c-busses-fix-build-error-if-config_i2c_designware_platform-y-config_i2c_design. + Move it to rpmify, so that vanilla builds fine too. +- commit 0217ad5 + +------------------------------------------------------------------- +Thu Aug 30 20:02:21 CEST 2012 - agraf@suse.de + +- Update config files: Add highbank (forgot in last patch) +- commit e86b000 + +------------------------------------------------------------------- +Thu Aug 30 19:28:20 CEST 2012 - agraf@suse.de + +- config.conf: Enable ARM +- Update ARM config files. +- Add highbank definition +- commit 835e93d + +------------------------------------------------------------------- +Thu Aug 30 11:07:12 CEST 2012 - mmarek@suse.cz + +- rpm/kernel-module-subpackage: Provide name-kmp = %version in KMPs + This allows userspace packages to require a specific version of a KMP, + wothout worrying about the _k<kernel version> suffix. +- commit caaaa9a + +------------------------------------------------------------------- +Tue Aug 28 04:11:34 CEST 2012 - jeffm@suse.com + +- config: Update -vanilla for ChipIdea fix +- commit c45f0ac + +------------------------------------------------------------------- +Tue Aug 28 00:15:16 CEST 2012 - jeffm@suse.com + +- chipidea: Allow user to select PCI/IMX options. + This allows us to disable the ChipIdea IMX code on powerpc, + where it was causing build problems. +- commit 278cad2 + +------------------------------------------------------------------- +Tue Aug 28 00:00:35 CEST 2012 - jeffm@suse.com + +- config: Disable EXYNOS_VIDEO and HW_RANDOM_EXYNOS on all configs except exynos + This hardware is only found on the Samsung EXYNOS boards. +- commit 429a008 + +------------------------------------------------------------------- +Mon Aug 27 22:54:06 CEST 2012 - jeffm@suse.com + +- Revert "clk.h: Fix shim ifdef guard (HAVE_CLK -> COMMON_CLK)." + This reverts commit 54e1c0025e4757174d8d648e8224bf74009b3c2b. + The issue is either an incomplete clk API on powerpc or clk_devm needs + to be made generic. Discussion continues upstream. +- commit 8c9a4e9 + +------------------------------------------------------------------- ++++ 161 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/kernel-cubox.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-cubox.changes kernel-debug.changes: same change kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-exynos.changes: same change New Changes file: --- /dev/null 2012-08-23 02:41:28.555381587 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-highbank.changes 2012-09-26 16:31:20.000000000 +0200 @@ -0,0 +1,26545 @@ +------------------------------------------------------------------- +Tue Sep 25 22:29:37 CEST 2012 - jeffm@suse.com + +- Update to 3.6-rc7. + Eliminated one patch. +- commit 91c0ddc + +------------------------------------------------------------------- +Tue Sep 25 12:22:19 CEST 2012 - mmarek@suse.cz + +- Delete scripts/config.sh, rpm/config.sh has all the needed information +- commit 06c7ff0 + +------------------------------------------------------------------- +Thu Sep 20 16:23:37 CEST 2012 - jeffm@suse.com + +- x86/kbuild: archscripts depends on scripts_basic. + patches.rpmify/makefile-fix-scripts_basic-archscripts-build-order is + now obsolete. +- commit 33eb1e6 + +------------------------------------------------------------------- +Wed Sep 19 19:38:11 CEST 2012 - jeffm@suse.com + +- Makefile: Fix scripts_basic / archscripts build order. +- commit 65590b3 + +------------------------------------------------------------------- +Wed Sep 19 10:19:49 CEST 2012 - agraf@suse.de + +- Delete patches.arch/arm-phys-offset.patch. +- commit 50837bd + +------------------------------------------------------------------- +Mon Sep 17 15:57:42 CEST 2012 - jeffm@suse.com + +- Update to 3.6-rc6. +- Eliminated 1 patch. + patches.arch/arm-phys-offset.patch needs review. +- commit d6432fe + +------------------------------------------------------------------- +Tue Sep 11 21:09:59 CEST 2012 - dmueller@suse.com + +- (ARM/tegra) remove non-building module from config +- commit 4cdd491 + +------------------------------------------------------------------- +Tue Sep 11 03:39:18 CEST 2012 - jeffm@suse.com + +- config: disabled MFD drivers that aren't buildable as modules + This allows MFD_CORE to be modular on all arch/flavors except for + ARM and the non-PAE flavors on i386, since it's used with the OLPC XO-1. +- commit ff91de4 + +------------------------------------------------------------------- +Mon Sep 10 19:22:00 CEST 2012 - jeffm@suse.com + +- Update to 3.6-rc5. +- commit 11b8e7e + +------------------------------------------------------------------- +Mon Sep 10 10:20:23 CEST 2012 - jbeulich@novell.com + +- patches.arch/s390-message-catalog.diff: Properly handle pr_cont() and fold + in the below two trivial fixes. +- Delete patches.arch/s390-message-catalog-fix.diff. +- Delete patches.arch/s390-message-catalog-perl-fix.diff. +- Refresh patches.arch/kmsg-fix-parameter-limitations. +- commit 71b4cc3 + +------------------------------------------------------------------- +Fri Sep 7 15:46:33 CEST 2012 - dmueller@suse.com + +- fix build of imx51 flavor by removing irrelevant drivers +- commit 7ea6615 + +------------------------------------------------------------------- +Fri Sep 7 15:42:48 CEST 2012 - dmueller@suse.com + +- remove drivers that do not exist and do not build on ARM (default) +- commit 2319db4 + +------------------------------------------------------------------- +Thu Sep 6 20:35:49 CEST 2012 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-identify-virtual-pc-in-ata_piix.patch. +- commit fb4b7f9 + +------------------------------------------------------------------- +Thu Sep 6 20:12:46 CEST 2012 - ohering@suse.de + +- identify Virtual PC guests in ata_piix (bnc#737532). +- commit 13500ed + +------------------------------------------------------------------- +Thu Sep 6 14:00:37 CEST 2012 - mmarek@suse.cz + +- rpm/package-descriptions: Fix typo +- commit c08c34b + +------------------------------------------------------------------- +Thu Sep 6 10:35:01 CEST 2012 - jbeulich@novell.com + +- Update Xen patches to 3.6-rc4 and c/s 1188. +- config.conf: Re-enable Xen configs. +- Update x86 config files. +- commit 4cdebd8 + +------------------------------------------------------------------- +Tue Sep 4 20:29:36 CEST 2012 - jeffm@suse.com + +- Update to 3.6-rc4. +- Eliminated one patch. +- commit 9fe3afb + +------------------------------------------------------------------- +Tue Sep 4 10:47:47 CEST 2012 - mmarek@suse.cz + +- Disable CONFIG_KMSG_IDS on s390x, because it is currently broken +- commit c1db24a + +------------------------------------------------------------------- +Mon Sep 3 10:59:37 CEST 2012 - jslaby@suse.cz + +- Update config files. (vanilla ones) +- commit ca19bfb + +------------------------------------------------------------------- +Fri Aug 31 23:20:23 CEST 2012 - dmueller@suse.com + +- ARM(omap2plus): Remove optional parts that don't compile +- commit 77105c2 + +------------------------------------------------------------------- +Fri Aug 31 15:18:07 CEST 2012 - jslaby@suse.cz + +- i2c/busses: Fix build error if CONFIG_I2C_DESIGNWARE_PLATFORM=y + && CONFIG_I2C_DESIGN. +- Delete + patches.fixes/i2c-busses-fix-build-error-if-config_i2c_designware_platform-y-config_i2c_design. + Move it to rpmify, so that vanilla builds fine too. +- commit 0217ad5 + +------------------------------------------------------------------- +Thu Aug 30 20:02:21 CEST 2012 - agraf@suse.de + +- Update config files: Add highbank (forgot in last patch) +- commit e86b000 + +------------------------------------------------------------------- +Thu Aug 30 19:28:20 CEST 2012 - agraf@suse.de + +- config.conf: Enable ARM +- Update ARM config files. +- Add highbank definition +- commit 835e93d + +------------------------------------------------------------------- +Thu Aug 30 11:07:12 CEST 2012 - mmarek@suse.cz + +- rpm/kernel-module-subpackage: Provide name-kmp = %version in KMPs + This allows userspace packages to require a specific version of a KMP, + wothout worrying about the _k<kernel version> suffix. +- commit caaaa9a + +------------------------------------------------------------------- +Tue Aug 28 04:11:34 CEST 2012 - jeffm@suse.com + +- config: Update -vanilla for ChipIdea fix +- commit c45f0ac + +------------------------------------------------------------------- +Tue Aug 28 00:15:16 CEST 2012 - jeffm@suse.com + +- chipidea: Allow user to select PCI/IMX options. + This allows us to disable the ChipIdea IMX code on powerpc, + where it was causing build problems. +- commit 278cad2 + +------------------------------------------------------------------- +Tue Aug 28 00:00:35 CEST 2012 - jeffm@suse.com + +- config: Disable EXYNOS_VIDEO and HW_RANDOM_EXYNOS on all configs except exynos + This hardware is only found on the Samsung EXYNOS boards. +- commit 429a008 + +------------------------------------------------------------------- +Mon Aug 27 22:54:06 CEST 2012 - jeffm@suse.com + +- Revert "clk.h: Fix shim ifdef guard (HAVE_CLK -> COMMON_CLK)." + This reverts commit 54e1c0025e4757174d8d648e8224bf74009b3c2b. + The issue is either an incomplete clk API on powerpc or clk_devm needs + to be made generic. Discussion continues upstream. +- commit 8c9a4e9 + ++++ 26348 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-highbank.changes --- /work/SRC/openSUSE:Factory/kernel-source/kernel-imx51.changes 2012-08-05 15:14:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-imx51.changes 2012-09-26 16:31:20.000000000 +0200 @@ -1,0 +2,350 @@ +Tue Sep 25 22:29:37 CEST 2012 - jeffm@suse.com + +- Update to 3.6-rc7. + Eliminated one patch. +- commit 91c0ddc + +------------------------------------------------------------------- +Tue Sep 25 12:22:19 CEST 2012 - mmarek@suse.cz + +- Delete scripts/config.sh, rpm/config.sh has all the needed information +- commit 06c7ff0 + +------------------------------------------------------------------- +Thu Sep 20 16:23:37 CEST 2012 - jeffm@suse.com + +- x86/kbuild: archscripts depends on scripts_basic. + patches.rpmify/makefile-fix-scripts_basic-archscripts-build-order is + now obsolete. +- commit 33eb1e6 + +------------------------------------------------------------------- +Wed Sep 19 19:38:11 CEST 2012 - jeffm@suse.com + +- Makefile: Fix scripts_basic / archscripts build order. +- commit 65590b3 + +------------------------------------------------------------------- +Wed Sep 19 10:19:49 CEST 2012 - agraf@suse.de + +- Delete patches.arch/arm-phys-offset.patch. +- commit 50837bd + +------------------------------------------------------------------- +Mon Sep 17 15:57:42 CEST 2012 - jeffm@suse.com + +- Update to 3.6-rc6. +- Eliminated 1 patch. + patches.arch/arm-phys-offset.patch needs review. +- commit d6432fe + +------------------------------------------------------------------- +Tue Sep 11 21:09:59 CEST 2012 - dmueller@suse.com + +- (ARM/tegra) remove non-building module from config +- commit 4cdd491 + +------------------------------------------------------------------- +Tue Sep 11 03:39:18 CEST 2012 - jeffm@suse.com + +- config: disabled MFD drivers that aren't buildable as modules + This allows MFD_CORE to be modular on all arch/flavors except for + ARM and the non-PAE flavors on i386, since it's used with the OLPC XO-1. +- commit ff91de4 + +------------------------------------------------------------------- +Mon Sep 10 19:22:00 CEST 2012 - jeffm@suse.com + +- Update to 3.6-rc5. +- commit 11b8e7e + +------------------------------------------------------------------- +Mon Sep 10 10:20:23 CEST 2012 - jbeulich@novell.com + +- patches.arch/s390-message-catalog.diff: Properly handle pr_cont() and fold + in the below two trivial fixes. +- Delete patches.arch/s390-message-catalog-fix.diff. +- Delete patches.arch/s390-message-catalog-perl-fix.diff. +- Refresh patches.arch/kmsg-fix-parameter-limitations. +- commit 71b4cc3 + +------------------------------------------------------------------- +Fri Sep 7 15:46:33 CEST 2012 - dmueller@suse.com + +- fix build of imx51 flavor by removing irrelevant drivers +- commit 7ea6615 + +------------------------------------------------------------------- +Fri Sep 7 15:42:48 CEST 2012 - dmueller@suse.com + +- remove drivers that do not exist and do not build on ARM (default) +- commit 2319db4 + +------------------------------------------------------------------- +Thu Sep 6 20:35:49 CEST 2012 - ohering@suse.de + +- Refresh + patches.suse/suse-hv-identify-virtual-pc-in-ata_piix.patch. +- commit fb4b7f9 + +------------------------------------------------------------------- +Thu Sep 6 20:12:46 CEST 2012 - ohering@suse.de + +- identify Virtual PC guests in ata_piix (bnc#737532). +- commit 13500ed + +------------------------------------------------------------------- +Thu Sep 6 14:00:37 CEST 2012 - mmarek@suse.cz + +- rpm/package-descriptions: Fix typo +- commit c08c34b + +------------------------------------------------------------------- +Thu Sep 6 10:35:01 CEST 2012 - jbeulich@novell.com + +- Update Xen patches to 3.6-rc4 and c/s 1188. +- config.conf: Re-enable Xen configs. +- Update x86 config files. +- commit 4cdebd8 + +------------------------------------------------------------------- +Tue Sep 4 20:29:36 CEST 2012 - jeffm@suse.com + +- Update to 3.6-rc4. +- Eliminated one patch. +- commit 9fe3afb + +------------------------------------------------------------------- +Tue Sep 4 10:47:47 CEST 2012 - mmarek@suse.cz + +- Disable CONFIG_KMSG_IDS on s390x, because it is currently broken +- commit c1db24a + +------------------------------------------------------------------- +Mon Sep 3 10:59:37 CEST 2012 - jslaby@suse.cz + +- Update config files. (vanilla ones) +- commit ca19bfb + +------------------------------------------------------------------- +Fri Aug 31 23:20:23 CEST 2012 - dmueller@suse.com + +- ARM(omap2plus): Remove optional parts that don't compile +- commit 77105c2 + +------------------------------------------------------------------- +Fri Aug 31 15:18:07 CEST 2012 - jslaby@suse.cz + +- i2c/busses: Fix build error if CONFIG_I2C_DESIGNWARE_PLATFORM=y + && CONFIG_I2C_DESIGN. +- Delete + patches.fixes/i2c-busses-fix-build-error-if-config_i2c_designware_platform-y-config_i2c_design. + Move it to rpmify, so that vanilla builds fine too. +- commit 0217ad5 + +------------------------------------------------------------------- +Thu Aug 30 20:02:21 CEST 2012 - agraf@suse.de + +- Update config files: Add highbank (forgot in last patch) +- commit e86b000 + +------------------------------------------------------------------- +Thu Aug 30 19:28:20 CEST 2012 - agraf@suse.de + +- config.conf: Enable ARM +- Update ARM config files. +- Add highbank definition +- commit 835e93d + +------------------------------------------------------------------- +Thu Aug 30 11:07:12 CEST 2012 - mmarek@suse.cz + +- rpm/kernel-module-subpackage: Provide name-kmp = %version in KMPs + This allows userspace packages to require a specific version of a KMP, + wothout worrying about the _k<kernel version> suffix. +- commit caaaa9a + +------------------------------------------------------------------- +Tue Aug 28 04:11:34 CEST 2012 - jeffm@suse.com + +- config: Update -vanilla for ChipIdea fix +- commit c45f0ac + +------------------------------------------------------------------- +Tue Aug 28 00:15:16 CEST 2012 - jeffm@suse.com + +- chipidea: Allow user to select PCI/IMX options. + This allows us to disable the ChipIdea IMX code on powerpc, + where it was causing build problems. +- commit 278cad2 + +------------------------------------------------------------------- +Tue Aug 28 00:00:35 CEST 2012 - jeffm@suse.com + +- config: Disable EXYNOS_VIDEO and HW_RANDOM_EXYNOS on all configs except exynos + This hardware is only found on the Samsung EXYNOS boards. +- commit 429a008 + +------------------------------------------------------------------- +Mon Aug 27 22:54:06 CEST 2012 - jeffm@suse.com + +- Revert "clk.h: Fix shim ifdef guard (HAVE_CLK -> COMMON_CLK)." + This reverts commit 54e1c0025e4757174d8d648e8224bf74009b3c2b. + The issue is either an incomplete clk API on powerpc or clk_devm needs + to be made generic. Discussion continues upstream. +- commit 8c9a4e9 + +------------------------------------------------------------------- ++++ 161 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/kernel-imx51.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-imx51.changes kernel-omap2plus.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-tegra.changes: same change kernel-trace.changes: same change kernel-u8500.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change Old: ---- linux-3.5.tar.bz2 New: ---- IGNORE-KABI-BADNESS kernel-highbank.changes kernel-highbank.spec linux-3.6-rc7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-cubox.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-cubox Summary: Kernel for SolidRun Cubox -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -136,7 +136,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -139,7 +139,7 @@ Obsoletes: kernel-kdump %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-default Summary: The Standard Kernel -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -155,7 +155,7 @@ Obsoletes: smp kernel-smp %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -136,7 +136,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,14 +17,14 @@ # norootforbuild -%define patchversion 3.5.0 +%define patchversion 3.6.0-rc7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -136,7 +136,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh kernel-exynos.spec: same change ++++++ kernel-highbank.spec ++++++ ++++ 923 lines (skipped) ++++++ kernel-imx51.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-imx51 Summary: Kernel for Freescale's iMX SoC -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -136,7 +136,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh kernel-omap2plus.spec: same change ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -139,7 +139,7 @@ Obsoletes: kernel-bigsmp %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -143,7 +143,7 @@ Obsoletes: kernel-kdump %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-s390 Summary: The Standard Kernel -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -139,7 +139,7 @@ Obsoletes: kernel-32bit %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -18,8 +18,8 @@ # norootforbuild # icecream 0 -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -29,7 +29,7 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: Development/Sources @@ -41,7 +41,7 @@ Provides: multiversion(kernel) Provides: linux Provides: %name = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -23,7 +23,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.5.0 +Version: 3.6.rc7 %if %using_buildservice Release: 0 %else @@ -48,6 +48,9 @@ Requires: kernel-exynos-devel = %version-%source_rel %endif %ifarch armv7hl +Requires: kernel-highbank-devel = %version-%source_rel +%endif +%ifarch armv7hl Requires: kernel-imx51-devel = %version-%source_rel %endif %ifarch armv7hl ++++++ kernel-tegra.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-tegra Summary: Kernel for Nvidia's Tegra SoC -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -136,7 +136,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -147,7 +147,7 @@ Obsoletes: kernel-64bit %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-u8500.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-u8500 Summary: Kernel for ST-Ericsson's Nova SoC -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -136,7 +136,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -143,7 +143,7 @@ Obsoletes: kernel-64bit %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.5 -%define patchversion 3.5.0 +%define srcversion 3.6-rc7 +%define patchversion 3.6.0-rc7 %define variant %{nil} %define vanilla_only 0 @@ -57,7 +57,7 @@ Name: kernel-xen Summary: The Xen Kernel -Version: 3.5.0 +Version: 3.6.rc7 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release @@ -136,7 +136,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz... Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ IGNORE-KABI-BADNESS ++++++ ignore ++++++ config.addon.tar.bz2 ++++++ ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:28.000000000 +0200 @@ -48,6 +48,7 @@ +armv7hl armv7hl/u8500 +armv7hl armv7hl/cubox +armv7hl armv7hl/exynos ++armv7hl armv7hl/highbank # SLES # identical to ppc64 flavor, all KMP packages need a kernel-default ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:29.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:29.000000000 +0200 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=3.5 +SRCVERSION=3.6-rc7 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ ++++ 27793 lines of diff (skipped) ++++++ kabi.tar.bz2 ++++++ ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:29.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:29.000000000 +0200 @@ -82,7 +82,7 @@ # packages to install/update. Likewise, this is true for mkinitrd. # Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry Requires(post): perl-Bootloader >= 0.4.15 -Requires(post): mkinitrd +Requires(post): mkinitrd >= 2.7.1 # Install the package providing /etc/SuSE-release early enough, so that # the grub entry has correct title (bnc#757565) Requires(post): distribution-release ++++++ kernel-module-subpackage ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:29.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:29.000000000 +0200 @@ -21,6 +21,7 @@ ' $spec ) Provides: %{-n*} = %_this_kmp_version +Provides: %{-n*} = %{-v*} Provides: multiversion(kernel) Requires: coreutils grep Enhances: kernel-%1 ++++++ package-descriptions ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:29.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:29.000000000 +0200 @@ -157,3 +157,8 @@ The standard kernel for Samsung's Exynos 4 & 5 SoC, as found in the Origen board. +=== kernel-highbank === +Kernel for Calxeda Highbank SoC + +The standard kernel for Calxeda's Highbank SoC, as found in the HP Moonshot project. + ++++++ patches.addon.tar.bz2 ++++++ ++++++ patches.apparmor.tar.bz2 ++++++ ++++++ patches.arch.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_fix_empty_srat_mem_declarations.patch new/patches.arch/acpi_fix_empty_srat_mem_declarations.patch --- old/patches.arch/acpi_fix_empty_srat_mem_declarations.patch 2012-07-27 16:36:35.000000000 +0200 +++ new/patches.arch/acpi_fix_empty_srat_mem_declarations.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,156 +0,0 @@ -From: Thomas Renninger <trenn@suse.de> -Subject: ACPI: Only count valid srat memory structures -References: bnc#757888 -Patch-Mainline: not yet - -Otherwise you could run into: -WARN_ON in numa_register_memblks(), because node_possible_map is zero - -References: https://bugzilla.novell.com/show_bug.cgi?id=757888 - -On this machine (ProLiant ML570 G3) the SRAT table contains: - - No processor affinities - - One memory affinity structure (which is set disabled) - -CC: Per Jessen <per@opensuse.org> -CC: Andi Kleen <andi@firstfloor.org> - ---- - arch/ia64/kernel/acpi.c | 5 +++-- - arch/x86/mm/srat.c | 15 ++++++++------- - drivers/acpi/numa.c | 8 +++++--- - include/linux/acpi.h | 2 +- - 4 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c -index 6f38b61..44057885 100644 ---- a/arch/ia64/kernel/acpi.c -+++ b/arch/ia64/kernel/acpi.c -@@ -497,7 +497,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) - srat_num_cpus++; - } - --void __init -+int __init - acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) - { - unsigned long paddr, size; -@@ -512,7 +512,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) - - /* Ignore disabled entries */ - if (!(ma->flags & ACPI_SRAT_MEM_ENABLED)) -- return; -+ return -1; - - /* record this node in proximity bitmap */ - pxm_bit_set(pxm); -@@ -531,6 +531,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) - p->size = size; - p->nid = pxm; - num_node_memblks++; -+ return 0; - } - - void __init acpi_numa_arch_fixup(void) -diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c -index 4599c3e..4ddf497 100644 ---- a/arch/x86/mm/srat.c -+++ b/arch/x86/mm/srat.c -@@ -142,23 +142,23 @@ static inline int save_add_info(void) {return 0;} - #endif - - /* Callback for parsing of the Proximity Domain <-> Memory Area mappings */ --void __init -+int __init - acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) - { - u64 start, end; - int node, pxm; - - if (srat_disabled()) -- return; -+ return -1; - if (ma->header.length != sizeof(struct acpi_srat_mem_affinity)) { - bad_srat(); -- return; -+ return -1; - } - if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0) -- return; -+ return -1; - - if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info()) -- return; -+ return -1; - start = ma->base_address; - end = start + ma->length; - pxm = ma->proximity_domain; -@@ -168,12 +168,12 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) - if (node < 0) { - printk(KERN_ERR "SRAT: Too many proximity domains.\n"); - bad_srat(); -- return; -+ return -1; - } - - if (numa_add_memblk(node, start, end) < 0) { - bad_srat(); -- return; -+ return -1; - } - - node_set(node, numa_nodes_parsed); -@@ -181,6 +181,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) - printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n", - node, pxm, - (unsigned long long) start, (unsigned long long) end - 1); -+ return 0; - } - - void __init acpi_numa_arch_fixup(void) {} -diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c -index 2a63993..cb31298 100644 ---- a/drivers/acpi/numa.c -+++ b/drivers/acpi/numa.c -@@ -237,6 +237,8 @@ acpi_parse_processor_affinity(struct acpi_subtable_header *header, - return 0; - } - -+static int __initdata parsed_numa_memblks; -+ - static int __init - acpi_parse_memory_affinity(struct acpi_subtable_header * header, - const unsigned long end) -@@ -250,8 +252,8 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header, - acpi_table_print_srat_entry(header); - - /* let architecture-dependent part to do it */ -- acpi_numa_memory_affinity_init(memory_affinity); -- -+ if (!acpi_numa_memory_affinity_init(memory_affinity)) -+ parsed_numa_memblks++; - return 0; - } - -@@ -306,7 +308,7 @@ int __init acpi_numa_init(void) - - if (cnt < 0) - return cnt; -- else if (cnt == 0) -+ else if (!parsed_numa_memblks) - return -ENOENT; - return 0; - } -diff --git a/include/linux/acpi.h b/include/linux/acpi.h -index 9fb292c..14e0bb0 100644 ---- a/include/linux/acpi.h -+++ b/include/linux/acpi.h -@@ -102,7 +102,7 @@ void acpi_table_print_madt_entry (struct acpi_subtable_header *madt); - void acpi_numa_slit_init (struct acpi_table_slit *slit); - void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa); - void acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa); --void acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); -+int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); - void acpi_numa_arch_fixup(void); - - #ifdef CONFIG_ACPI_HOTPLUG_CPU diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-omap-add-drm.patch new/patches.arch/arm-omap-add-drm.patch --- old/patches.arch/arm-omap-add-drm.patch 2012-07-27 16:36:35.000000000 +0200 +++ new/patches.arch/arm-omap-add-drm.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,208 +0,0 @@ -From 34e0d3acc7b22345fa6d5fe291f76146b43ce292 Mon Sep 17 00:00:00 2001 -From: Andy Gross <andy.gross@ti.com> -Date: Wed, 28 Mar 2012 17:32:55 -0500 -Subject: [PATCH] omap2+: add drm device -Patch-Mainline: No, but Rob Clark said they want to hit 3.6 - -Register OMAP DRM/KMS platform device, and reserve a CMA region for -the device to use for buffer allocation. DMM is split into a -separate device using hwmod. - -Signed-off-by: Andy Gross <andy.gross@ti.com> -Signed-off-by: Rob Clark <rob@ti.com> -Signed-off-by: Alexander Graf <agraf@suse.de> - -diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile -index fa742f3..a636cdc 100644 ---- a/arch/arm/mach-omap2/Makefile -+++ b/arch/arm/mach-omap2/Makefile -@@ -189,6 +189,10 @@ endif - # OMAP2420 MSDI controller integration support ("MMC") - obj-$(CONFIG_SOC_OMAP2420) += msdi.o - -+ifneq ($(CONFIG_DRM_OMAP),) -+obj-y += drm.o -+endif -+ - # Specific board support - obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o - obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o -diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c -new file mode 100644 -index 0000000..779ae02 ---- /dev/null -+++ b/arch/arm/mach-omap2/drm.c -@@ -0,0 +1,83 @@ -+/* -+ * DRM/KMS device registration for TI OMAP platforms -+ * -+ * Copyright (C) 2012 Texas Instruments -+ * Author: Rob Clark <rob.clark@linaro.org> -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 as published by -+ * the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program. If not, see <http://www.gnu.org/licenses/>. -+ */ -+ -+#include <linux/module.h> -+#include <linux/kernel.h> -+#include <linux/mm.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/dma-mapping.h> -+#ifdef CONFIG_CMA -+# include <linux/dma-contiguous.h> -+#endif -+ -+#include <plat/omap_device.h> -+#include <plat/omap_hwmod.h> -+ -+#include <plat/drm.h> -+ -+#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE) -+ -+static struct omap_drm_platform_data omapdrm_platdata; -+ -+static struct platform_device omap_drm_device = { -+ .dev = { -+ .coherent_dma_mask = DMA_BIT_MASK(32), -+ .platform_data = &omapdrm_platdata, -+ }, -+ .name = "omapdrm", -+ .id = 0, -+}; -+ -+static int __init omap_init_drm(void) -+{ -+ struct omap_hwmod *oh = NULL; -+ struct platform_device *pdev; -+ -+ /* lookup and populate the DMM information, if present - OMAP4+ */ -+ oh = omap_hwmod_lookup("dmm"); -+ -+ if (oh) { -+ pdev = omap_device_build(oh->name, -1, oh, NULL, 0, NULL, 0, -+ false); -+ WARN(IS_ERR(pdev), "Could not build omap_device for %s\n", -+ oh->name); -+ } -+ -+ return platform_device_register(&omap_drm_device); -+ -+} -+ -+arch_initcall(omap_init_drm); -+ -+void omapdrm_reserve_vram(void) -+{ -+#ifdef CONFIG_CMA -+ /* -+ * Create private 32MiB contiguous memory area for omapdrm.0 device -+ * TODO revisit size.. if uc/wc buffers are allocated from CMA pages -+ * then the amount of memory we need goes up.. -+ */ -+ dma_declare_contiguous(&omap_drm_device.dev, 32 * SZ_1M, 0, 0); -+#else -+# warning "CMA is not enabled, there may be limitations about scanout buffer allocations on OMAP3 and earlier" -+#endif -+} -+ -+#endif -diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c -index 0a9b9a9..f0793e9 100644 ---- a/arch/arm/plat-omap/common.c -+++ b/arch/arm/plat-omap/common.c -@@ -21,6 +21,7 @@ - #include <plat/vram.h> - #include <plat/dsp.h> - #include <plat/dma.h> -+#include <plat/drm.h> - - #include <plat/omap-secure.h> - -@@ -65,6 +66,7 @@ const void *__init omap_get_var_config(u16 tag, size_t *len) - - void __init omap_reserve(void) - { -+ omapdrm_reserve_vram(); - omap_vram_reserve_sdram_memblock(); - omap_dsp_reserve_sdram_memblock(); - omap_secure_ram_reserve_memblock(); -diff --git a/arch/arm/plat-omap/include/plat/drm.h b/arch/arm/plat-omap/include/plat/drm.h -new file mode 100644 -index 0000000..df9bc41 ---- /dev/null -+++ b/arch/arm/plat-omap/include/plat/drm.h -@@ -0,0 +1,64 @@ -+/* -+ * DRM/KMS device registration for TI OMAP platforms -+ * -+ * Copyright (C) 2012 Texas Instruments -+ * Author: Rob Clark <rob.clark@linaro.org> -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 as published by -+ * the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program. If not, see <http://www.gnu.org/licenses/>. -+ */ -+ -+#ifndef __PLAT_OMAP_DRM_H__ -+#define __PLAT_OMAP_DRM_H__ -+ -+/* -+ * Optional platform data to configure the default configuration of which -+ * pipes/overlays/CRTCs are used.. if this is not provided, then instead the -+ * first CONFIG_DRM_OMAP_NUM_CRTCS are used, and they are each connected to -+ * one manager, with priority given to managers that are connected to -+ * detected devices. Remaining overlays are used as video planes. This -+ * should be a good default behavior for most cases, but yet there still -+ * might be times when you wish to do something different. -+ */ -+struct omap_kms_platform_data { -+ /* overlays to use as CRTCs: */ -+ int ovl_cnt; -+ const int *ovl_ids; -+ -+ /* overlays to use as video planes: */ -+ int pln_cnt; -+ const int *pln_ids; -+ -+ int mgr_cnt; -+ const int *mgr_ids; -+ -+ int dev_cnt; -+ const char **dev_names; -+}; -+ -+struct omap_drm_platform_data { -+ struct omap_kms_platform_data *kms_pdata; -+}; -+ -+#if defined(CONFIG_DRM_OMAP) || defined(CONFIG_DRM_OMAP_MODULE) -+ -+void omapdrm_reserve_vram(void); -+ -+#else -+ -+static inline void omapdrm_reserve_vram(void) -+{ -+} -+ -+#endif -+ -+#endif /* __PLAT_OMAP_DRM_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-phys-offset.patch new/patches.arch/arm-phys-offset.patch --- old/patches.arch/arm-phys-offset.patch 2012-07-27 16:36:35.000000000 +0200 +++ new/patches.arch/arm-phys-offset.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -From: Alexander Graf <agraf@suse.de> -Date: Wed, 23 Nov 2011 02:26:14 +0100 -Subject: [PATCH] ARM: Fix compile breakage for generic kernel -Patch-Mainline: No, will hopefully be fixed properly there - -The default kernel broke for me with the following error: - -arch/arm/kernel/head.o: In function `stext': -arch/arm/kernel/head.S:102: undefined reference to `PHYS_OFFSET' - -This patch should fix this by defining PHYS_OFFSET in memory.h even when -in an assembly section. - -Signed-off-by: Alexander Graf <agraf@suse.de> - -diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h -index a8997d7..2579e82 100644 ---- a/arch/arm/include/asm/memory.h -+++ b/arch/arm/include/asm/memory.h -@@ -139,6 +139,16 @@ - #define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page))) - #define phys_to_page(phys) (pfn_to_page(__phys_to_pfn(phys))) - -+#ifndef CONFIG_ARM_PATCH_PHYS_VIRT -+#ifndef PHYS_OFFSET -+#ifdef PLAT_PHYS_OFFSET -+#define PHYS_OFFSET PLAT_PHYS_OFFSET -+#else -+#define PHYS_OFFSET UL(CONFIG_PHYS_OFFSET) -+#endif -+#endif -+#endif -+ - #ifndef __ASSEMBLY__ - - /* -@@ -186,14 +194,6 @@ static inline unsigned long __phys_to_virt(unsigned long x) - #endif - #endif - --#ifndef PHYS_OFFSET --#ifdef PLAT_PHYS_OFFSET --#define PHYS_OFFSET PLAT_PHYS_OFFSET --#else --#define PHYS_OFFSET UL(CONFIG_PHYS_OFFSET) --#endif --#endif -- - /* - * PFNs are used to describe any physical page; this means - * PFN 0 == physical address 0. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/kmsg-fix-parameter-limitations new/patches.arch/kmsg-fix-parameter-limitations --- old/patches.arch/kmsg-fix-parameter-limitations 2012-07-27 16:36:35.000000000 +0200 +++ new/patches.arch/kmsg-fix-parameter-limitations 2012-09-10 10:20:23.000000000 +0200 @@ -38,9 +38,9 @@ #define pr_printk_hash(level, format, ...) \ - __KMSG_PRINT(level _FMT_ format _ARGS_ ##__VA_ARGS__ _END_) + __KMSG_PRINT(level _FMT_ format _ARGS_ #__VA_ARGS__ _END_) + #define __pr_printk_hash pr_printk_hash #elif defined(CONFIG_KMSG_IDS) && defined(KMSG_COMPONENT) - --- a/scripts/kmsg-doc +++ b/scripts/kmsg-doc @@ -307,7 +307,7 @@ sub process_cpp_file($$$$) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/s390-message-catalog-fix.diff new/patches.arch/s390-message-catalog-fix.diff --- old/patches.arch/s390-message-catalog-fix.diff 2012-07-27 16:36:35.000000000 +0200 +++ new/patches.arch/s390-message-catalog-fix.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -From: Jiri Slaby <jslaby@suse.cz> -Subject: fix build on s390 as of 2.6.36-rc4 -Patch-mainline: never - -This fixes patches.arch/s390-message-catalog.diff build. - -Signed-off-by: Jiri Slaby <jslaby@suse.cz> - ---- - include/linux/device.h | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/include/linux/device.h -+++ b/include/linux/device.h -@@ -660,6 +660,8 @@ int printk_dev_hash(const char *, const - - #endif - -+#define dev_printk(level, dev, format, arg...) \ -+ dev_printk_hash(level , dev, format, ## arg) - #define dev_emerg(dev, format, arg...) \ - dev_printk_hash(KERN_EMERG , dev , format , ## arg) - #define dev_alert(dev, format, arg...) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/s390-message-catalog-perl-fix.diff new/patches.arch/s390-message-catalog-perl-fix.diff --- old/patches.arch/s390-message-catalog-perl-fix.diff 2012-07-27 16:36:35.000000000 +0200 +++ new/patches.arch/s390-message-catalog-perl-fix.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -From caf357aecf85916dc605e513e0d3e6765479b172 Mon Sep 17 00:00:00 2001 -From: Michal Marek <mmarek@suse.cz> -Date: Fri, 3 Jun 2011 12:45:12 +0200 -Subject: [PATCH] scripts/kmsg-doc: Do not require Switch.pm -Patch-mainline: depends on patches.arch/s390-message-catalog.diff - -It is not used by the script and the module is no longer available in -the perl core. - -Signed-off-by: Michal Marek <mmarek@suse.cz> - -diff --git a/scripts/kmsg-doc b/scripts/kmsg-doc -index 07a0a2e..e0f64ed 100644 ---- a/scripts/kmsg-doc -+++ b/scripts/kmsg-doc -@@ -14,7 +14,6 @@ - # - - use Cwd; --use Switch; - use bigint; - - my $errors = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/s390-message-catalog.diff new/patches.arch/s390-message-catalog.diff --- old/patches.arch/s390-message-catalog.diff 2012-07-27 16:36:35.000000000 +0200 +++ new/patches.arch/s390-message-catalog.diff 2012-09-10 10:20:23.000000000 +0200 @@ -65,11 +65,11 @@ Documentation/kmsg/s390/zfcp | 865 ++++++++++++++++ Makefile | 16 arch/s390/Kconfig | 8 - include/linux/device.h | 35 - include/linux/printk.h | 35 + include/linux/device.h | 37 + include/linux/printk.h | 40 kernel/printk.c | 45 scripts/Makefile.build | 14 - scripts/kmsg-doc | 479 +++++++++ + scripts/kmsg-doc | 478 +++++++++ 47 files changed, 8324 insertions(+), 9 deletions(-) --- /dev/null @@ -7951,7 +7951,7 @@ prompt "Enable seccomp to safely compute untrusted bytecode" --- a/include/linux/device.h +++ b/include/linux/device.h -@@ -889,6 +889,39 @@ extern const char *dev_driver_string(con +@@ -889,6 +889,41 @@ extern const char *dev_driver_string(con extern int __dev_printk(const char *level, const struct device *dev, struct va_format *vaf); extern __printf(3, 4) @@ -7973,6 +7973,8 @@ + +#endif + ++#define dev_printk(level, dev, format, arg...) \ ++ dev_printk_hash(level , dev, format, ## arg) +#define dev_emerg(dev, format, arg...) \ + dev_printk_hash(KERN_EMERG , dev , format , ## arg) +#define dev_alert(dev, format, arg...) \ @@ -7991,7 +7993,7 @@ int dev_printk(const char *level, const struct device *dev, const char *fmt, ...) ; -@@ -906,7 +939,7 @@ extern __printf(2, 3) +@@ -906,7 +941,7 @@ extern __printf(2, 3) int dev_notice(const struct device *dev, const char *fmt, ...); extern __printf(2, 3) int _dev_info(const struct device *dev, const char *fmt, ...); @@ -8002,7 +8004,7 @@ static inline int __dev_printk(const char *level, const struct device *dev, --- a/include/linux/printk.h +++ b/include/linux/printk.h -@@ -173,23 +173,42 @@ extern void dump_stack(void) __cold; +@@ -173,23 +173,47 @@ extern void dump_stack(void) __cold; #define pr_fmt(fmt) fmt #endif @@ -8011,17 +8013,22 @@ +/* generate magic string for scripts/kmsg-doc to parse */ +#define pr_printk_hash(level, format, ...) \ + __KMSG_PRINT(level _FMT_ format _ARGS_ ##__VA_ARGS__ _END_) ++#define __pr_printk_hash pr_printk_hash + +#elif defined(CONFIG_KMSG_IDS) && defined(KMSG_COMPONENT) + +int printk_hash(const char *, const char *, ...); +#define pr_printk_hash(level, format, ...) \ + printk_hash(level KMSG_COMPONENT ".%06x" ": ", format, ##__VA_ARGS__) ++#define __pr_printk_hash(level, format, ...) \ ++ printk_hash(level, format, ##__VA_ARGS__) + +#else /* !defined(CONFIG_KMSG_IDS) */ + +#define pr_printk_hash(level, format, ...) \ + printk(level pr_fmt(format), ##__VA_ARGS__) ++#define __pr_printk_hash(level, format, ...) \ ++ printk(level format, ##__VA_ARGS__) + +#endif + @@ -8049,7 +8056,7 @@ + pr_printk_hash(KERN_INFO, fmt, ##__VA_ARGS__) #define pr_cont(fmt, ...) \ - printk(KERN_CONT fmt, ##__VA_ARGS__) -+ pr_printk_hash(KERN_CONT, fmt, ##__VA_ARGS__) ++ __pr_printk_hash(KERN_CONT, fmt, ##__VA_ARGS__) /* pr_devel() should produce zero code unless DEBUG is defined */ #ifdef DEBUG @@ -8149,7 +8156,7 @@ # --------------------------------------------------------------------------- --- /dev/null +++ b/scripts/kmsg-doc -@@ -0,0 +1,479 @@ +@@ -0,0 +1,478 @@ +#!/usr/bin/perl -w +# +# kmsg kernel messages check and print tool. @@ -8166,7 +8173,6 @@ +# + +use Cwd; -+use Switch; +use bigint; + +my $errors = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/srat_parsing_redo_return.patch new/patches.arch/srat_parsing_redo_return.patch --- old/patches.arch/srat_parsing_redo_return.patch 2012-07-27 16:36:35.000000000 +0200 +++ new/patches.arch/srat_parsing_redo_return.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -From: Thomas Renninger <trenn@suse.de> -Subject: ACPI: Untangle a return statement for better readability -References: bnc#757888 -Patch-Mainline: not yet - -No functional change. - -Signed-off-by: Thomas Renninger <trenn@suse.de> ---- - drivers/acpi/numa.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c -index e56f3be..2a63993 100644 ---- a/drivers/acpi/numa.c -+++ b/drivers/acpi/numa.c -@@ -304,8 +304,10 @@ int __init acpi_numa_init(void) - - acpi_numa_arch_fixup(); - -- if (cnt <= 0) -- return cnt ?: -ENOENT; -+ if (cnt < 0) -+ return cnt; -+ else if (cnt == 0) -+ return -ENOENT; - return 0; - } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86_64-unwind-annotations new/patches.arch/x86_64-unwind-annotations --- old/patches.arch/x86_64-unwind-annotations 2012-07-27 16:36:35.000000000 +0200 +++ new/patches.arch/x86_64-unwind-annotations 2012-09-10 10:20:23.000000000 +0200 @@ -4,8 +4,8 @@ References: bnc#472783, bnc#588458 --- - arch/x86/kernel/entry_64.S | 101 ++++++++++++++++++++++-------------------- - arch/x86/kernel/head_64.S | 20 ++++++++ + arch/x86/kernel/entry_64.S | 101 +++++++++++++++++++++++---------------------- + arch/x86/kernel/head_64.S | 20 ++++++++ 2 files changed, 73 insertions(+), 48 deletions(-) --- a/arch/x86/kernel/entry_64.S @@ -133,7 +133,7 @@ leaq 8(%rsp), \arg /* pt_regs pointer */ call \func jmp ptregscall_common -@@ -1101,7 +1104,7 @@ ENTRY(\sym) +@@ -1083,7 +1086,7 @@ ENTRY(\sym) subq $ORIG_RAX-R15, %rsp CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call error_entry @@ -142,7 +142,7 @@ movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym -@@ -1118,6 +1121,8 @@ ENTRY(\sym) +@@ -1100,6 +1103,8 @@ ENTRY(\sym) subq $ORIG_RAX-R15, %rsp CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid @@ -151,7 +151,7 @@ TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ -@@ -1154,7 +1159,7 @@ ENTRY(\sym) +@@ -1136,7 +1141,7 @@ ENTRY(\sym) subq $ORIG_RAX-R15, %rsp CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call error_entry @@ -160,7 +160,7 @@ movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ -@@ -1172,7 +1177,7 @@ ENTRY(\sym) +@@ -1154,7 +1159,7 @@ ENTRY(\sym) subq $ORIG_RAX-R15, %rsp CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid @@ -169,7 +169,7 @@ TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ -@@ -1513,25 +1518,24 @@ END(paranoid_exit) +@@ -1495,25 +1500,24 @@ END(paranoid_exit) * returns in "no swapgs flag" in %ebx. */ ENTRY(error_entry) @@ -210,7 +210,7 @@ xorl %ebx,%ebx testl $3,CS+8(%rsp) je error_kernelspace -@@ -1549,6 +1553,7 @@ error_sti: +@@ -1531,6 +1535,7 @@ error_sti: * compat mode. Check for these here too. */ error_kernelspace: @@ -218,15 +218,15 @@ incl %ebx leaq irq_return(%rip),%rcx cmpq %rcx,RIP+8(%rsp) -@@ -1791,7 +1796,7 @@ end_repeat_nmi: +@@ -1773,7 +1778,7 @@ end_repeat_nmi: * exceptions might do. */ call save_paranoid - DEFAULT_FRAME 0 + DEFAULT_FRAME -1 - /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */ - movq %rsp,%rdi - movq $-1,%rsi + + /* + * Save off the CR2 register. If we take a page fault in the NMI then --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -314,6 +314,25 @@ ENTRY(early_idt_handler) ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-hda-Fix-mute-LED-GPIO-setup-for-HP-Mini-210 new/patches.drivers/ALSA-hda-Fix-mute-LED-GPIO-setup-for-HP-Mini-210 --- old/patches.drivers/ALSA-hda-Fix-mute-LED-GPIO-setup-for-HP-Mini-210 2012-07-26 08:26:46.000000000 +0200 +++ new/patches.drivers/ALSA-hda-Fix-mute-LED-GPIO-setup-for-HP-Mini-210 1970-01-01 01:00:00.000000000 +0100 @@ -1,79 +0,0 @@ -From 133d1c3e7b32f1d55d34cd8197c4110131efe090 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Thu, 26 Jul 2012 08:17:20 +0200 -Subject: [PATCH] ALSA: hda - Fix mute-LED GPIO setup for HP Mini 210 -Git-commit: 133d1c3e7b32f1d55d34cd8197c4110131efe090 -Patch-mainline: 3.6-rc1 -References: bnc#772923 - -BIOS on HP Mini 210 doesn't provide the proper "HP_Mute_LED" DMI -string, thus the driver doesn't initialize the GPIO, too. In the -earlier kernel, the driver falls back to GPIO1, but since 3.3 we've -stopped this due to other wrongly advertised machines. - -For fixing this particular case, add a new model type to specify the -default polarity explicitly so that the fallback to GPIO1 is handled. - -Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=772923 - -Cc: <stable@vger.kernel.org> [v3.3+] -Signed-off-by: Takashi Iwai <tiwai@suse.de> - ---- - sound/pci/hda/patch_sigmatel.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c -index a1596a3..217ee1f 100644 ---- a/sound/pci/hda/patch_sigmatel.c -+++ b/sound/pci/hda/patch_sigmatel.c -@@ -101,6 +101,7 @@ enum { - STAC_92HD83XXX_HP_cNB11_INTQUAD, - STAC_HP_DV7_4000, - STAC_HP_ZEPHYR, -+ STAC_92HD83XXX_HP_LED, - STAC_92HD83XXX_MODELS - }; - -@@ -1675,6 +1676,7 @@ static const char * const stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = { - [STAC_92HD83XXX_HP_cNB11_INTQUAD] = "hp_cNB11_intquad", - [STAC_HP_DV7_4000] = "hp-dv7-4000", - [STAC_HP_ZEPHYR] = "hp-zephyr", -+ [STAC_92HD83XXX_HP_LED] = "hp-led", - }; - - static const struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = { -@@ -1729,6 +1731,8 @@ static const struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = { - "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD), - SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3561, - "HP", STAC_HP_ZEPHYR), -+ SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3660, -+ "HP Mini", STAC_92HD83XXX_HP_LED), - {} /* terminator */ - }; - -@@ -5507,6 +5511,7 @@ static void stac92hd8x_fill_auto_spec(struct hda_codec *codec) - static int patch_stac92hd83xxx(struct hda_codec *codec) - { - struct sigmatel_spec *spec; -+ int default_polarity = -1; /* no default cfg */ - int err; - - spec = kzalloc(sizeof(*spec), GFP_KERNEL); -@@ -5555,9 +5560,12 @@ again: - case STAC_HP_ZEPHYR: - spec->init = stac92hd83xxx_hp_zephyr_init; - break; -+ case STAC_92HD83XXX_HP_LED: -+ default_polarity = 1; -+ break; - } - -- if (find_mute_led_cfg(codec, -1/*no default cfg*/)) -+ if (find_mute_led_cfg(codec, default_polarity)) - snd_printd("mute LED gpio %d polarity %d\n", - spec->gpio_led, - spec->gpio_led_polarity); --- -1.7.10.4 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/mach-dove-Fixup-ge00-initialisation.patch new/patches.drivers/mach-dove-Fixup-ge00-initialisation.patch --- old/patches.drivers/mach-dove-Fixup-ge00-initialisation.patch 2012-07-26 08:26:46.000000000 +0200 +++ new/patches.drivers/mach-dove-Fixup-ge00-initialisation.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -From: Hannes Reinecke <hare@suse.de> -Date: Tue, 12 Jun 2012 15:41:05 +0200 -Subject: [PATCH] mach-dove: Fixup ge00 initialisation -Patch-Mainline: Submitted to linux-arm-kernel - -The last argument of orion_ge00_init() is actually the error -interrupt, so we should be using the correct value here. - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - arch/arm/mach-dove/common.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/arch/arm/mach-dove/common.c -+++ b/arch/arm/mach-dove/common.c -@@ -102,7 +102,8 @@ void __init dove_ehci1_init(void) - void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data) - { - orion_ge00_init(eth_data, -- DOVE_GE00_PHYS_BASE, IRQ_DOVE_GE00_SUM, 0); -+ DOVE_GE00_PHYS_BASE, IRQ_DOVE_GE00_SUM, -+ IRQ_DOVE_GE00_ERR); - } - - /***************************************************************************** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/megaraid-mbox-fix-SG_IO new/patches.drivers/megaraid-mbox-fix-SG_IO --- old/patches.drivers/megaraid-mbox-fix-SG_IO 2012-07-26 08:26:46.000000000 +0200 +++ new/patches.drivers/megaraid-mbox-fix-SG_IO 2012-08-17 15:00:01.000000000 +0200 @@ -13,6 +13,9 @@ into user buffer. If the buffer is at a currently unmapped highmem page, this leads to an Oops. +Update jeffm 3 Aug 2012: +- commit 20273941 (mm: fix race in kunmap_atomic()) got rid of kmap slots + Signed-off-by: Hannes Reinecke <hare@suse.de> --- @@ -36,11 +39,11 @@ + pg = sg_page(sgl); + if (pg) { + local_irq_save(flags); -+ vaddr = kmap_atomic(pg, KM_BIO_SRC_IRQ) + sgl->offset; ++ vaddr = kmap_atomic(pg) + sgl->offset; memset(vaddr, 0, scp->cmnd[4]); + -+ kunmap_atomic(vaddr, KM_BIO_SRC_IRQ); ++ kunmap_atomic(vaddr); + local_irq_restore(flags); } else { @@ -59,11 +62,11 @@ + pg = sg_page(sgl); + if (pg) { + local_irq_save(flags); -+ vaddr = kmap_atomic(pg, KM_BIO_SRC_IRQ) + sgl->offset; ++ vaddr = kmap_atomic(pg) + sgl->offset; + + c = *vaddr; + -+ kunmap_atomic(vaddr, KM_BIO_SRC_IRQ); ++ kunmap_atomic(vaddr); + local_irq_restore(flags); } else { con_log(CL_ANN, (KERN_WARNING ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/kvm-ioapic.patch new/patches.fixes/kvm-ioapic.patch --- old/patches.fixes/kvm-ioapic.patch 2012-07-26 03:08:52.000000000 +0200 +++ new/patches.fixes/kvm-ioapic.patch 2012-08-17 15:00:01.000000000 +0200 @@ -9,13 +9,13 @@ --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c -@@ -202,7 +202,8 @@ int kvm_ioapic_set_irq(struct kvm_ioapic - old_irr = ioapic->irr; - if (irq >= 0 && irq < IOAPIC_NUM_PINS) { +@@ -205,7 +205,8 @@ int kvm_ioapic_set_irq(struct kvm_ioapic + int irq_level = __kvm_irq_line_state(&ioapic->irq_states[irq], + irq_source_id, level); entry = ioapic->redirtbl[irq]; -- level ^= entry.fields.polarity; +- irq_level ^= entry.fields.polarity; +// polarity is always active high in qemu -+// level ^= entry.fields.polarity; - if (!level) ++// irq_level ^= entry.fields.polarity; + if (!irq_level) ioapic->irr &= ~mask; else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/reiserfs-fix-deadlock-with-nfs-racing-on-create-lookup new/patches.fixes/reiserfs-fix-deadlock-with-nfs-racing-on-create-lookup --- old/patches.fixes/reiserfs-fix-deadlock-with-nfs-racing-on-create-lookup 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/reiserfs-fix-deadlock-with-nfs-racing-on-create-lookup 2012-08-17 15:00:01.000000000 +0200 @@ -0,0 +1,53 @@ +From: Jeff Mahoney <jeffm@suse.com> +Subject: reiserfs: fix deadlock with nfs racing on create/lookup +References: bnc#762693 +Patch-mainline: Submitted to linux-fsdevel, 9 Aug 2012 + +Reiserfs is currently able to be deadlocked by having two NFS clients +where one has removed and recreated a file and another is accessing the +file with an open file handle. + +If one client deletes and recreates a file with timing such that the +recreated file obtains the same [dirid, objectid] pair as the original +file while another client accesses the file via file handle, the create +and lookup can race and deadlock if the lookup manages to create the +in-memory inode first. + +The create thread, in insert_inode_locked4, will hold the write lock +while waiting on the other inode to be unlocked. The lookup thread, +anywhere in the iget path, will release and reacquire the write lock while +it schedules. If it needs to reacquire the lock while the create thread +has it, it will never be able to make forward progress because it needs +to reacquire the lock before ultimately unlocking the inode. + +This patch drops the write lock across the insert_inode_locked4 call so +that the ordering of inode_wait -> write lock is retained. Since this +would have been the case before the BKL push-down, this is safe. + +Signed-off-by: Jeff Mahoney <jeffm@suse.com> +--- + + fs/reiserfs/inode.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/fs/reiserfs/inode.c ++++ b/fs/reiserfs/inode.c +@@ -1805,11 +1805,16 @@ int reiserfs_new_inode(struct reiserfs_t + TYPE_STAT_DATA, SD_SIZE, MAX_US_INT); + memcpy(INODE_PKEY(inode), &(ih.ih_key), KEY_SIZE); + args.dirid = le32_to_cpu(ih.ih_key.k_dir_id); +- if (insert_inode_locked4(inode, args.objectid, +- reiserfs_find_actor, &args) < 0) { ++ ++ reiserfs_write_unlock(inode->i_sb); ++ err = insert_inode_locked4(inode, args.objectid, ++ reiserfs_find_actor, &args); ++ reiserfs_write_lock(inode->i_sb); ++ if (err) { + err = -EINVAL; + goto out_bad_inode; + } ++ + if (old_format_only(sb)) + /* not a perfect generation count, as object ids can be reused, but + ** this is as good as reiserfs can do right now. ++++++ patches.kabi.tar.bz2 ++++++ ++++++ patches.kernel.org.tar.bz2 ++++++ ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/chipidea-clean-up-dependencies new/patches.rpmify/chipidea-clean-up-dependencies --- old/patches.rpmify/chipidea-clean-up-dependencies 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/chipidea-clean-up-dependencies 2012-08-28 00:15:16.000000000 +0200 @@ -0,0 +1,54 @@ +From: Jeff Mahoney <jeffm@suse.com> +Subject: chipidea: Allow user to select PCI/IMX options +Patch-mainline: Submitted to LKML Aug 27 2012 + +The chipidea driver currently has needless ifneq rules in the makefile +for things that should be config options. This can be problematic, +especially in the IMX case, since the OF_DEVICE dependency will be met +on powerpc systems - which don't actually support the hardware via that +method. + +This patch adds _PCI and _IMX config options to allow the user to +select whether to build the modules. + +Signed-off-by: Jeff Mahoney <jeffm@suse.com> +--- + drivers/usb/chipidea/Kconfig | 11 +++++++++++ + drivers/usb/chipidea/Makefile | 11 ++--------- + 2 files changed, 13 insertions(+), 9 deletions(-) + +--- a/drivers/usb/chipidea/Kconfig ++++ b/drivers/usb/chipidea/Kconfig +@@ -31,4 +31,15 @@ config USB_CHIPIDEA_DEBUG + help + Say Y here to enable debugging output of the ChipIdea driver. + ++config USB_CHIPIDEA_PCI ++ bool "ChipIdea PCI support" ++ depends on PCI ++ help ++ This option enables ChipIdea support on PCI. ++ ++config USB_CHIPIDEA_IMX ++ bool "ChipIdea IMX support" ++ depends on OF_DEVICE ++ help ++ This option enables ChipIdea support on IMX. + endif +--- a/drivers/usb/chipidea/Makefile ++++ b/drivers/usb/chipidea/Makefile +@@ -8,12 +8,5 @@ ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG) += + # Glue/Bridge layers go here + + obj-$(CONFIG_USB_CHIPIDEA) += ci13xxx_msm.o +- +-# PCI doesn't provide stubs, need to check +-ifneq ($(CONFIG_PCI),) +- obj-$(CONFIG_USB_CHIPIDEA) += ci13xxx_pci.o +-endif +- +-ifneq ($(CONFIG_OF_DEVICE),) +- obj-$(CONFIG_USB_CHIPIDEA) += ci13xxx_imx.o +-endif ++obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci13xxx_pci.o ++obj-$(CONFIG_USB_CHIPIDEA_IMX) += ci13xxx_imx.o diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ubifs-remove-DATE-TIME.patch new/patches.rpmify/ubifs-remove-DATE-TIME.patch --- old/patches.rpmify/ubifs-remove-DATE-TIME.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/ubifs-remove-DATE-TIME.patch 2012-08-28 00:15:16.000000000 +0200 @@ -0,0 +1,22 @@ +From: Jiri Slaby <jslaby@suse.cz> +Subject: ubifs: remove __DATE__ and __TIME__ +Patch-mainline: Submitted Aug 9th 2012 + +This tag is useless and it breaks automatic builds. It causes rebuilds +for packages that depend on kernel for no real reason. + +Signed-off-by: Jiri Slaby <jslaby@suse.cz> +--- + fs/ubifs/super.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/fs/ubifs/super.c ++++ b/fs/ubifs/super.c +@@ -1431,7 +1431,6 @@ static int mount_ubifs(struct ubifs_info + ubifs_msg("reserved for root: %llu bytes (%llu KiB)", + c->report_rp_size, c->report_rp_size >> 10); + +- dbg_msg("compiled on: " __DATE__ " at " __TIME__); + dbg_msg("min. I/O unit size: %d bytes", c->min_io_size); + dbg_msg("max. write size: %d bytes", c->max_write_size); + dbg_msg("LEB size: %d bytes (%d KiB)", ++++++ patches.rt.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch new/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch --- old/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch 2012-09-17 15:57:42.000000000 +0200 @@ -19,7 +19,7 @@ --- a/fs/namei.c +++ b/fs/namei.c -@@ -1283,6 +1283,26 @@ static inline int check_sticky(struct in +@@ -2156,6 +2156,26 @@ static inline int check_sticky(struct in } /* @@ -46,7 +46,7 @@ * Check whether we can remove a link victim from directory dir, check * whether the type of victim is right. * 1. We can't do it if dir is read-only (done in permission()) -@@ -1301,7 +1321,8 @@ static inline int check_sticky(struct in +@@ -2174,7 +2194,8 @@ static inline int check_sticky(struct in * 10. We don't allow removal of NFS sillyrenamed files; it's handled by * nfs_async_unlink(). */ @@ -56,7 +56,7 @@ { int error; -@@ -1310,14 +1331,19 @@ static int may_delete(struct inode *dir, +@@ -2183,14 +2204,19 @@ static int may_delete(struct inode *dir, BUG_ON(victim->d_parent->d_inode != dir); audit_inode_child(victim, dir); @@ -80,7 +80,7 @@ return -EPERM; if (isdir) { if (!S_ISDIR(victim->d_inode->i_mode)) -@@ -1333,6 +1359,25 @@ static int may_delete(struct inode *dir, +@@ -2206,6 +2232,25 @@ static int may_delete(struct inode *dir, return 0; } @@ -106,7 +106,7 @@ /* Check whether we can create an object with dentry child in directory * dir. * 1. We can't do it if child already exists (open has special treatment for -@@ -1341,13 +1386,16 @@ static int may_delete(struct inode *dir, +@@ -2214,13 +2259,16 @@ static int may_delete(struct inode *dir, * 3. We should have write and exec permissions on dir * 4. We can't do it if dir is immutable (done in permission()) */ @@ -125,16 +125,16 @@ } /* -@@ -1395,7 +1443,7 @@ void unlock_rename(struct dentry *p1, st +@@ -2268,7 +2316,7 @@ void unlock_rename(struct dentry *p1, st int vfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, - struct nameidata *nd) + bool want_excl) { - int error = may_create(dir, dentry); + int error = may_create(dir, dentry, 0); - if (error) return error; -@@ -1957,7 +2005,7 @@ EXPORT_SYMBOL_GPL(lookup_create); + +@@ -3054,7 +3102,7 @@ EXPORT_SYMBOL(user_path_create); int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev) { @@ -143,16 +143,16 @@ if (error) return error; -@@ -2061,7 +2109,7 @@ SYSCALL_DEFINE3(mknod, const char __user +@@ -3140,7 +3188,7 @@ SYSCALL_DEFINE3(mknod, const char __user int vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) { - int error = may_create(dir, dentry); + int error = may_create(dir, dentry, 1); - unsigned max_links = dir->i_sb->s_max_links; + unsigned max_links = dir->i_sb->s_max_links; if (error) -@@ -2151,7 +2199,7 @@ void dentry_unhash(struct dentry *dentry +@@ -3213,7 +3261,7 @@ void dentry_unhash(struct dentry *dentry int vfs_rmdir(struct inode *dir, struct dentry *dentry) { @@ -161,7 +161,7 @@ if (error) return error; -@@ -2238,7 +2286,7 @@ SYSCALL_DEFINE1(rmdir, const char __user +@@ -3307,7 +3355,7 @@ SYSCALL_DEFINE1(rmdir, const char __user int vfs_unlink(struct inode *dir, struct dentry *dentry) { @@ -170,7 +170,7 @@ if (error) return error; -@@ -2346,7 +2394,7 @@ SYSCALL_DEFINE1(unlink, const char __use +@@ -3415,7 +3463,7 @@ SYSCALL_DEFINE1(unlink, const char __use int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname) { @@ -179,7 +179,7 @@ if (error) return error; -@@ -2419,7 +2467,7 @@ int vfs_link(struct dentry *old_dentry, +@@ -3473,7 +3521,7 @@ int vfs_link(struct dentry *old_dentry, if (!inode) return -ENOENT; @@ -188,7 +188,7 @@ if (error) return error; -@@ -2630,14 +2678,14 @@ int vfs_rename(struct inode *old_dir, st +@@ -3697,14 +3745,14 @@ int vfs_rename(struct inode *old_dir, st if (old_dentry->d_inode == new_dentry->d_inode) return 0; @@ -208,10 +208,10 @@ --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1542,6 +1542,10 @@ struct inode_operations { - int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, - u64 len); - int (*update_time)(struct inode *, struct timespec *, int); +@@ -1836,6 +1836,10 @@ struct inode_operations { + int (*atomic_open)(struct inode *, struct dentry *, + struct file *, unsigned open_flag, + umode_t create_mode, int *opened); + int (*may_create) (struct inode *, int); + int (*may_delete) (struct inode *, struct inode *, int); + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch new/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch --- old/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch 2012-09-17 15:57:42.000000000 +0200 @@ -20,36 +20,36 @@ --- a/fs/namei.c +++ b/fs/namei.c -@@ -2215,7 +2215,7 @@ static int __open_namei_create(struct na +@@ -2634,7 +2634,7 @@ static int lookup_open(struct nameidata /* Negative dentry, just create the file */ - if (!dentry->d_inode) { + if (!dentry->d_inode && (op->open_flag & O_CREAT)) { umode_t mode = op->mode; - if (!IS_POSIXACL(dir->d_inode)) + if (!IS_ACL(dir->d_inode)) mode &= ~current_umask(); /* * This write is needed to ensure that a -@@ -2749,7 +2749,7 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const - if (IS_ERR(dentry)) - return PTR_ERR(dentry); - +@@ -3159,7 +3159,7 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const + if (IS_ERR(dentry)) + return PTR_ERR(dentry); + - if (!IS_POSIXACL(path.dentry->d_inode)) + if (!IS_ACL(path.dentry->d_inode)) mode &= ~current_umask(); - error = may_mknod(mode); + error = security_path_mknod(&path, dentry, mode, dev); if (error) -@@ -2826,7 +2826,7 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const +@@ -3221,7 +3221,7 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const if (IS_ERR(dentry)) return PTR_ERR(dentry); - if (!IS_POSIXACL(path.dentry->d_inode)) + if (!IS_ACL(path.dentry->d_inode)) mode &= ~current_umask(); - error = mnt_want_write(path.mnt); - if (error) + error = security_path_mkdir(&path, dentry, mode); + if (!error) --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -205,7 +205,7 @@ struct inodes_stat_t { +@@ -216,7 +216,7 @@ struct inodes_stat_t { #define MS_VERBOSE 32768 /* War is peace. Verbosity is silence. MS_VERBOSE is deprecated. */ #define MS_SILENT 32768 @@ -58,7 +58,7 @@ #define MS_UNBINDABLE (1<<17) /* change to unbindable */ #define MS_PRIVATE (1<<18) /* change to private */ #define MS_SLAVE (1<<19) /* change to slave */ -@@ -280,6 +280,12 @@ struct inodes_stat_t { +@@ -294,6 +294,12 @@ struct inodes_stat_t { #define IS_AUTOMOUNT(inode) ((inode)->i_flags & S_AUTOMOUNT) #define IS_NOSEC(inode) ((inode)->i_flags & S_NOSEC) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/SUSE-bootsplash new/patches.suse/SUSE-bootsplash --- old/patches.suse/SUSE-bootsplash 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/SUSE-bootsplash 2012-09-17 15:57:42.000000000 +0200 @@ -4342,7 +4342,7 @@ + } + if (attribute) { - buf = kmalloc(cellsize, GFP_KERNEL); + buf = kmalloc(cellsize, GFP_ATOMIC); if (!buf) @@ -214,6 +234,11 @@ static void bit_clear_margins(struct vc_ unsigned int bs = info->var.yres - bh; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/btrfs-allow-cross-subvolume-file-clone.patch new/patches.suse/btrfs-allow-cross-subvolume-file-clone.patch --- old/patches.suse/btrfs-allow-cross-subvolume-file-clone.patch 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/btrfs-allow-cross-subvolume-file-clone.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -From: David Sterba <dsterba@suse.cz> -Date: Mon, 1 Aug 2011 18:11:57 +0200 -Subject: [PATCH] btrfs: allow cross-subvolume file clone -Reference: bnc#698540 -Patch-mainline: pending - -Lift the EXDEV condition and allow different root trees for files being -cloned, then pass source inode's root when searching for extents. - -Signed-off-by: David Sterba <dsterba@suse.cz> ---- - fs/btrfs/ioctl.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - ---- a/fs/btrfs/ioctl.c -+++ b/fs/btrfs/ioctl.c -@@ -2268,6 +2268,10 @@ static noinline long btrfs_ioctl_clone(s - goto out_drop_write; - } - -+ ret = -EXDEV; -+ if (src_file->f_path.mnt != file->f_path.mnt) -+ goto out_fput; -+ - src = src_file->f_dentry->d_inode; - - ret = -EINVAL; -@@ -2288,7 +2292,7 @@ static noinline long btrfs_ioctl_clone(s - goto out_fput; - - ret = -EXDEV; -- if (src->i_sb != inode->i_sb || BTRFS_I(src)->root != root) -+ if (src->i_sb != inode->i_sb) - goto out_fput; - - ret = -ENOMEM; -@@ -2362,13 +2366,14 @@ static noinline long btrfs_ioctl_clone(s - * note the key will change type as we walk through the - * tree. - */ -- ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); -+ ret = btrfs_search_slot(NULL, BTRFS_I(src)->root, &key, path, -+ 0, 0); - if (ret < 0) - goto out; - - nritems = btrfs_header_nritems(path->nodes[0]); - if (path->slots[0] >= nritems) { -- ret = btrfs_next_leaf(root, path); -+ ret = btrfs_next_leaf(BTRFS_I(src)->root, path); - if (ret < 0) - goto out; - if (ret > 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/dm-mpath-no-partitions-feature new/patches.suse/dm-mpath-no-partitions-feature --- old/patches.suse/dm-mpath-no-partitions-feature 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/dm-mpath-no-partitions-feature 2012-09-17 15:57:42.000000000 +0200 @@ -30,7 +30,7 @@ /* Multipath context */ struct multipath { struct list_head list; -@@ -83,6 +85,7 @@ struct multipath { +@@ -90,6 +92,7 @@ struct multipath { unsigned pg_init_retries; /* Number of times to retry pg_init */ unsigned pg_init_count; /* Number of times pg_init called */ unsigned pg_init_delay_msecs; /* Number of msecs before pg_init retry */ @@ -38,7 +38,7 @@ unsigned queue_size; struct work_struct process_queued_ios; -@@ -852,6 +855,10 @@ static int parse_features(struct arg_set +@@ -811,6 +814,10 @@ static int parse_features(struct dm_arg_ continue; } @@ -48,13 +48,13 @@ + } if (!strcasecmp(arg_name, "pg_init_retries") && (argc >= 1)) { - r = dm_read_arg(_args + 1, as, &m->pg_init_retries, &ti->error); -@@ -1486,11 +1493,14 @@ static int multipath_status(struct dm_ta - else { + r = dm_read_arg(_args + 1, as, &m->pg_init_retries, &ti->error); +@@ -1401,11 +1408,14 @@ static int multipath_status(struct dm_ta DMEMIT("%u ", m->queue_if_no_path + (m->pg_init_retries > 0) * 2 + -- (m->pg_init_delay_msecs != DM_PG_INIT_DELAY_DEFAULT) * 2); -+ (m->pg_init_delay_msecs != DM_PG_INIT_DELAY_DEFAULT) * 2 + + (m->pg_init_delay_msecs != DM_PG_INIT_DELAY_DEFAULT) * 2 + +- m->retain_attached_hw_handler); ++ m->retain_attached_hw_handler + + (m->features & FEATURE_NO_PARTITIONS)); if (m->queue_if_no_path) DMEMIT("queue_if_no_path "); @@ -64,4 +64,4 @@ + DMEMIT("no_partitions "); if (m->pg_init_delay_msecs != DM_PG_INIT_DELAY_DEFAULT) DMEMIT("pg_init_delay_msecs %u ", m->pg_init_delay_msecs); - } + if (m->retain_attached_hw_handler) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/dm-raid45-26-Nov-2009.patch new/patches.suse/dm-raid45-26-Nov-2009.patch --- old/patches.suse/dm-raid45-26-Nov-2009.patch 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/dm-raid45-26-Nov-2009.patch 2012-09-17 15:57:42.000000000 +0200 @@ -29,7 +29,7 @@ --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig -@@ -358,6 +358,15 @@ config DM_DELAY +@@ -350,6 +350,15 @@ config DM_DELAY If unsure, say N. @@ -4633,7 +4633,7 @@ + * Make sure that dm core only hands maximum io size + * length down and pays attention to io boundaries. + */ -+ ti->split_io = rs->set.io_size; ++ ti->max_io_len = rs->set.io_size; + ti->private = rs; + + /* Initialize work queue to handle this RAID set's io. */ @@ -4807,7 +4807,7 @@ +} + +static int raid_status(struct dm_target *ti, status_type_t type, -+ char *result, unsigned maxlen) ++ unsigned status_flags, char *result, unsigned maxlen) +{ + unsigned p, sz = 0; + char buf[BDEVNAME_SIZE]; @@ -5253,7 +5253,7 @@ int i; --- a/drivers/md/dm.c +++ b/drivers/md/dm.c -@@ -2659,6 +2659,7 @@ struct gendisk *dm_disk(struct mapped_de +@@ -2697,6 +2697,7 @@ struct gendisk *dm_disk(struct mapped_de { return md->disk; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/msft-hv-0361-hyperv-Add-support-for-setting-MAC-from-within-guest.patch new/patches.suse/msft-hv-0361-hyperv-Add-support-for-setting-MAC-from-within-guest.patch --- old/patches.suse/msft-hv-0361-hyperv-Add-support-for-setting-MAC-from-within-guest.patch 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/msft-hv-0361-hyperv-Add-support-for-setting-MAC-from-within-guest.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,193 +0,0 @@ -From: <ohering@suse.de> -Date: Tue, 10 Jul 2012 07:19:22 +0000 -Patch-mainline: v3.5-rc5-1645-g1ce09e8 -Subject: [PATCH] hyperv: Add support for setting MAC from within guests -Git-commit: 1ce09e899d2864b4c8ed8f777c396bcb953aa3c9 - -This adds support for setting synthetic NIC MAC address from within Linux -guests. Before using this feature, the option "spoofing of MAC address" -should be enabled at the Hyper-V manager / Settings of the synthetic -NIC. - -Thanks to Kin Cho <kcho@infoblox.com> for the initial implementation and -tests. And, thanks to Long Li <longli@microsoft.com> for the debugging -works. - -Reported-and-tested-by: Kin Cho <kcho@infoblox.com> -Reported-by: Long Li <longli@microsoft.com> -Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> -Reviewed-by: K. Y. Srinivasan <kys@microsoft.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - drivers/net/hyperv/hyperv_net.h | 1 + - drivers/net/hyperv/netvsc_drv.c | 30 +++++++++++++- - drivers/net/hyperv/rndis_filter.c | 79 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 109 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h -index 2857ab0..95ceb35 100644 ---- a/drivers/net/hyperv/hyperv_net.h -+++ b/drivers/net/hyperv/hyperv_net.h -@@ -131,6 +131,7 @@ int rndis_filter_send(struct hv_device *dev, - struct hv_netvsc_packet *pkt); - - int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter); -+int rndis_filter_set_device_mac(struct hv_device *hdev, char *mac); - - - #define NVSP_INVALID_PROTOCOL_VERSION ((u32)0xFFFFFFFF) -diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c -index 8f8ed33..8e23c08 100644 ---- a/drivers/net/hyperv/netvsc_drv.c -+++ b/drivers/net/hyperv/netvsc_drv.c -@@ -341,6 +341,34 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu) - return 0; - } - -+ -+static int netvsc_set_mac_addr(struct net_device *ndev, void *p) -+{ -+ struct net_device_context *ndevctx = netdev_priv(ndev); -+ struct hv_device *hdev = ndevctx->device_ctx; -+ struct sockaddr *addr = p; -+ char save_adr[14]; -+ unsigned char save_aatype; -+ int err; -+ -+ memcpy(save_adr, ndev->dev_addr, ETH_ALEN); -+ save_aatype = ndev->addr_assign_type; -+ -+ err = eth_mac_addr(ndev, p); -+ if (err != 0) -+ return err; -+ -+ err = rndis_filter_set_device_mac(hdev, addr->sa_data); -+ if (err != 0) { -+ /* roll back to saved MAC */ -+ memcpy(ndev->dev_addr, save_adr, ETH_ALEN); -+ ndev->addr_assign_type = save_aatype; -+ } -+ -+ return err; -+} -+ -+ - static const struct ethtool_ops ethtool_ops = { - .get_drvinfo = netvsc_get_drvinfo, - .get_link = ethtool_op_get_link, -@@ -353,7 +381,7 @@ static const struct net_device_ops device_ops = { - .ndo_set_rx_mode = netvsc_set_multicast_list, - .ndo_change_mtu = netvsc_change_mtu, - .ndo_validate_addr = eth_validate_addr, -- .ndo_set_mac_address = eth_mac_addr, -+ .ndo_set_mac_address = netvsc_set_mac_addr, - }; - - /* -diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c -index 981ebb1..fbf5394 100644 ---- a/drivers/net/hyperv/rndis_filter.c -+++ b/drivers/net/hyperv/rndis_filter.c -@@ -27,6 +27,7 @@ - #include <linux/if_ether.h> - #include <linux/netdevice.h> - #include <linux/if_vlan.h> -+#include <linux/nls.h> - - #include "hyperv_net.h" - -@@ -47,6 +48,7 @@ struct rndis_request { - struct hv_page_buffer buf; - /* FIXME: We assumed a fixed size request here. */ - struct rndis_message request_msg; -+ u8 ext[100]; - }; - - static void rndis_filter_send_completion(void *ctx); -@@ -511,6 +513,83 @@ static int rndis_filter_query_device_mac(struct rndis_device *dev) - dev->hw_mac_adr, &size); - } - -+#define NWADR_STR "NetworkAddress" -+#define NWADR_STRLEN 14 -+ -+int rndis_filter_set_device_mac(struct hv_device *hdev, char *mac) -+{ -+ struct netvsc_device *nvdev = hv_get_drvdata(hdev); -+ struct rndis_device *rdev = nvdev->extension; -+ struct net_device *ndev = nvdev->ndev; -+ struct rndis_request *request; -+ struct rndis_set_request *set; -+ struct rndis_config_parameter_info *cpi; -+ wchar_t *cfg_nwadr, *cfg_mac; -+ struct rndis_set_complete *set_complete; -+ char macstr[2*ETH_ALEN+1]; -+ u32 extlen = sizeof(struct rndis_config_parameter_info) + -+ 2*NWADR_STRLEN + 4*ETH_ALEN; -+ int ret, t; -+ -+ request = get_rndis_request(rdev, RNDIS_MSG_SET, -+ RNDIS_MESSAGE_SIZE(struct rndis_set_request) + extlen); -+ if (!request) -+ return -ENOMEM; -+ -+ set = &request->request_msg.msg.set_req; -+ set->oid = RNDIS_OID_GEN_RNDIS_CONFIG_PARAMETER; -+ set->info_buflen = extlen; -+ set->info_buf_offset = sizeof(struct rndis_set_request); -+ set->dev_vc_handle = 0; -+ -+ cpi = (struct rndis_config_parameter_info *)((ulong)set + -+ set->info_buf_offset); -+ cpi->parameter_name_offset = -+ sizeof(struct rndis_config_parameter_info); -+ /* Multiply by 2 because host needs 2 bytes (utf16) for each char */ -+ cpi->parameter_name_length = 2*NWADR_STRLEN; -+ cpi->parameter_type = RNDIS_CONFIG_PARAM_TYPE_STRING; -+ cpi->parameter_value_offset = -+ cpi->parameter_name_offset + cpi->parameter_name_length; -+ /* Multiply by 4 because each MAC byte displayed as 2 utf16 chars */ -+ cpi->parameter_value_length = 4*ETH_ALEN; -+ -+ cfg_nwadr = (wchar_t *)((ulong)cpi + cpi->parameter_name_offset); -+ cfg_mac = (wchar_t *)((ulong)cpi + cpi->parameter_value_offset); -+ ret = utf8s_to_utf16s(NWADR_STR, NWADR_STRLEN, UTF16_HOST_ENDIAN, -+ cfg_nwadr, NWADR_STRLEN); -+ if (ret < 0) -+ goto cleanup; -+ snprintf(macstr, 2*ETH_ALEN+1, "%pm", mac); -+ ret = utf8s_to_utf16s(macstr, 2*ETH_ALEN, UTF16_HOST_ENDIAN, -+ cfg_mac, 2*ETH_ALEN); -+ if (ret < 0) -+ goto cleanup; -+ -+ ret = rndis_filter_send_request(rdev, request); -+ if (ret != 0) -+ goto cleanup; -+ -+ t = wait_for_completion_timeout(&request->wait_event, 5*HZ); -+ if (t == 0) { -+ netdev_err(ndev, "timeout before we got a set response...\n"); -+ /* -+ * can't put_rndis_request, since we may still receive a -+ * send-completion. -+ */ -+ return -EBUSY; -+ } else { -+ set_complete = &request->response_msg.msg.set_complete; -+ if (set_complete->status != RNDIS_STATUS_SUCCESS) -+ ret = -EINVAL; -+ } -+ -+cleanup: -+ put_rndis_request(rdev, request); -+ return ret; -+} -+ -+ - static int rndis_filter_query_device_link_status(struct rndis_device *dev) - { - u32 size = sizeof(u32); --- -1.7.10.4 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/msft-hv-0362-Drivers-hv-Change-the-hex-constant-to-a-decimal-cons.patch new/patches.suse/msft-hv-0362-Drivers-hv-Change-the-hex-constant-to-a-decimal-cons.patch --- old/patches.suse/msft-hv-0362-Drivers-hv-Change-the-hex-constant-to-a-decimal-cons.patch 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/msft-hv-0362-Drivers-hv-Change-the-hex-constant-to-a-decimal-cons.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -From: <ohering@suse.de> -Date: Wed, 18 Jul 2012 15:57:25 -0700 -Patch-mainline: v3.5-rc7-39-gbd8a4f0 -Subject: [PATCH] Drivers: hv: Change the hex constant to a decimal constant -Git-commit: bd8a4f06d0310326f89fd58fed74f2db8e345056 - -The hex constant chosen for HV_LINUX_GUEST_ID_HI was offensive, update to use -the decimal equivalent instead. - -Reported-by: Paolo Bonzini <pbonzini@redhat.com> -Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> -Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com> -Acked-by: Jeff Garzik <jgarzik@redhat.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/hv/hyperv_vmbus.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h -index b9426a6..0614ff3 100644 ---- a/drivers/hv/hyperv_vmbus.h -+++ b/drivers/hv/hyperv_vmbus.h -@@ -411,7 +411,7 @@ enum { - #define HV_PRESENT_BIT 0x80000000 - - #define HV_LINUX_GUEST_ID_LO 0x00000000 --#define HV_LINUX_GUEST_ID_HI 0xB16B00B5 -+#define HV_LINUX_GUEST_ID_HI 2976579765 - #define HV_LINUX_GUEST_ID (((u64)HV_LINUX_GUEST_ID_HI << 32) | \ - HV_LINUX_GUEST_ID_LO) - --- -1.7.10.4 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/msft-hv-0363-hyperv-Add-error-handling-to-rndis_filter_device_add.patch new/patches.suse/msft-hv-0363-hyperv-Add-error-handling-to-rndis_filter_device_add.patch --- old/patches.suse/msft-hv-0363-hyperv-Add-error-handling-to-rndis_filter_device_add.patch 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/msft-hv-0363-hyperv-Add-error-handling-to-rndis_filter_device_add.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -From: <ohering@suse.de> -Date: Wed, 25 Jul 2012 08:08:42 +0000 -Patch-mainline: v3.5-3688-g5243e7b -Subject: [PATCH] hyperv: Add error handling to rndis_filter_device_add() -Git-commit: 5243e7bd98b2dfecef3acd82661b541905a86e7f - -Reported-by: Jason Wang <jasowang@redhat.com> -Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> -Reviewed-by: K. Y. Srinivasan <kys@microsoft.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - drivers/net/hyperv/rndis_filter.c | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c -index fbf5394..e5d6146 100644 ---- a/drivers/net/hyperv/rndis_filter.c -+++ b/drivers/net/hyperv/rndis_filter.c -@@ -804,18 +804,15 @@ int rndis_filter_device_add(struct hv_device *dev, - /* Send the rndis initialization message */ - ret = rndis_filter_init_device(rndis_device); - if (ret != 0) { -- /* -- * TODO: If rndis init failed, we will need to shut down the -- * channel -- */ -+ rndis_filter_device_remove(dev); -+ return ret; - } - - /* Get the mac address */ - ret = rndis_filter_query_device_mac(rndis_device); - if (ret != 0) { -- /* -- * TODO: shutdown rndis device and the channel -- */ -+ rndis_filter_device_remove(dev); -+ return ret; - } - - memcpy(device_info->mac_adr, rndis_device->hw_mac_adr, ETH_ALEN); --- -1.7.10.4 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/msft-hv-0364-hyperv-Add-a-check-for-ring_size-value.patch new/patches.suse/msft-hv-0364-hyperv-Add-a-check-for-ring_size-value.patch --- old/patches.suse/msft-hv-0364-hyperv-Add-a-check-for-ring_size-value.patch 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/msft-hv-0364-hyperv-Add-a-check-for-ring_size-value.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -From: <ohering@suse.de> -Date: Wed, 25 Jul 2012 08:08:41 +0000 -Patch-mainline: v3.5-3687-gfa85a6c -Subject: [PATCH] hyperv: Add a check for ring_size value -Git-commit: fa85a6c29a493e8a574bf62a6349b38b591bf885 - -It prevents ring_size being set to a too small value. - -Reported-by: Jason Wang <jasowang@redhat.com> -Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> -Reviewed-by: K. Y. Srinivasan <kys@microsoft.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - drivers/net/hyperv/netvsc_drv.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c -index 8e23c08..8c5a1c4 100644 ---- a/drivers/net/hyperv/netvsc_drv.c -+++ b/drivers/net/hyperv/netvsc_drv.c -@@ -47,7 +47,7 @@ struct net_device_context { - struct work_struct work; - }; - -- -+#define RING_SIZE_MIN 64 - static int ring_size = 128; - module_param(ring_size, int, S_IRUGO); - MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)"); -@@ -518,6 +518,11 @@ static void __exit netvsc_drv_exit(void) - - static int __init netvsc_drv_init(void) - { -+ if (ring_size < RING_SIZE_MIN) { -+ ring_size = RING_SIZE_MIN; -+ pr_info("Increased ring_size to %d (min allowed)\n", -+ ring_size); -+ } - return vmbus_driver_register(&netvsc_drv); - } - --- -1.7.10.4 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/radeon-monitor-jsxx-quirk.patch new/patches.suse/radeon-monitor-jsxx-quirk.patch --- old/patches.suse/radeon-monitor-jsxx-quirk.patch 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/radeon-monitor-jsxx-quirk.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,65 +0,0 @@ -Subject: [PATCH] Add quirk for the graphics adapter in some JSxx -From: Tony Breeds <tony@bakeyournoodle.com> -References: 461002 - LTC50817 -Patch-mainline: not yet - -These devices are set to 640x480 by firmware, switch them to -800x600@60. - -Signed-off-by: Tony Breeds <tony@bakeyournoodle.com> -Signed-off-by: Olaf Hering <olh@suse.de> ---- - drivers/video/aty/radeon_monitor.c | 35 +++++++++++++++++++++++++++++++++++ - 1 file changed, 35 insertions(+) - ---- a/drivers/video/aty/radeon_monitor.c -+++ b/drivers/video/aty/radeon_monitor.c -@@ -730,6 +730,25 @@ static void radeon_videomode_to_var(stru - var->vmode = mode->vmode; - } - -+#ifdef CONFIG_PPC_PSERIES -+static int is_powerblade(const char *model) -+{ -+ struct device_node *root; -+ const char* cp; -+ int len, l, rc = 0; -+ -+ root = of_find_node_by_path("/"); -+ if (root && model) { -+ l = strlen(model); -+ cp = of_get_property(root, "model", &len); -+ if (cp) -+ rc = memcmp(model, cp, min(len, l)) == 0; -+ of_node_put(root); -+ } -+ return rc; -+} -+#endif -+ - /* - * Build the modedb for head 1 (head 2 will come later), check panel infos - * from either BIOS or EDID, and pick up the default mode -@@ -865,6 +884,22 @@ void __devinit radeon_check_modes(struct - has_default_mode = 1; - } - -+#ifdef CONFIG_PPC_PSERIES -+ if (!has_default_mode && ( -+ is_powerblade("IBM,8842") || /* JS20 */ -+ is_powerblade("IBM,8844") || /* JS21 */ -+ is_powerblade("IBM,7998") || /* JS12/JS21/JS22 */ -+ is_powerblade("IBM,0792") || /* QS21 */ -+ is_powerblade("IBM,0793") /* QS22 */ -+ )) { -+ printk("Falling back to 800x600 on JSxx hardware\n"); -+ if (fb_find_mode(&info->var, info, "800x600@60", -+ info->monspecs.modedb, -+ info->monspecs.modedb_len, NULL, 8) != 0) -+ has_default_mode = 1; -+ } -+#endif -+ - /* - * Still no mode, let's pick up a default from the db - */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/s390-Kerntypes.diff new/patches.suse/s390-Kerntypes.diff --- old/patches.suse/s390-Kerntypes.diff 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/s390-Kerntypes.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,386 +0,0 @@ -From: Michael Holzheu <holzheu@de.ibm.com> -Subject: S390: Generate Kerntypes file -Patch-mainline: Not yet - -s390 core changes: - - Remove rule to generate kernel listing. - - Add code to generate kerntypes for use with the lkcd utils. - -Signed-off-by: Michael Holzheu <holzheu@de.ibm.com> -Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> -Signed-off-by: Michal Marek <mmarek@suse.cz> ---- - - arch/s390/Makefile | 4 - arch/s390/boot/Makefile | 19 ++ - arch/s390/boot/kerntypes.c | 311 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 328 insertions(+), 6 deletions(-) - ---- a/arch/s390/Makefile -+++ b/arch/s390/Makefile -@@ -106,12 +106,12 @@ drivers-$(CONFIG_OPROFILE) += arch/s390/ - - boot := arch/s390/boot - --all: image bzImage -+all: image bzImage kerntypes.o - - install: vmlinux - $(Q)$(MAKE) $(build)=$(boot) $@ - --image bzImage: vmlinux -+image bzImage kerntypes.o: vmlinux - $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ - - zfcpdump: ---- a/arch/s390/boot/Makefile -+++ b/arch/s390/boot/Makefile -@@ -2,15 +2,26 @@ - # Makefile for the linux s390-specific parts of the memory manager. - # - --COMPILE_VERSION := __linux_compile_version_id__`hostname | \ -- tr -c '[0-9A-Za-z]' '_'`__`date | \ -- tr -c '[0-9A-Za-z]' '_'`_t -+COMPILE_VERSION := __linux_compile_version_id__$(shell hostname | \ -+ tr -c '[0-9A-Za-z]' '_')__$(shell date | \ -+ tr -c '[0-9A-Za-z]' '_')_t - -+ -+chk-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \ -+ > /dev/null 2>&1; then echo "$(1)"; fi ;) -+ -+# Remove possible '-g' from CFLAGS_KERNEL, since we want to use stabs -+# debug format. -+override CFLAGS_KERNEL := $(shell echo $(CFLAGS_KERNEL) | sed 's/-g//') - ccflags-y := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I. -+# Assume we don't need the flag if the compiler doesn't know about it -+ccflags-y += $(call chk-option,-fno-eliminate-unused-debug-types) -+ - - targets := image - targets += bzImage - subdir- := compressed -+targets += kerntypes.o - - $(obj)/image: vmlinux FORCE - $(call if_changed,objcopy) -@@ -23,4 +34,4 @@ $(obj)/compressed/vmlinux: FORCE - - install: $(CONFIGURE) $(obj)/image - sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/image \ -- System.map "$(INSTALL_PATH)" -+ System.map "$(INSTALL_PATH)" ---- /dev/null -+++ b/arch/s390/boot/kerntypes.c -@@ -0,0 +1,310 @@ -+/* -+ * kerntypes.c -+ * -+ * Dummy module that includes headers for all kernel types of interest. -+ * The kernel type information is used by the lcrash utility when -+ * analyzing system crash dumps or the live system. Using the type -+ * information for the running system, rather than kernel header files, -+ * makes for a more flexible and robust analysis tool. -+ * -+ * This source code is released under the GNU GPL. -+ */ -+ -+/* generate version for this file */ -+typedef char *COMPILE_VERSION; -+ -+/* General linux types */ -+ -+#include <generated/compile.h> -+#include <linux/utsname.h> -+#include <linux/module.h> -+#include <linux/sched.h> -+#include <linux/mm.h> -+#include <linux/slab.h> -+#ifdef CONFIG_SLUB -+ #include <linux/slub_def.h> -+#endif -+#ifdef CONFIG_SLAB -+ #include <linux/slab_def.h> -+#endif -+#ifdef CONFIG_SLQB -+ #include <linux/slqb_def.h> -+#endif -+#include <linux/bio.h> -+#include <linux/bitmap.h> -+#include <linux/bitops.h> -+#include <linux/bitrev.h> -+#include <linux/blkdev.h> -+#include <linux/blkpg.h> -+#include <linux/bootmem.h> -+#include <linux/buffer_head.h> -+#include <linux/cache.h> -+#include <linux/cdev.h> -+#include <linux/cpu.h> -+#include <linux/cpumask.h> -+#include <linux/cpuset.h> -+#include <linux/dcache.h> -+#include <linux/debugfs.h> -+#include <linux/elevator.h> -+#include <linux/fd.h> -+#include <linux/file.h> -+#include <linux/fs.h> -+#include <linux/futex.h> -+#include <linux/genhd.h> -+#include <linux/highmem.h> -+#include <linux/if.h> -+#include <linux/if_addr.h> -+#include <linux/if_arp.h> -+#include <linux/if_bonding.h> -+#include <linux/if_ether.h> -+#include <linux/if_tr.h> -+#include <linux/if_tun.h> -+#include <linux/if_vlan.h> -+#include <linux/in.h> -+#include <linux/in6.h> -+#include <linux/in_route.h> -+#include <linux/inet.h> -+#include <linux/inet_diag.h> -+#include <linux/inetdevice.h> -+#include <linux/init.h> -+#include <linux/initrd.h> -+#include <linux/inotify.h> -+#include <linux/interrupt.h> -+#include <linux/ioctl.h> -+#include <linux/ip.h> -+#include <linux/ipsec.h> -+#include <linux/ipv6.h> -+#include <linux/ipv6_route.h> -+#include <linux/interrupt.h> -+#include <linux/irqflags.h> -+#include <linux/irqreturn.h> -+#include <linux/jbd2.h> -+#include <linux/jffs2.h> -+#include <linux/jhash.h> -+#include <linux/jiffies.h> -+#include <linux/kallsyms.h> -+#include <linux/kernel.h> -+#include <linux/kernel_stat.h> -+#include <linux/kexec.h> -+#include <linux/kobject.h> -+#include <linux/kthread.h> -+#include <linux/ktime.h> -+#include <linux/list.h> -+#include <linux/memory.h> -+#include <linux/miscdevice.h> -+#include <linux/mm.h> -+#include <linux/memcontrol.h> -+#include <linux/mm_inline.h> -+#include <linux/mm_types.h> -+#include <linux/mman.h> -+#include <linux/mmtimer.h> -+#include <linux/mmzone.h> -+#include <linux/mnt_namespace.h> -+#include <linux/module.h> -+#include <linux/moduleloader.h> -+#include <linux/moduleparam.h> -+#include <linux/mount.h> -+#include <linux/mpage.h> -+#include <linux/mqueue.h> -+#include <linux/mtio.h> -+#include <linux/mutex.h> -+#include <linux/namei.h> -+#include <linux/neighbour.h> -+#include <linux/net.h> -+#include <linux/netdevice.h> -+#include <linux/netfilter.h> -+#include <linux/netfilter_arp.h> -+#include <linux/netfilter_bridge.h> -+#include <linux/netfilter_decnet.h> -+#include <linux/netfilter_ipv4.h> -+#include <linux/netfilter_ipv6.h> -+#include <linux/netlink.h> -+#include <linux/netpoll.h> -+#include <linux/pagemap.h> -+#include <linux/param.h> -+#include <linux/percpu.h> -+#include <linux/percpu_counter.h> -+#include <linux/pfn.h> -+#include <linux/pid.h> -+#include <linux/pid_namespace.h> -+#include <linux/poll.h> -+#include <linux/posix-timers.h> -+#include <linux/posix_acl.h> -+#include <linux/posix_acl_xattr.h> -+#include <linux/posix_types.h> -+#include <linux/preempt.h> -+#include <linux/prio_tree.h> -+#include <linux/proc_fs.h> -+#include <linux/profile.h> -+#include <linux/ptrace.h> -+#include <linux/radix-tree.h> -+#include <linux/ramfs.h> -+#include <linux/raw.h> -+#include <linux/rbtree.h> -+#include <linux/rcupdate.h> -+#include <linux/reboot.h> -+#include <linux/relay.h> -+#include <linux/resource.h> -+#include <linux/romfs_fs.h> -+#include <linux/root_dev.h> -+#include <linux/route.h> -+#include <linux/rwsem.h> -+#include <linux/sched.h> -+#include <linux/sem.h> -+#include <linux/seq_file.h> -+#include <linux/seqlock.h> -+#include <linux/shm.h> -+#include <linux/shmem_fs.h> -+#include <linux/signal.h> -+#include <linux/signalfd.h> -+#include <linux/skbuff.h> -+#include <linux/smp.h> -+#include <linux/socket.h> -+#include <linux/sockios.h> -+#include <linux/spinlock.h> -+#include <linux/stat.h> -+#include <linux/statfs.h> -+#include <linux/stddef.h> -+#include <linux/swap.h> -+#include <linux/swapops.h> -+#include <linux/sys.h> -+#include <linux/syscalls.h> -+#include <linux/sysctl.h> -+#include <linux/sysdev.h> -+#include <linux/sysfs.h> -+#include <linux/sysrq.h> -+#include <linux/tc.h> -+#include <linux/tcp.h> -+#include <linux/thread_info.h> -+#include <linux/threads.h> -+#include <linux/tick.h> -+#include <linux/time.h> -+#include <linux/timer.h> -+#include <linux/timerfd.h> -+#include <linux/times.h> -+#include <linux/timex.h> -+#include <linux/topology.h> -+#include <linux/transport_class.h> -+#include <linux/tty.h> -+#include <linux/tty_driver.h> -+#include <linux/tty_flip.h> -+#include <linux/tty_ldisc.h> -+#include <linux/types.h> -+#include <linux/uaccess.h> -+#include <linux/unistd.h> -+#include <linux/utime.h> -+#include <linux/uts.h> -+#include <linux/utsname.h> -+#include <generated/utsrelease.h> -+#include <linux/version.h> -+#include <linux/vfs.h> -+#include <linux/vmalloc.h> -+#include <linux/vmstat.h> -+#include <linux/wait.h> -+#include <linux/watchdog.h> -+#include <linux/workqueue.h> -+#include <linux/zconf.h> -+#include <linux/zlib.h> -+ -+/* -+ * s390 specific includes -+ */ -+ -+#include <asm/lowcore.h> -+#include <asm/debug.h> -+#include <asm/ccwdev.h> -+#include <asm/ccwgroup.h> -+#include <asm/qdio.h> -+#include <asm/zcrypt.h> -+#include <asm/etr.h> -+#include <asm/ipl.h> -+#include <asm/setup.h> -+#include <asm/schid.h> -+#include <asm/chsc.h> -+ -+/* channel subsystem driver */ -+#include "drivers/s390/cio/cio.h" -+#include "drivers/s390/cio/chsc.h" -+#include "drivers/s390/cio/css.h" -+#include "drivers/s390/cio/device.h" -+#include "drivers/s390/cio/chsc_sch.h" -+ -+/* dasd device driver */ -+#include "drivers/s390/block/dasd_int.h" -+#include "drivers/s390/block/dasd_diag.h" -+#include "drivers/s390/block/dasd_eckd.h" -+#include "drivers/s390/block/dasd_fba.h" -+ -+/* networking drivers */ -+#include "include/net/iucv/iucv.h" -+#include "drivers/s390/net/fsm.h" -+#include "drivers/s390/net/ctcm_main.h" -+#include "drivers/s390/net/ctcm_fsms.h" -+#include "drivers/s390/net/lcs.h" -+#include "drivers/s390/net/qeth_core.h" -+#include "drivers/s390/net/qeth_core_mpc.h" -+#include "drivers/s390/net/qeth_l3.h" -+ -+/* zfcp device driver */ -+#include "drivers/s390/scsi/zfcp_def.h" -+#include "drivers/s390/scsi/zfcp_fsf.h" -+ -+/* crypto device driver */ -+#include "drivers/s390/crypto/ap_bus.h" -+#include "drivers/s390/crypto/zcrypt_api.h" -+#include "drivers/s390/crypto/zcrypt_cca_key.h" -+#include "drivers/s390/crypto/zcrypt_pcica.h" -+#include "drivers/s390/crypto/zcrypt_pcicc.h" -+#include "drivers/s390/crypto/zcrypt_pcixcc.h" -+#include "drivers/s390/crypto/zcrypt_cex2a.h" -+ -+/* sclp device driver */ -+#include "drivers/s390/char/sclp.h" -+#include "drivers/s390/char/sclp_rw.h" -+#include "drivers/s390/char/sclp_tty.h" -+ -+/* vmur device driver */ -+#include "drivers/s390/char/vmur.h" -+ -+/* qdio device driver */ -+#include "drivers/s390/cio/qdio.h" -+#include "drivers/s390/cio/qdio_thinint.c" -+ -+ -+/* KVM */ -+#include "include/linux/kvm.h" -+#include "include/linux/kvm_host.h" -+#include "include/linux/kvm_para.h" -+ -+/* Virtio */ -+#include "include/linux/virtio.h" -+#include "include/linux/virtio_config.h" -+#include "include/linux/virtio_ring.h" -+#include "include/linux/virtio_9p.h" -+#include "include/linux/virtio_console.h" -+#include "include/linux/virtio_rng.h" -+#include "include/linux/virtio_balloon.h" -+#include "include/linux/virtio_net.h" -+#include "include/linux/virtio_blk.h" -+ -+/* -+ * include sched.c for types: -+ * - struct prio_array -+ * - struct runqueue -+ */ -+#include "kernel/sched.c" -+/* -+ * include slab.c for struct kmem_cache -+ */ -+#ifdef CONFIG_SLUB -+ #include "mm/slub.c" -+#endif -+#ifdef CONFIG_SLAB -+ #include "mm/slab.c" -+#endif -+#ifdef CONFIG_SLQB -+ #include "mm/slqb.c" -+#endif -+ -+/* include driver core private structures */ -+#include "drivers/base/base.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/scsi-error-test-unit-ready-timeout new/patches.suse/scsi-error-test-unit-ready-timeout --- old/patches.suse/scsi-error-test-unit-ready-timeout 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/scsi-error-test-unit-ready-timeout 2012-09-17 15:57:42.000000000 +0200 @@ -17,7 +17,7 @@ --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -45,6 +45,7 @@ - #include <trace/events/scsi.h> + static void scsi_eh_done(struct scsi_cmnd *scmd); #define SENSE_TIMEOUT (10*HZ) +#define TEST_UNIT_READY_TIMEOUT (30*HZ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/stack-unwind new/patches.suse/stack-unwind --- old/patches.suse/stack-unwind 2012-07-30 16:57:18.000000000 +0200 +++ new/patches.suse/stack-unwind 2012-09-17 15:57:42.000000000 +0200 @@ -11,6 +11,8 @@ - fix after upstream commit 9e565292270a2d55524be38835104c564ac8f795 Update Sep 15 2011 jbeulich: - add support for DW_CFA_def_cfa_expression (needed by x86-64) +Update Aug 01 2012 jbeulich: +- mark unwind section start/end symbols as always relative --- Makefile | 5 @@ -26,6 +28,7 @@ arch/x86/kernel/entry_32.S | 35 arch/x86/kernel/entry_64.S | 34 arch/x86/kernel/vmlinux.lds.S | 2 + arch/x86/tools/relocs.c | 1 include/asm-generic/vmlinux.lds.h | 22 include/linux/module.h | 3 include/linux/unwind.h | 135 +++ @@ -34,7 +37,7 @@ kernel/module.c | 32 kernel/unwind.c | 1641 ++++++++++++++++++++++++++++++++++++++ lib/Kconfig.debug | 18 - 21 files changed, 2210 insertions(+), 3 deletions(-) + 22 files changed, 2211 insertions(+), 3 deletions(-) --- a/Makefile +++ b/Makefile @@ -537,6 +540,16 @@ } +--- a/arch/x86/tools/relocs.c ++++ b/arch/x86/tools/relocs.c +@@ -62,6 +62,7 @@ static const char * const sym_regex_kern + "(__iommu_table|__apicdrivers|__smp_locks)(|_end)|" + "__(start|end)_pci_.*|" + "__(start|end)_builtin_fw|" ++ "__(start|end)_unwind(|_hdr)|" + "__(start|stop)___ksymtab(|_gpl|_unused|_unused_gpl|_gpl_future)|" + "__(start|stop)___kcrctab(|_gpl|_unused|_unused_gpl|_gpl_future)|" + "__(start|stop)___param|" --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -359,6 +359,8 @@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/suse-hv-identify-virtual-pc-in-ata_piix.patch new/patches.suse/suse-hv-identify-virtual-pc-in-ata_piix.patch --- old/patches.suse/suse-hv-identify-virtual-pc-in-ata_piix.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/suse-hv-identify-virtual-pc-in-ata_piix.patch 2012-09-17 15:57:42.000000000 +0200 @@ -0,0 +1,47 @@ +From: <ohering@suse.de> +Subject: identify Virtual PC guests in ata_piix +References: bnc#737532 +Patch-mainline: submitted + +--- + drivers/ata/ata_piix.c | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +Index: linux-3.6-rc4-master/drivers/ata/ata_piix.c +=================================================================== +--- linux-3.6-rc4-master.orig/drivers/ata/ata_piix.c ++++ linux-3.6-rc4-master/drivers/ata/ata_piix.c +@@ -1585,12 +1585,30 @@ static void piix_ignore_devices_quirk(st + }, + { } /* terminate list */ + }; +- const struct dmi_system_id *dmi = dmi_first_match(ignore_hyperv); ++ static const struct dmi_system_id allow_virtual_pc[] = { ++ { ++ /* In MS Virtual PC guests the DMI ident is nearly ++ * identical with the a Hyper-V guest. One difference ++ * is the product version which is used here to identify ++ * a Virtual PC guest. ++ */ ++ .ident = "MS Virtual PC 2007", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, ++ "Microsoft Corporation"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "Virtual Machine"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "VS2005R2"), ++ }, ++ }, ++ { } /* terminate list */ ++ }; ++ const struct dmi_system_id *ignore = dmi_first_match(ignore_hyperv); ++ const struct dmi_system_id *allow = dmi_first_match(allow_virtual_pc); + +- if (dmi && prefer_ms_hyperv) { ++ if (ignore && !allow && prefer_ms_hyperv) { + host->flags |= ATA_HOST_IGNORE_ATA; + dev_info(host->dev, "%s detected, ATA device ignore set\n", +- dmi->ident); ++ ignore->ident); + } + #endif + } ++++++ patches.trace.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ ++++ 12611 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:30.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:30.000000000 +0200 @@ -37,6 +37,8 @@ patches.rpmify/nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo patches.rpmify/pti-depends-on-x86-pci patches.rpmify/geode-depends-on-x86_32 + patches.rpmify/ubifs-remove-DATE-TIME.patch + patches.rpmify/chipidea-clean-up-dependencies ######################################################## # kABI consistency patches @@ -132,8 +134,6 @@ ######################################################## # powerpc/generic ######################################################## - patches.suse/radeon-monitor-jsxx-quirk.patch - patches.suse/8250-sysrq-ctrl_o.patch +needs_update? patches.suse/ppc-no-LDFLAGS_MODULE.patch patches.arch/ppc-pegasos-console-autodetection.patch @@ -151,20 +151,14 @@ ######################################################## # ARM ######################################################## - patches.arch/arm-phys-offset.patch patches.arch/cubox-configuration.patch - patches.arch/arm-omap-add-drm.patch ######################################################## # S/390 ######################################################## patches.arch/s390-message-catalog.diff - patches.arch/s390-message-catalog-fix.diff - patches.arch/s390-message-catalog-perl-fix.diff patches.arch/kmsg-fix-parameter-limitations - patches.suse/s390-Kerntypes.diff - ######################################################## # VM/FS patches ######################################################## @@ -208,9 +202,6 @@ +trenn patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch +trenn patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch - patches.arch/srat_parsing_redo_return.patch - patches.arch/acpi_fix_empty_srat_mem_declarations.patch - ######################################################## # CPUFREQ ######################################################## @@ -228,11 +219,8 @@ ######################################################## # Suse specific stuff ######################################################## - patches.suse/msft-hv-0361-hyperv-Add-support-for-setting-MAC-from-within-guest.patch - patches.suse/msft-hv-0362-Drivers-hv-Change-the-hex-constant-to-a-decimal-cons.patch - patches.suse/msft-hv-0363-hyperv-Add-error-handling-to-rndis_filter_device_add.patch - patches.suse/msft-hv-0364-hyperv-Add-a-check-for-ring_size-value.patch patches.suse/suse-hv-Cleanup-the-guest-ID-computation.patch + patches.suse/suse-hv-identify-virtual-pc-in-ata_piix.patch patches.fixes/hv-storvsc-reset-wait.patch ######################################################## @@ -268,14 +256,13 @@ ######################################################## # btrfs ######################################################## - patches.suse/btrfs-use-correct-device-for-maps.patch - patches.suse/btrfs-allow-cross-subvolume-file-clone.patch ######################################################## # Reiserfs Patches ######################################################## +needs_updating-39 patches.suse/reiser4-dependencies + patches.fixes/reiserfs-fix-deadlock-with-nfs-racing-on-create-lookup ######################################################## # dlm @@ -334,7 +321,6 @@ # ######################################################## patches.drivers/spi-orion-convert-to-new-infrastructure.patch - patches.drivers/mach-dove-Fixup-ge00-initialisation.patch ######################################################## # Storage @@ -417,7 +403,6 @@ ########################################################## # Sound ########################################################## - patches.drivers/ALSA-hda-Fix-mute-LED-GPIO-setup-for-HP-Mini-210 ######################################################## # Char / serial @@ -453,8 +438,8 @@ patches.suse/dm-raid45-split-dependencies patches.fixes/dm-mpath-reattach-dh patches.suse/dm-mpath-leastpending-path-update - patches.suse/dm-mpath-accept-failed-paths - patches.suse/dm-mpath-detach-existing-hardware-handler ++needs_update patches.suse/dm-mpath-accept-failed-paths ++needs_update patches.suse/dm-mpath-detach-existing-hardware-handler patches.fixes/dm-table-switch-to-readonly patches.fixes/dm-release-map_lock-before-set_disk_ro patches.suse/dm-mpath-no-activate-for-offlined-paths @@ -577,7 +562,7 @@ patches.xen/xen3-fixup-arch-x86 patches.xen/xen3-fixup-blktap2-pvops - # ports of other patches + # ports of upstream patches patches.xen/xen3-patch-2.6.18 patches.xen/xen3-patch-2.6.19 patches.xen/xen3-patch-2.6.20 @@ -606,6 +591,9 @@ patches.xen/xen3-patch-3.3 patches.xen/xen3-patch-3.4 patches.xen/xen3-patch-3.5 + patches.xen/xen3-patch-3.6-rc4 + + # ports of other patches patches.xen/xen3-acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch patches.xen/xen3-stack-unwind patches.xen/xen3-x86_64-unwind-annotations ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.C70aCt/_old 2012-09-26 16:31:30.000000000 +0200 +++ /var/tmp/diff_new_pack.C70aCt/_new 2012-09-26 16:31:30.000000000 +0200 @@ -1,3 +1,3 @@ -2012-07-30 23:41:12 +0200 -GIT Revision: 6d995bc7656eb24c5975a0bd1542911c462eef4c +2012-09-25 22:30:44 +0200 +GIT Revision: 91c0ddca6c72736e6e59e0e8e565309fc2abdb1f GIT Branch: master ++++++ sysctl.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org