Mailinglist Archive: opensuse-commit (1469 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kernel-source for openSUSE:Factory 
checked in at 2012-03-02 13:48:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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@xxxxxxxxxxxxxxxxxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes       
2012-01-27 15:21:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes  
2012-03-02 13:48:35.000000000 +0100
@@ -1,0 +2,113 @@
+Wed Feb 29 15:22:34 CET 2012 - jbeulich@xxxxxxxxxx
+
+- Update Xen patches to 3.3-rc5 and c/s 1157.
+- config.conf: Re-enable Xen configs.
+- Update config files.
+- commit f225622
+
+-------------------------------------------------------------------
+Mon Feb 27 03:38:40 CET 2012 - jeffm@xxxxxxxx
+
+- Updated to 3.3-rc5.
+- commit 0b7f048
+
+-------------------------------------------------------------------
+Sun Feb 19 18:00:16 CET 2012 - jeffm@xxxxxxxx
+
+- Updated to 3.3-rc4.
+- commit 8831dca
+
+-------------------------------------------------------------------
+Mon Feb 13 19:33:57 CET 2012 - trenn@xxxxxxx
+
+- cpufreq/gx: Fix the compile error.
+- commit 4ba1d8b
+
+-------------------------------------------------------------------
+Mon Feb 13 17:23:49 CET 2012 - mmarek@xxxxxxx
+
+- nvme: Mark as broken on x86_32.
+- commit 28ad576
+
+-------------------------------------------------------------------
+Sun Feb 12 18:15:10 CET 2012 - trenn@xxxxxxx
+
+- Add driver auto probing for x86 features v4
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- x86/cpu: Fix overrun check in arch_print_cpu_modalias()
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- crypto: Add support for x86 cpuid
+    auto loading for x86 crypto drivers
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- x86/cpu: Clean up modalias feature matching
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- intel-idle: convert to x86_cpu_id auto probing
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- intel_idle: Fix ID for Nehalem-EX Xeon in device ID table
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- HWMON: Convert via-cputemp to x86 cpuid autoprobing
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- powernow-k7: Fix CPU family number
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- ACPI: Load acpi-cpufreq from processor driver automatically
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- intel_idle: Revert change of auto_demotion_flags for Nehalem
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- HWMON: Convert coretemp to x86 cpuid autoprobing
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- powernow-k6: Really enable auto-loading
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- X86: Introduce HW-Pstate scattered cpuid feature
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- cpufreq: Add support for x86 cpuinfo auto loading v4
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- x86: autoload microcode driver on Intel and AMD systems v2
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- CPU: Introduce ARCH_HAS_CPU_AUTOPROBE and X86 parts
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- ACPI: remove duplicated lines of merging
+    problems with acpi_processor_start
+    (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html).
+- Update config files.
+- commit 6efe9b5
+
+-------------------------------------------------------------------
+Fri Feb 10 12:03:36 CET 2012 - mmarek@xxxxxxx
+
+- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for
+-default (bnc#745632). KMPs are still built as i586.
+- commit 88a632b
+
+-------------------------------------------------------------------
+Thu Feb  9 15:57:54 CET 2012 - jeffm@xxxxxxxx
+
+- Update to 3.3-rc3.
+- commit 07ec27c
+
+-------------------------------------------------------------------
+Thu Feb  9 12:53:26 CET 2012 - agraf@xxxxxxx
+
+- armv7l: Update config files.
+- commit d223353
+
+-------------------------------------------------------------------
+Thu Feb  9 12:48:21 CET 2012 - agraf@xxxxxxx
+
+- armv7l: config: integrate bmwiedemann's updates to make it usable
+- commit 76d12ed
+
+-------------------------------------------------------------------
+Tue Feb  7 18:28:41 CET 2012 - jeffm@xxxxxxxx
+
+- Update vanilla config files.
+- commit fd3673f
+
+-------------------------------------------------------------------
+Tue Feb  7 18:12:40 CET 2012 - jeffm@xxxxxxxx
+
+- Update to 3.3-rc2.
+    - Eliminated 5 patches.
+    - Xen is disabled.
+- commit d017ea1
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-imx51.changes: same change
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.2.tar.bz2

New:
----
  linux-3.3-rc5.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   debug
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-debug
 Summary:        A Debug Version of the Kernel
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -135,7 +136,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -196,6 +197,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 ia64 ppc64 x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -627,9 +639,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -906,9 +918,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   default
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-default
 Summary:        The Standard Kernel
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -151,7 +152,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -212,6 +213,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  armv7l %ix86 ia64 ppc ppc64 s390x x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -642,9 +654,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -919,9 +931,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-desktop.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   desktop
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-desktop
 Summary:        Kernel optimized for the desktop
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -132,7 +133,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -193,6 +194,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -636,9 +648,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -939,9 +951,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,14 @@
 
 # norootforbuild
 
-%define patchversion 3.2.0
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 
 %include %_sourcedir/kernel-spec-macros
 
 Name:           kernel-docs
 Summary:        Kernel Documentation
-Version:        3.2.0
+Version:        3.3.rc5
 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.yJtsVm/_old  2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   ec2
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-ec2
 Summary:        The Amazon EC2 Xen Kernel
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -132,7 +133,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -193,6 +194,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -626,9 +638,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -909,9 +921,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-imx51.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   imx51
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-imx51
 Summary:        Kernel for Freescale's iMX SoC
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -132,7 +133,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -193,6 +194,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  armv7l
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -624,9 +636,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-omap2plus.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   omap2plus
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-omap2plus
 Summary:        Kernel for Texas instrument's OMAP SoC
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -132,7 +133,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -193,6 +194,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  armv7l
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -624,9 +636,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:48.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:48.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   pae
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-pae
 Summary:        Kernel with PAE Support
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -135,7 +136,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -196,6 +197,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -633,9 +645,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -924,9 +936,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   ppc64
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-ppc64
 Summary:        Kernel for ppc64 Systems
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -139,7 +140,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -200,6 +201,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  ppc ppc64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -637,9 +649,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -928,9 +940,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   s390
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-s390
 Summary:        The Standard Kernel
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -135,7 +136,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -196,6 +197,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  s390
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -626,9 +638,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:49.000000000 +0100
@@ -18,8 +18,8 @@
 # norootforbuild
 # icecream 0
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
@@ -29,7 +29,7 @@
 
 Name:           kernel-source
 Summary:        The Linux Kernel Sources
-Version:        3.2.0
+Version:        3.3.rc5
 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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh

++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:49.000000000 +0100
@@ -23,7 +23,7 @@
 
 Name:           kernel-syms
 Summary:        Kernel Symbol Versions (modversions)
-Version:        3.2.0
+Version:        3.3.rc5
 %if %using_buildservice
 Release:        0
 %else

++++++ kernel-tegra.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   tegra
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-tegra
 Summary:        Kernel for Nvidia's Tegra SoC
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -132,7 +133,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -193,6 +194,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  armv7l
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -624,9 +636,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   trace
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-trace
 Summary:        The Standard Kernel with Tracing Features
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -143,7 +144,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -204,6 +205,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 ia64 ppc64 s390 s390x x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -634,9 +646,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -911,9 +923,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-u8500.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   u8500
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-u8500
 Summary:        Kernel for ST-Ericsson's Nova SoC
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -132,7 +133,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -193,6 +194,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  armv7l
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -624,9 +636,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -903,9 +915,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   vanilla
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-vanilla
 Summary:        The Standard Kernel - without any SUSE patches
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -139,7 +140,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -200,6 +201,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 ia64 ppc ppc64 s390 s390x x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -630,9 +642,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -907,9 +919,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:49.000000000 +0100
@@ -17,14 +17,15 @@
 
 # norootforbuild
 
-%define srcversion 3.2
-%define patchversion 3.2.0
+%define srcversion 3.3-rc5
+%define patchversion 3.3.0-rc5
 %define variant %{nil}
 %define vanilla_only 0
 
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   xen
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -56,7 +57,7 @@
 
 Name:           kernel-xen
 Summary:        The Xen Kernel
-Version:        3.2.0
+Version:        3.3.rc5
 Release:        0
 License:        GPL-2.0
 Group:          System/Kernel
@@ -132,7 +133,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.bz2
 Source2:        source-post.sh
 Source3:        kernel-source.rpmlintrc
 Source8:        devel-pre.sh
@@ -193,6 +194,17 @@
 Source121:      sysctl.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 x86_64
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 NoSource:       0
@@ -626,9 +638,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -909,9 +921,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:49.000000000 +0100
@@ -1,5 +1,5 @@
 # The version of the main tarball to use
-SRCVERSION=3.2
+SRCVERSION=3.3-rc5
 # variant of the kernel-source package, either empty or "-rt"
 VARIANT=
 # buildservice projects to build the kernel against

++++++ config.tar.bz2 ++++++
++++ 32014 lines of diff (skipped)

++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:49.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:49.000000000 +0100
@@ -25,6 +25,7 @@
 %include %_sourcedir/kernel-spec-macros
 
 %define build_flavor   @FLAVOR@
+%define build_default  (%build_flavor == "default")
 %define build_kdump    (%build_flavor == "kdump")
 %define build_xen      (%build_flavor == "xen" || %build_flavor == "ec2")
 %define build_vanilla  (%build_flavor == "vanilla")
@@ -134,6 +135,17 @@
 @SOURCES@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  @ARCHS@
+%define kmp_target_cpu %_target_cpu
+%ifarch %ix86
+# Only i386/default supports i586, mark other flavors' packages as i686
+%if ! %build_default
+BuildArch:      i686
+# KMPs are always built as i586, because rpm does not allow to build
+# subpackages for different architectures. Therefore, we change the
+# /usr/src/linux-obj/<arch> symlink to i586.
+%define kmp_target_cpu i586
+%endif
+%endif
 
 # These files are found in the kernel-source package:
 @NOSOURCE@
@@ -548,9 +560,9 @@
     # Some architecture's $(uname -m) output is different from the ARCH
     # parameter that needs to be passed to kbuild. Create symlinks from
     # $(uname -m) to the ARCH directory.
-    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
-       ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
-       ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then
+        ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu
+        ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu
     fi
 
     # We were building in %my_builddir/linux-%srcversion, but the sources will
@@ -825,9 +837,9 @@
 %dir /usr/src/linux-obj/%cpu_arch
 %ghost /usr/src/linux-obj/%cpu_arch_flavor
 %obj_install_dir/%cpu_arch_flavor
-%if %_target_cpu != %cpu_arch
-%obj_install_dir/%_target_cpu
-/usr/src/linux-obj/%_target_cpu
+%if %kmp_target_cpu != %cpu_arch
+%obj_install_dir/%kmp_target_cpu
+/usr/src/linux-obj/%kmp_target_cpu
 %endif
 %endif
 

++++++ patches.arch.tar.bz2 ++++++
++++ 2417 lines of diff (skipped)

++++++ patches.drivers.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/patches.drivers/elousb.patch 
new/patches.drivers/elousb.patch
--- old/patches.drivers/elousb.patch    2011-11-16 06:32:19.000000000 +0100
+++ new/patches.drivers/elousb.patch    2012-02-07 18:12:40.000000000 +0100
@@ -19,9 +19,9 @@
 --- a/drivers/hid/hid-core.c
 +++ b/drivers/hid/hid-core.c
 @@ -1643,6 +1643,8 @@ static const struct hid_device_id hid_ig
-       { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, 
USB_DEVICE_ID_DELORME_EARTHMATE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) 
},
        { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x0004) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x000a) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_4000U) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_4500U) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, 
USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
@@ -68,9 +68,9 @@
  obj-$(CONFIG_TOUCHSCREEN_EETI)                += eeti_ts.o
  obj-$(CONFIG_TOUCHSCREEN_ELO)         += elo.o
 +obj-$(CONFIG_TOUCHSCREEN_ELOUSB)      += elousb.o
+ obj-$(CONFIG_TOUCHSCREEN_EGALAX)      += egalax_ts.o
  obj-$(CONFIG_TOUCHSCREEN_FUJITSU)     += fujitsu_ts.o
  obj-$(CONFIG_TOUCHSCREEN_INEXIO)      += inexio.o
- obj-$(CONFIG_TOUCHSCREEN_INTEL_MID)   += intel-mid-touch.o
 --- /dev/null
 +++ b/drivers/input/touchscreen/elousb.c
 @@ -0,0 +1,305 @@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/patches.drivers/input-Add-LED-support-to-Synaptics-device 
new/patches.drivers/input-Add-LED-support-to-Synaptics-device
--- old/patches.drivers/input-Add-LED-support-to-Synaptics-device       
2011-11-16 06:32:19.000000000 +0100
+++ new/patches.drivers/input-Add-LED-support-to-Synaptics-device       
2012-02-07 18:12:40.000000000 +0100
@@ -34,7 +34,7 @@
        help
          Say Y here if you have a PS/2 mouse connected to your system. This
          includes the standard 2 or 3-button PS/2 mouse, as well as PS/2
-@@ -67,6 +68,14 @@ config MOUSE_PS2_SYNAPTICS
+@@ -68,6 +69,14 @@ config MOUSE_PS2_SYNAPTICS
  
          If unsure, say Y.
  
@@ -51,7 +51,7 @@
        default y
 --- a/drivers/input/mouse/synaptics.c
 +++ b/drivers/input/mouse/synaptics.c
-@@ -28,6 +28,7 @@
+@@ -29,6 +29,7 @@
  #include <linux/input/mt.h>
  #include <linux/serio.h>
  #include <linux/libps2.h>
@@ -59,7 +59,7 @@
  #include <linux/slab.h>
  #include "psmouse.h"
  #include "synaptics.h"
-@@ -353,6 +354,110 @@ static void synaptics_pt_create(struct p
+@@ -430,6 +431,110 @@ static void synaptics_pt_create(struct p
        serio_register_port(serio);
  }
  
@@ -170,15 +170,15 @@
  /*****************************************************************************
   *    Functions to interpret the absolute mode packets
   ****************************************************************************/
-@@ -647,6 +752,7 @@ static void set_input_params(struct inpu
+@@ -1275,6 +1380,7 @@ static void synaptics_disconnect(struct
+               device_remove_file(&psmouse->ps2dev.serio->dev,
+                                  &psmouse_attr_disable_gesture.dattr);
  
- static void synaptics_disconnect(struct psmouse *psmouse)
- {
 +      synaptics_free_led(psmouse);
        synaptics_reset(psmouse);
-       kfree(psmouse->private);
+       kfree(priv);
        psmouse->private = NULL;
-@@ -678,6 +784,8 @@ static int synaptics_reconnect(struct ps
+@@ -1331,6 +1437,8 @@ static int synaptics_reconnect(struct ps
                return -1;
        }
  
@@ -187,9 +187,9 @@
        return 0;
  }
  
-@@ -752,6 +860,9 @@ int synaptics_init(struct psmouse *psmou
-                    priv->model_id,
-                    priv->capabilities, priv->ext_cap, priv->ext_cap_0c);
+@@ -1440,6 +1548,9 @@ static int __synaptics_init(struct psmou
+                    priv->model_id,
+                    priv->capabilities, priv->ext_cap, priv->ext_cap_0c);
  
 +      if (synaptics_init_led(psmouse) < 0)
 +              goto init_fail;
@@ -199,8 +199,8 @@
        /*
 --- a/drivers/input/mouse/synaptics.h
 +++ b/drivers/input/mouse/synaptics.h
-@@ -97,6 +97,8 @@ struct synaptics_hw_state {
-       struct synaptics_mt_state mt_state;
+@@ -145,6 +145,8 @@ struct synaptics_hw_state {
+       struct synaptics_mt_state mt_state;
  };
  
 +struct synaptics_led;
@@ -208,10 +208,10 @@
  struct synaptics_data {
        /* Data read from the touchpad */
        unsigned long int model_id;             /* Model-ID */
-@@ -110,6 +112,7 @@ struct synaptics_data {
-        */
-       struct synaptics_hw_state agm;
-       bool agm_pending;                       /* new AGM packet received */
+@@ -174,6 +176,7 @@ struct synaptics_data {
+        */
+       struct synaptics_hw_state agm;
+       bool agm_pending;                       /* new AGM packet received */
 +      struct synaptics_led *led;
  };
  

++++++ patches.fixes.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/patches.fixes/fs-partitions-efi-c-corrupted-guid-partition-tables-can-cause-kernel-oops
 
new/patches.fixes/fs-partitions-efi-c-corrupted-guid-partition-tables-can-cause-kernel-oops
--- 
old/patches.fixes/fs-partitions-efi-c-corrupted-guid-partition-tables-can-cause-kernel-oops
 2012-01-25 11:51:08.000000000 +0100
+++ 
new/patches.fixes/fs-partitions-efi-c-corrupted-guid-partition-tables-can-cause-kernel-oops
 2012-02-09 15:57:54.000000000 +0100
@@ -34,8 +34,8 @@
  fs/partitions/efi.c |    9 +++++++++
  1 file changed, 9 insertions(+)
 
---- a/fs/partitions/efi.c
-+++ b/fs/partitions/efi.c
+--- a/block/partitions/efi.c
++++ b/block/partitions/efi.c
 @@ -310,6 +310,15 @@ static int is_gpt_valid(struct parsed_pa
                goto fail;
        }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/patches.fixes/kvm-macos.patch 
new/patches.fixes/kvm-macos.patch
--- old/patches.fixes/kvm-macos.patch   2012-01-25 11:51:08.000000000 +0100
+++ new/patches.fixes/kvm-macos.patch   2012-02-09 15:57:54.000000000 +0100
@@ -61,7 +61,9 @@
 +      case MSR_NHM_SNB_PKG_CST_CFG_CTL: /* 0xe2 */
                data = 0;
                break;
-       case MSR_IA32_UCODE_REV:
+       case MSR_P6_PERFCTR0:
+--- a/arch/x86/kvm/cpuid.c
++++ b/arch/x86/kvm/cpuid.c
 @@ -1985,7 +1987,7 @@ static void do_cpuid_ent(struct kvm_cpui
                0 /* Reserved */ | f_lm | F(3DNOWEXT) | F(3DNOW);
        /* cpuid 1.ecx */
@@ -70,4 +72,4 @@
 +              F(XMM3) | F(PCLMULQDQ) | 0 /* DTES64 */ | F(MWAIT) |
                0 /* DS-CPL, VMX, SMX, EST */ |
                0 /* TM2 */ | F(SSSE3) | 0 /* CNXT-ID */ | 0 /* Reserved */ |
-               0 /* Reserved */ | F(CX16) | 0 /* xTPR Update, PDCM */ |
+               F(FMA) | F(CX16) | 0 /* xTPR Update, PDCM */ |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/patches.fixes/proc-mem-security-fix 
new/patches.fixes/proc-mem-security-fix
--- old/patches.fixes/proc-mem-security-fix     2012-01-25 11:51:08.000000000 
+0100
+++ new/patches.fixes/proc-mem-security-fix     1970-01-01 01:00:00.000000000 
+0100
@@ -1,263 +0,0 @@
-From e2b4ed67f8ce25ba0347746a65e288735352aaf8 Mon Sep 17 00:00:00 2001
-From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
-Date: Tue, 17 Jan 2012 15:21:19 -0800
-Subject: [PATCH] proc: clean up and fix /proc/<pid>/mem handling
-Patch-mainline: v3.3-rc1
-Git-commit: e268337dfe26dfc7efd422a804dbb27977a3cccc
-References: bnc#742279, CVE-2012-0056
-
-Jüri Aedla reported that the /proc/<pid>/mem handling really isn't very
-robust, and it also doesn't match the permission checking of any of the
-other related files.
-
-This changes it to do the permission checks at open time, and instead of
-tracking the process, it tracks the VM at the time of the open.  That
-simplifies the code a lot, but does mean that if you hold the file
-descriptor open over an execve(), you'll continue to read from the _old_
-VM.
-
-That is different from our previous behavior, but much simpler.  If
-somebody actually finds a load where this matters, we'll need to revert
-this commit.
-
-I suspect that nobody will ever notice - because the process mapping
-addresses will also have changed as part of the execve.  So you cannot
-actually usefully access the fd across a VM change simply because all
-the offsets for IO would have changed too.
-
-Reported-by: Jüri Aedla <asd@xxxxx>
-Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
-Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
-Acked-by: Michal Marek <mmarek@xxxxxxx>
-
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 851ba3d..1fc1dca 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -194,65 +194,7 @@ static int proc_root_link(struct inode *inode, struct 
path *path)
-       return result;
- }
- 
--static struct mm_struct *__check_mem_permission(struct task_struct *task)
--{
--      struct mm_struct *mm;
--
--      mm = get_task_mm(task);
--      if (!mm)
--              return ERR_PTR(-EINVAL);
--
--      /*
--       * A task can always look at itself, in case it chooses
--       * to use system calls instead of load instructions.
--       */
--      if (task == current)
--              return mm;
--
--      /*
--       * If current is actively ptrace'ing, and would also be
--       * permitted to freshly attach with ptrace now, permit it.
--       */
--      if (task_is_stopped_or_traced(task)) {
--              int match;
--              rcu_read_lock();
--              match = (ptrace_parent(task) == current);
--              rcu_read_unlock();
--              if (match && ptrace_may_access(task, PTRACE_MODE_ATTACH))
--                      return mm;
--      }
--
--      /*
--       * No one else is allowed.
--       */
--      mmput(mm);
--      return ERR_PTR(-EPERM);
--}
--
--/*
-- * If current may access user memory in @task return a reference to the
-- * corresponding mm, otherwise ERR_PTR.
-- */
--static struct mm_struct *check_mem_permission(struct task_struct *task)
--{
--      struct mm_struct *mm;
--      int err;
--
--      /*
--       * Avoid racing if task exec's as we might get a new mm but validate
--       * against old credentials.
--       */
--      err = mutex_lock_killable(&task->signal->cred_guard_mutex);
--      if (err)
--              return ERR_PTR(err);
--
--      mm = __check_mem_permission(task);
--      mutex_unlock(&task->signal->cred_guard_mutex);
--
--      return mm;
--}
--
--struct mm_struct *mm_for_maps(struct task_struct *task)
-+static struct mm_struct *mm_access(struct task_struct *task, unsigned int 
mode)
- {
-       struct mm_struct *mm;
-       int err;
-@@ -263,7 +205,7 @@ struct mm_struct *mm_for_maps(struct task_struct *task)
- 
-       mm = get_task_mm(task);
-       if (mm && mm != current->mm &&
--                      !ptrace_may_access(task, PTRACE_MODE_READ)) {
-+                      !ptrace_may_access(task, mode)) {
-               mmput(mm);
-               mm = ERR_PTR(-EACCES);
-       }
-@@ -272,6 +214,11 @@ struct mm_struct *mm_for_maps(struct task_struct *task)
-       return mm;
- }
- 
-+struct mm_struct *mm_for_maps(struct task_struct *task)
-+{
-+      return mm_access(task, PTRACE_MODE_READ);
-+}
-+
- static int proc_pid_cmdline(struct task_struct *task, char * buffer)
- {
-       int res = 0;
-@@ -816,38 +763,39 @@ static const struct file_operations 
proc_single_file_operations = {
- 
- static int mem_open(struct inode* inode, struct file* file)
- {
--      file->private_data = (void*)((long)current->self_exec_id);
-+      struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
-+      struct mm_struct *mm;
-+
-+      if (!task)
-+              return -ESRCH;
-+
-+      mm = mm_access(task, PTRACE_MODE_ATTACH);
-+      put_task_struct(task);
-+
-+      if (IS_ERR(mm))
-+              return PTR_ERR(mm);
-+
-       /* OK to pass negative loff_t, we can catch out-of-range */
-       file->f_mode |= FMODE_UNSIGNED_OFFSET;
-+      file->private_data = mm;
-+
-       return 0;
- }
- 
- static ssize_t mem_read(struct file * file, char __user * buf,
-                       size_t count, loff_t *ppos)
- {
--      struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
-+      int ret;
-       char *page;
-       unsigned long src = *ppos;
--      int ret = -ESRCH;
--      struct mm_struct *mm;
-+      struct mm_struct *mm = file->private_data;
- 
--      if (!task)
--              goto out_no_task;
-+      if (!mm)
-+              return 0;
- 
--      ret = -ENOMEM;
-       page = (char *)__get_free_page(GFP_TEMPORARY);
-       if (!page)
--              goto out;
--
--      mm = check_mem_permission(task);
--      ret = PTR_ERR(mm);
--      if (IS_ERR(mm))
--              goto out_free;
--
--      ret = -EIO;
-- 
--      if (file->private_data != (void*)((long)current->self_exec_id))
--              goto out_put;
-+              return -ENOMEM;
- 
-       ret = 0;
-  
-@@ -874,13 +822,7 @@ static ssize_t mem_read(struct file * file, char __user * 
buf,
-       }
-       *ppos = src;
- 
--out_put:
--      mmput(mm);
--out_free:
-       free_page((unsigned long) page);
--out:
--      put_task_struct(task);
--out_no_task:
-       return ret;
- }
- 
-@@ -889,27 +831,15 @@ static ssize_t mem_write(struct file * file, const char 
__user *buf,
- {
-       int copied;
-       char *page;
--      struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
-       unsigned long dst = *ppos;
--      struct mm_struct *mm;
-+      struct mm_struct *mm = file->private_data;
- 
--      copied = -ESRCH;
--      if (!task)
--              goto out_no_task;
-+      if (!mm)
-+              return 0;
- 
--      copied = -ENOMEM;
-       page = (char *)__get_free_page(GFP_TEMPORARY);
-       if (!page)
--              goto out_task;
--
--      mm = check_mem_permission(task);
--      copied = PTR_ERR(mm);
--      if (IS_ERR(mm))
--              goto out_free;
--
--      copied = -EIO;
--      if (file->private_data != (void *)((long)current->self_exec_id))
--              goto out_mm;
-+              return -ENOMEM;
- 
-       copied = 0;
-       while (count > 0) {
-@@ -933,13 +863,7 @@ static ssize_t mem_write(struct file * file, const char 
__user *buf,
-       }
-       *ppos = dst;
- 
--out_mm:
--      mmput(mm);
--out_free:
-       free_page((unsigned long) page);
--out_task:
--      put_task_struct(task);
--out_no_task:
-       return copied;
- }
- 
-@@ -959,11 +883,20 @@ loff_t mem_lseek(struct file *file, loff_t offset, int 
orig)
-       return file->f_pos;
- }
- 
-+static int mem_release(struct inode *inode, struct file *file)
-+{
-+      struct mm_struct *mm = file->private_data;
-+
-+      mmput(mm);
-+      return 0;
-+}
-+
- static const struct file_operations proc_mem_operations = {
-       .llseek         = mem_lseek,
-       .read           = mem_read,
-       .write          = mem_write,
-       .open           = mem_open,
-+      .release        = mem_release,
- };
- 
- static ssize_t environ_read(struct file *file, char __user *buf,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash 
new/patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash
--- 
old/patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash   
    2012-01-25 11:51:08.000000000 +0100
+++ 
new/patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash   
    1970-01-01 01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-From: Jeff Mahoney <jeffm@xxxxxxxx>
-Subject: reiserfs: Force inode evictions before umount to avoid crash
-References: bnc#610598 bnc#680073 bnc#684112
-Patch-mainline: Submitted to reiserfs-devel Apr 6 2011
-
- This patch fixes a crash in reiserfs_delete_xattrs during umount.
-
- When shrink_dcache_for_umount clears the dcache from
- generic_shutdown_super, delayed evictions are forced to disk. If an
- evicted inode has extended attributes associated with it, it will
- need to walk the xattr tree to locate and remove them.
-
- But since shrink_dcache_for_umount will BUG if it encounters active
- dentries, the xattr tree must be released before it's called or it will
- crash during every umount.
-
- This patch forces the evictions to occur before generic_shutdown_super
- by calling shrink_dcache_sb first. The additional evictions caused
- by the removal of each associated xattr file and dir will be automatically
- handled as they're added to the LRU list.
-
-Signed-off-by: Jeff Mahoney <jeffm@xxxxxxxx>
-Acked-by: Jeff Mahoney <jeffm@xxxxxxxx>
----
- fs/reiserfs/super.c |   24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
---- a/fs/reiserfs/super.c
-+++ b/fs/reiserfs/super.c
-@@ -453,16 +453,20 @@ int remove_save_link(struct inode *inode
- static void reiserfs_kill_sb(struct super_block *s)
- {
-       if (REISERFS_SB(s)) {
--              if (REISERFS_SB(s)->xattr_root) {
--                      d_invalidate(REISERFS_SB(s)->xattr_root);
--                      dput(REISERFS_SB(s)->xattr_root);
--                      REISERFS_SB(s)->xattr_root = NULL;
--              }
--              if (REISERFS_SB(s)->priv_root) {
--                      d_invalidate(REISERFS_SB(s)->priv_root);
--                      dput(REISERFS_SB(s)->priv_root);
--                      REISERFS_SB(s)->priv_root = NULL;
--              }
-+              /*
-+               * Force any pending inode evictions to occur now. Any
-+               * inodes to be removed that have extended attributes
-+               * associated with them need to clean them up before
-+               * we can release the extended attribute root dentries.
-+               * shrink_dcache_for_umount will BUG if we don't release
-+               * those before it's called so ->put_super is too late.
-+               */
-+              shrink_dcache_sb(s);
-+
-+              dput(REISERFS_SB(s)->xattr_root);
-+              REISERFS_SB(s)->xattr_root = NULL;
-+              dput(REISERFS_SB(s)->priv_root);
-+              REISERFS_SB(s)->priv_root = NULL;
-       }
- 
-       kill_block_super(s);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/patches.fixes/remount-no-shrink-dcache 
new/patches.fixes/remount-no-shrink-dcache
--- old/patches.fixes/remount-no-shrink-dcache  2012-01-25 11:51:08.000000000 
+0100
+++ new/patches.fixes/remount-no-shrink-dcache  2012-02-09 15:57:54.000000000 
+0100
@@ -51,22 +51,22 @@
        /* If we are remounting RDONLY and current sb is read/write,
           make sure there are no rw files opened */
        if (remount_ro) {
--              if (force)
-+              if (rflags & REMOUNT_FORCE)
-                       mark_files_ro(sb);
-               else if (!fs_may_remount_ro(sb))
-                       return -EBUSY;
+-              if (force) {
++              if (rflags & REMOUNT_FORCE) {
+                       mark_files_ro(sb);
+               } else {
+                       retval = sb_prepare_remount_readonly(sb);
 @@ -728,7 +723,7 @@ int do_remount_sb(struct super_block *sb
        if (sb->s_op->remount_fs) {
                retval = sb->s_op->remount_fs(sb, &flags, data);
                if (retval) {
 -                      if (!force)
 +                      if (!(rflags & REMOUNT_FORCE))
-                               return retval;
+                               goto cancel_readonly;
                        /* If forced remount, go ahead despite any errors */
                        WARN(1, "forced remount of a %s fs returned %i\n",
 @@ -750,6 +745,21 @@ int do_remount_sb(struct super_block *sb
-       return 0;
+       return retval;
  }
  
 +/**

++++++ patches.rpmify.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/patches.rpmify/nvme-broken 
new/patches.rpmify/nvme-broken
--- old/patches.rpmify/nvme-broken      1970-01-01 01:00:00.000000000 +0100
+++ new/patches.rpmify/nvme-broken      2012-02-13 17:23:49.000000000 +0100
@@ -0,0 +1,35 @@
+From 06cfb415c425f66f7c87b611b1b786afa82331ab Mon Sep 17 00:00:00 2001
+From: Michal Marek <mmarek@xxxxxxx>
+Date: Mon, 13 Feb 2012 17:21:14 +0100
+Subject: [PATCH] nvme: Mark as broken on x86_32
+Patch-mainline: never
+
+I did it as a patch instead of changing the config files, in the hope
+that the patch would be removed once the 64bit io issue is resolved.
+
+Signed-off-by: Michal Marek <mmarek@xxxxxxx>
+
+diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
+index 4e4c8a4..6829483 100644
+--- a/drivers/block/Kconfig
++++ b/drivers/block/Kconfig
+@@ -320,6 +320,7 @@ config BLK_DEV_NBD
+ config BLK_DEV_NVME
+       tristate "NVM Express block device"
+       depends on PCI
++      depends on BROKEN || !X86_32
+       ---help---
+         The NVM Express driver is for solid state drives directly
+         connected to the PCI or PCI Express bus.  If you know you
+diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
+index c1dc4d8..5ddee61 100644
+--- a/drivers/block/nvme.c
++++ b/drivers/block/nvme.c
+@@ -996,6 +996,7 @@ static int __devinit nvme_configure_admin_queue(struct 
nvme_dev *dev)
+ 
+       writel(0, &dev->bar->cc);
+       writel(aqa, &dev->bar->aqa);
++      /* These are not defined on all archs */
+       writeq(nvmeq->sq_dma_addr, &dev->bar->asq);
+       writeq(nvmeq->cq_dma_addr, &dev->bar->acq);
+       writel(dev->ctrl_config, &dev->bar->cc);

++++++ 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-01-13 17:43:09.000000000 +0100
+++ 
new/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch
    2012-02-09 15:57:54.000000000 +0100
@@ -126,7 +126,7 @@
  
  /*
 @@ -1395,7 +1443,7 @@ void unlock_rename(struct dentry *p1, st
- int vfs_create(struct inode *dir, struct dentry *dentry, int mode,
+ int vfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
                struct nameidata *nd)
  {
 -      int error = may_create(dir, dentry);
@@ -136,7 +136,7 @@
                return error;
 @@ -1957,7 +2005,7 @@ EXPORT_SYMBOL_GPL(lookup_create);
  
- int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
+ int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t 
dev)
  {
 -      int error = may_create(dir, dentry);
 +      int error = may_create(dir, dentry, 0);
@@ -145,7 +145,7 @@
                return error;
 @@ -2061,7 +2109,7 @@ SYSCALL_DEFINE3(mknod, const char __user
  
- int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+ 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);
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-01-13 17:43:09.000000000 +0100
+++ new/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch     
2012-02-09 15:57:54.000000000 +0100
@@ -23,7 +23,7 @@
 @@ -2215,7 +2215,7 @@ static int __open_namei_create(struct na
        /* Negative dentry, just create the file */
        if (!dentry->d_inode) {
-               int mode = op->mode;
+               umode_t mode = op->mode;
 -              if (!IS_POSIXACL(dir->d_inode))
 +              if (!IS_ACL(dir->d_inode))
                        mode &= ~current_umask();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/patches.suse/8250-sysrq-ctrl_o.patch 
new/patches.suse/8250-sysrq-ctrl_o.patch
--- old/patches.suse/8250-sysrq-ctrl_o.patch    2012-01-13 17:43:09.000000000 
+0100
+++ new/patches.suse/8250-sysrq-ctrl_o.patch    2012-02-09 15:57:54.000000000 
+0100
@@ -110,8 +110,8 @@
        of_node_put(prom_stdout);
  
        DBG("Found serial console at ttyS%d\n", offset);
---- a/drivers/tty/serial/8250.c
-+++ b/drivers/tty/serial/8250.c
+--- a/drivers/tty/serial/8250/8250.c
++++ b/drivers/tty/serial/8250/8250.c
 @@ -102,6 +102,8 @@ static unsigned int skip_txen_test; /* f
  #define CONFIG_SERIAL_MANY_PORTS 1
  #endif
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-01-13 17:43:09.000000000 +0100
+++ new/patches.suse/SUSE-bootsplash    2012-02-09 15:57:54.000000000 +0100
@@ -157,7 +157,7 @@
 @@ -14,6 +14,7 @@
  obj-$(CONFIG_VT)                += console/
  obj-$(CONFIG_LOGO)              += logo/
- obj-y                           += backlight/ display/
+ obj-y                           += backlight/
 +obj-$(CONFIG_BOOTSPLASH)        += bootsplash/
  
  obj-$(CONFIG_FB_CFB_FILLRECT)  += cfbfillrect.o
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/patches.suse/kconfig-automate-kernel-desktop 
new/patches.suse/kconfig-automate-kernel-desktop
--- old/patches.suse/kconfig-automate-kernel-desktop    2012-01-13 
17:43:09.000000000 +0100
+++ new/patches.suse/kconfig-automate-kernel-desktop    2012-02-09 
15:57:54.000000000 +0100
@@ -37,9 +37,9 @@
          This option adds support for grouping sets of processes together, for
          use with process control subsystems such as Cpusets, CFS, memory
 @@ -651,7 +653,7 @@ config CGROUP_MEM_RES_CTLR_SWAP
+
  menuconfig CGROUP_SCHED
        bool "Group CPU scheduler"
-       depends on EXPERIMENTAL
 -      default n
 +      default !KERNEL_DESKTOP
        help
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-01-13 17:43:09.000000000 
+0100
+++ new/patches.suse/s390-Kerntypes.diff        2012-02-09 15:57:54.000000000 
+0100
@@ -69,7 +69,7 @@
  
  install: $(CONFIGURE) $(obj)/image
        sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/image \
--            System.map Kerntypes "$(INSTALL_PATH)"
+-            System.map "$(INSTALL_PATH)"
 +            System.map "$(INSTALL_PATH)"
 --- /dev/null
 +++ b/arch/s390/boot/kerntypes.c
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-01-13 17:43:09.000000000 +0100
+++ new/patches.suse/stack-unwind       2012-02-09 15:57:54.000000000 +0100
@@ -738,8 +738,8 @@
         */
 +      unwind_init();
        lockdep_init();
+       smp_setup_processor_id();
        debug_objects_early_init();
- 
 @@ -576,6 +578,7 @@ asmlinkage void __init start_kernel(void
        mm_init_owner(&init_mm, &init_task);
        mm_init_cpumask(&init_mm);
@@ -755,9 +755,9 @@
  obj-$(CONFIG_MODULES) += module.o
  obj-$(CONFIG_KALLSYMS) += kallsyms.o
 +obj-$(CONFIG_STACK_UNWIND) += unwind.o
- obj-$(CONFIG_PM) += power/
- obj-$(CONFIG_FREEZER) += power/
  obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
+ obj-$(CONFIG_KEXEC) += kexec.o
+ obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o
 --- a/kernel/module.c
 +++ b/kernel/module.c
 @@ -44,6 +44,7 @@
@@ -830,9 +830,9 @@
 +      /* Initialize unwind table */
 +      add_unwind_table(mod, &info);
 +
-       /* Get rid of temporary copy and strmap. */
-       kfree(info.strmap);
+       /* Get rid of temporary copy. */
        free_copy(&info);
+
 @@ -2999,6 +3028,7 @@ SYSCALL_DEFINE3(init_module, void __user
        /* Drop initial reference. */
        module_put(mod);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/patches.suse/supported-flag 
new/patches.suse/supported-flag
--- old/patches.suse/supported-flag     2012-01-13 17:43:09.000000000 +0100
+++ new/patches.suse/supported-flag     2012-02-09 15:57:54.000000000 +0100
@@ -29,7 +29,7 @@
 
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -2610,6 +2610,11 @@ bytes respectively. Such letter suffixes
+@@ -2666,6 +2666,11 @@ bytes respectively. Such letter suffixes
        unknown_nmi_panic
                        [X86] Cause panic on unknown NMI.
  
@@ -43,10 +43,10 @@
                        (default -1 = authorized except for wireless USB,
 --- a/Documentation/sysctl/kernel.txt
 +++ b/Documentation/sysctl/kernel.txt
-@@ -579,6 +579,18 @@ can be ORed together:
-         instead of using the one provided by the hardware.
-  512 - A kernel warning has occurred.
+@@ -603,6 +603,18 @@ can be ORed together:
  1024 - A module from drivers/staging was loaded.
+ 2048 - The system is working around a severe firmware bug.
+ 4096 - An out-of-tree module has been loaded.
 + 0x40000000 - An unsupported kernel module was loaded.
 + 0x80000000 - An kernel module with external support was loaded.
 +
@@ -78,18 +78,19 @@
  KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if 
$(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
-@@ -341,8 +341,10 @@ extern int panic_timeout;
+@@ -342,9 +342,11 @@ extern int panic_timeout;
  extern int panic_on_oops;
  extern int panic_on_unrecovered_nmi;
  extern int panic_on_io_nmi;
 +extern int unsupported;
+ extern int sysctl_panic_on_stackoverflow;
  extern const char *print_tainted(void);
  extern void add_taint(unsigned flag);
 +extern void add_nonfatal_taint(unsigned flag);
  extern int test_taint(unsigned flag);
  extern unsigned long get_taint(void);
  extern int root_mountflags;
-@@ -373,6 +375,13 @@ extern enum system_states {
+@@ -375,6 +377,13 @@ extern enum system_states {
  #define TAINT_FIRMWARE_WORKAROUND     11
  #define TAINT_OOT_MODULE              12
  
@@ -105,7 +106,7 @@
  #define hex_asc_hi(x) hex_asc[((x) & 0xf0) >> 4]
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
-@@ -378,6 +378,7 @@ struct module *__module_address(unsigned
+@@ -389,6 +389,7 @@ struct module *__module_address(unsigned
  bool is_module_address(unsigned long addr);
  bool is_module_percpu_address(unsigned long addr);
  bool is_module_text_address(unsigned long addr);
@@ -154,7 +155,7 @@
  
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -95,6 +95,20 @@
+@@ -89,6 +89,20 @@
  /* If this is set, the section belongs in the init part of the module */
  #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
  
@@ -175,9 +176,20 @@
  /*
   * Mutex protects:
   * 1) List of modules (also safely readable with preempt_disable),
-@@ -991,11 +1005,37 @@ struct module_attribute module_uevent =
-       .store = store_uevent,
- };
+@@ -954,6 +968,10 @@ static size_t module_flags_taint(struct
+               buf[l++] = 'F';
+       if (mod->taints & (1 << TAINT_CRAP))
+               buf[l++] = 'C';
++      if (mod->taints & (1 << TAINT_NO_SUPPORT))
++              buf[l++] = 'N';
++      if (mod->taints & (1 << TAINT_EXTERNAL_SUPPORT))
++              buf[l++] = 'X';
+       /*
+        * TAINT_FORCED_RMMOD: could be added.
+        * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
+@@ -1029,6 +1047,31 @@ static ssize_t show_taint(struct module_
+ static struct module_attribute modinfo_taint =
+       __ATTR(taint, 0444, show_taint, NULL);
  
 +static void setup_modinfo_supported(struct module *mod, const char *s)
 +{
@@ -205,15 +217,17 @@
 +};
 +
  static struct module_attribute *modinfo_attrs[] = {
-       &modinfo_version,
-       &modinfo_srcversion,
-       &initstate,
        &module_uevent,
+       &modinfo_version,
+@@ -1037,6 +1080,7 @@ static struct module_attribute *modinfo_
+       &modinfo_coresize,
+       &modinfo_initsize,
+       &modinfo_taint,
 +      &modinfo_supported,
  #ifdef CONFIG_MODULE_UNLOAD
-       &refcnt,
+       &modinfo_refcnt,
  #endif
-@@ -1537,6 +1577,26 @@ static int mod_sysfs_setup(struct module
+@@ -1578,6 +1622,26 @@ static int mod_sysfs_setup(struct module
        add_sect_attrs(mod, info);
        add_notes_attrs(mod, info);
  
@@ -240,18 +254,7 @@
        kobject_uevent(&mod->mkobj.kobj, KOBJ_ADD);
        return 0;
  
-@@ -3264,6 +3324,10 @@ static char *module_flags(struct module
-                       buf[bx++] = 'F';
-               if (mod->taints & (1 << TAINT_CRAP))
-                       buf[bx++] = 'C';
-+              if (mod->taints & (1 << TAINT_NO_SUPPORT))
-+                      buf[bx++] = 'N';
-+              if (mod->taints & (1 << TAINT_EXTERNAL_SUPPORT))
-+                      buf[bx++] = 'X';
-               /*
-                * TAINT_FORCED_RMMOD: could be added.
-                * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
-@@ -3476,6 +3540,7 @@ void print_modules(void)
+@@ -3491,6 +3555,7 @@ void print_modules(void)
        if (last_unloaded_module[0])
                printk(" [last unloaded: %s]", last_unloaded_module);
        printk("\n");
@@ -261,7 +264,7 @@
  #ifdef CONFIG_MODVERSIONS
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
-@@ -178,6 +178,8 @@ static const struct tnt tnts[] = {
+@@ -198,6 +198,8 @@ static const struct tnt tnts[] = {
        { TAINT_CRAP,                   'C', ' ' },
        { TAINT_FIRMWARE_WORKAROUND,    'I', ' ' },
        { TAINT_OOT_MODULE,             'O', ' ' },
@@ -270,7 +273,7 @@
  };
  
  /**
-@@ -196,6 +198,8 @@ static const struct tnt tnts[] = {
+@@ -216,6 +218,8 @@ static const struct tnt tnts[] = {
   *  'C' - modules from drivers/staging are loaded.
   *  'I' - Working around severe firmware bug.
   *  'O' - Out-of-tree module has been loaded.
@@ -279,7 +282,7 @@
   *
   *    The string is overwritten by the next call to print_tainted().
   */
-@@ -231,6 +235,11 @@ unsigned long get_taint(void)
+@@ -251,6 +255,11 @@ unsigned long get_taint(void)
        return tainted_mask;
  }
  
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/patches.suse/supported-flag-enterprise 
new/patches.suse/supported-flag-enterprise
--- old/patches.suse/supported-flag-enterprise  2012-01-13 17:43:09.000000000 
+0100
+++ new/patches.suse/supported-flag-enterprise  2012-02-09 15:57:54.000000000 
+0100
@@ -20,12 +20,12 @@
  kernel/module.c                     |   19 ++++++++++++++++++-
  kernel/panic.c                      |    2 ++
  kernel/sysctl.c                     |    2 +-
- scripts/Makefile.modpost            |    5 +++--
- 8 files changed, 50 insertions(+), 4 deletions(-)
+ scripts/Makefile.modpost            |    7 ++++---
+ 8 files changed, 51 insertions(+), 5 deletions(-)
 
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -2568,6 +2568,9 @@ bytes respectively. Such letter suffixes
+@@ -2671,6 +2671,9 @@ bytes respectively. Such letter suffixes
                        1 = warn when loading unsupported modules,
                        2 = don't warn.
  
@@ -37,7 +37,7 @@
                        (default -1 = authorized except for wireless USB,
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
-@@ -372,12 +372,14 @@ extern enum system_states {
+@@ -377,12 +377,14 @@ extern enum system_states {
  #define TAINT_FIRMWARE_WORKAROUND     11
  #define TAINT_OOT_MODULE              12
  
@@ -80,7 +80,7 @@
        depends on SUSE_KERNEL && MODULES
 --- a/kernel/ksysfs.c
 +++ b/kernel/ksysfs.c
-@@ -166,6 +166,7 @@ static struct bin_attribute notes_attr =
+@@ -167,6 +167,7 @@ static struct bin_attribute notes_attr =
  struct kobject *kernel_kobj;
  EXPORT_SYMBOL_GPL(kernel_kobj);
  
@@ -88,7 +88,7 @@
  const char *supported_printable(int taint)
  {
        int mask = TAINT_PROPRIETARY_MODULE|TAINT_NO_SUPPORT;
-@@ -187,6 +188,7 @@ static ssize_t supported_show(struct kob
+@@ -188,6 +189,7 @@ static ssize_t supported_show(struct kob
        return sprintf(buf, "%s\n", supported_printable(get_taint()));
  }
  KERNEL_ATTR_RO(supported);
@@ -96,7 +96,7 @@
  
  static struct attribute * kernel_attrs[] = {
        &fscaps_attr.attr,
-@@ -203,7 +205,9 @@ static struct attribute * kernel_attrs[]
+@@ -204,7 +206,9 @@ static struct attribute * kernel_attrs[]
        &kexec_crash_size_attr.attr,
        &vmcoreinfo_attr.attr,
  #endif
@@ -108,7 +108,7 @@
  
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -95,6 +95,7 @@
+@@ -89,6 +89,7 @@
  /* If this is set, the section belongs in the init part of the module */
  #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
  
@@ -116,7 +116,7 @@
  /* Allow unsupported modules switch. */
  #ifdef UNSUPPORTED_MODULES
  int unsupported = UNSUPPORTED_MODULES;
-@@ -108,6 +109,7 @@ static int __init unsupported_setup(char
+@@ -102,6 +103,7 @@ static int __init unsupported_setup(char
        return 1;
  }
  __setup("unsupported=", unsupported_setup);
@@ -124,32 +124,46 @@
  
  /*
   * Mutex protects:
-@@ -1005,6 +1007,7 @@ struct module_attribute module_uevent =
-       .store = store_uevent,
- };
+@@ -968,10 +970,12 @@ static size_t module_flags_taint(struct
+               buf[l++] = 'F';
+       if (mod->taints & (1 << TAINT_CRAP))
+               buf[l++] = 'C';
++#ifdef CONFIG_ENTERPRISE_SUPPORT
+       if (mod->taints & (1 << TAINT_NO_SUPPORT))
+               buf[l++] = 'N';
+       if (mod->taints & (1 << TAINT_EXTERNAL_SUPPORT))
+               buf[l++] = 'X';
++#endif
+       /*
+        * TAINT_FORCED_RMMOD: could be added.
+        * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
+@@ -1047,6 +1051,7 @@ static ssize_t show_taint(struct module_
+ static struct module_attribute modinfo_taint =
+       __ATTR(taint, 0444, show_taint, NULL);
  
 +#ifdef CONFIG_ENTERPRISE_SUPPORT
  static void setup_modinfo_supported(struct module *mod, const char *s)
  {
        if (!s) {
-@@ -1029,13 +1032,16 @@ static struct module_attribute modinfo_s
+@@ -1071,6 +1076,7 @@ static struct module_attribute modinfo_s
        .show = show_modinfo_supported,
        .setup = setup_modinfo_supported,
  };
 +#endif
  
  static struct module_attribute *modinfo_attrs[] = {
-       &modinfo_version,
-       &modinfo_srcversion,
-       &initstate,
        &module_uevent,
+@@ -1080,7 +1086,9 @@ static struct module_attribute *modinfo_
+       &modinfo_coresize,
+       &modinfo_initsize,
+       &modinfo_taint,
 +#ifdef CONFIG_ENTERPRISE_SUPPORT
        &modinfo_supported,
 +#endif
  #ifdef CONFIG_MODULE_UNLOAD
-       &refcnt,
+       &modinfo_refcnt,
  #endif
-@@ -1577,6 +1583,7 @@ static int mod_sysfs_setup(struct module
+@@ -1622,6 +1630,7 @@ static int mod_sysfs_setup(struct module
        add_sect_attrs(mod, info);
        add_notes_attrs(mod, info);
  
@@ -157,7 +171,7 @@
        /* We don't use add_taint() here because it also disables lockdep. */
        if (mod->taints & (1 << TAINT_EXTERNAL_SUPPORT))
                add_nonfatal_taint(TAINT_EXTERNAL_SUPPORT);
-@@ -1586,7 +1593,7 @@ static int mod_sysfs_setup(struct module
+@@ -1631,7 +1640,7 @@ static int mod_sysfs_setup(struct module
                               "Novell, refusing to load. To override, echo "
                               "1 > /proc/sys/kernel/unsupported\n", mod->name);
                        err = -ENOEXEC;
@@ -166,7 +180,7 @@
                }
                add_nonfatal_taint(TAINT_NO_SUPPORT);
                if (unsupported == 1) {
-@@ -1596,10 +1603,16 @@ static int mod_sysfs_setup(struct module
+@@ -1641,10 +1650,16 @@ static int mod_sysfs_setup(struct module
                               "fault.\n", mod->name);
                }
        }
@@ -183,20 +197,7 @@
  out_unreg_param:
        module_param_sysfs_remove(mod);
  out_unreg_holders:
-@@ -3321,10 +3334,12 @@ static char *module_flags(struct module
-                       buf[bx++] = 'F';
-               if (mod->taints & (1 << TAINT_CRAP))
-                       buf[bx++] = 'C';
-+#ifdef CONFIG_ENTERPRISE_SUPPORT
-               if (mod->taints & (1 << TAINT_NO_SUPPORT))
-                       buf[bx++] = 'N';
-               if (mod->taints & (1 << TAINT_EXTERNAL_SUPPORT))
-                       buf[bx++] = 'X';
-+#endif
-               /*
-                * TAINT_FORCED_RMMOD: could be added.
-                * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
-@@ -3537,7 +3552,9 @@ void print_modules(void)
+@@ -3555,7 +3570,9 @@ void print_modules(void)
        if (last_unloaded_module[0])
                printk(" [last unloaded: %s]", last_unloaded_module);
        printk("\n");
@@ -208,10 +209,10 @@
  #ifdef CONFIG_MODVERSIONS
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
-@@ -177,8 +177,10 @@ static const struct tnt tnts[] = {
+@@ -198,8 +198,10 @@ static const struct tnt tnts[] = {
        { TAINT_CRAP,                   'C', ' ' },
        { TAINT_FIRMWARE_WORKAROUND,    'I', ' ' },
-       { TAINT_OOT_MODULE,             'O', ' ' },
+       { TAINT_OOT_MODULE,             'O', ' ' },
 +#ifdef CONFIG_ENTERPRISE_SUPPORT
        { TAINT_NO_SUPPORT,             'N', ' ' },
        { TAINT_EXTERNAL_SUPPORT,       'X', ' ' },
@@ -221,7 +222,7 @@
  /**
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -666,7 +666,7 @@ static struct ctl_table kern_table[] = {
+@@ -670,7 +670,7 @@ static struct ctl_table kern_table[] = {
                .extra1         = &pid_max_min,
                .extra2         = &pid_max_max,
        },

++++++ patches.xen.tar.bz2 ++++++
++++ 59384 lines of diff (skipped)

++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:51.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:51.000000000 +0100
@@ -55,6 +55,7 @@
        patches.rpmify/rpm-kernel-config
        patches.rpmify/split-package
        patches.rpmify/cloneconfig.diff
+       patches.rpmify/nvme-broken
 
         ########################################################
         # kbuild/module infrastructure fixes
@@ -105,6 +106,27 @@
         ########################################################
        patches.arch/x86_64-hpet-64bit-timer.patch
 
+    # Queued for 3.4, please remove the autoload patches then
+    # including the autoload_fixes below
+       patches.arch/001-x86_autoload.patch
+       patches.arch/002-x86_autoload.patch
+       patches.arch/003-x86_autoload.patch
+       patches.arch/004-x86_autoload.patch
+       patches.arch/005-x86_autoload.patch
+       patches.arch/006-x86_autoload.patch
+       patches.arch/007-x86_autoload.patch
+       patches.arch/008-x86_autoload.patch
+       patches.arch/009-x86_autoload.patch
+       patches.arch/010-x86_autoload.patch
+
+       patches.arch/001-x86_autoload_fixes.patch
+       patches.arch/002-x86_autoload_fixes.patch
+       patches.arch/003-x86_autoload_fixes.patch
+       patches.arch/004-x86_autoload_fixes.patch
+       patches.arch/005-x86_autoload_fixes.patch
+       patches.arch/006-x86_autoload_fixes.patch
+       patches.arch/007-x86_autoload_fixes.patch
+
 +needs_update  patches.arch/kvm-split-paravirt-ops-by-functionality
 +needs_update  patches.arch/kvm-only-export-selected-pv-ops-feature-structs
 +needs_update  patches.arch/kvm-split-the-KVM-pv-ops-support-by-feature
@@ -177,7 +199,6 @@
        patches.suse/readahead-request-tunables.patch
        
patches.fixes/fs-partitions-efi-c-corrupted-guid-partition-tables-can-cause-kernel-oops
        patches.fixes/mm-Fix-assertion-mapping-nrpages-0-in-end_writeback.patch
-       patches.fixes/proc-mem-security-fix
 
         ########################################################
         # IPC patches
@@ -210,9 +231,6 @@
        # for example SLE11 specific BIOS updates (if there is no other
        # way to safely solve an ACPI issue).
 +trenn patches.suse/acpi_osi_sle11_ident.patch
-       patches.arch/acpi_srat-pxm-rev-store.patch
-       patches.arch/acpi_srat-pxm-rev-ia64.patch
-       patches.arch/acpi_srat-pxm-rev-x86-64.patch
 
        # Queued for 2.6.36 -> just revert after some time
        patches.fixes/acpi_ec_sys_access_user_space_with_get_user.patch
@@ -280,7 +298,6 @@
        ########################################################
        # Reiserfs Patches
        ########################################################
-       
patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash
 +needs_updating-39     patches.suse/reiser4-dependencies
 
        ########################################################
@@ -619,6 +636,10 @@
        patches.xen/xen3-patch-3.0
        patches.xen/xen3-patch-3.1
        patches.xen/xen3-patch-3.2
+       patches.xen/xen3-patch-3.3-rc5
+       patches.xen/xen3-004-x86_autoload.patch
+       patches.xen/xen3-006-x86_autoload.patch
+       patches.xen/xen3-009-x86_autoload.patch
        patches.xen/xen3-apei_allow_drivers_access_nvs_ram.patch
        
patches.xen/xen3-acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch
        patches.xen/xen3-stack-unwind
@@ -646,7 +667,7 @@
        patches.xen/xen-blktap-modular
        patches.xen/xen-blktap-write-barriers
        patches.xen/xen-blktap2-configurable-nr-devs
-       patches.xen/xen-op-packet
+       patches.xen/xen-blkif-op-packet
        patches.xen/xen-blkfront-cdrom
        patches.xen/xen-blkfront-hvm-no-cdrom
        patches.xen/xen-netback-nr-irqs

++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.yJtsVm/_old  2012-03-02 13:48:51.000000000 +0100
+++ /var/tmp/diff_new_pack.yJtsVm/_new  2012-03-02 13:48:51.000000000 +0100
@@ -1,3 +1,3 @@
-2012-01-25 11:51:08 +0100
-GIT Revision: 2206a5c5b9aa64bd9a741830257f184818a0f6ee
+2012-02-29 15:22:34 +0100
+GIT Revision: f22562233702e32624577b9254075e086c8da001
 GIT Branch: master

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx