commit kernel-source for openSUSE:Factory
Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Wed Dec 29 00:13:01 CET 2010. -------- --- kernel-source/kernel-debug.changes 2010-12-09 16:26:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2010-12-28 16:02:39.000000000 +0100 @@ -1,0 +2,125 @@ +Tue Dec 28 07:01:24 CET 2010 - mgalbraith@suse.de + +- sched: fix autogroup /proc interface race. +- commit fd7019c + +------------------------------------------------------------------- +Mon Dec 27 23:28:19 CET 2010 - jeffm@suse.com + +- scripts/wd-functions.sh: Re-added support for finding tarball in $MIRROR. +- commit c8014fb + +------------------------------------------------------------------- +Mon Dec 27 23:24:08 CET 2010 - jeffm@suse.com + +- sched, cgroup: Use exit hook to avoid use-after-free crash. +- commit 59c0581 + +------------------------------------------------------------------- +Mon Dec 27 23:09:38 CET 2010 - jeffm@suse.com + +- Update to 2.6.37-rc7. + - Eliminated 9 patches. +- commit d38591c + +------------------------------------------------------------------- +Mon Dec 20 12:48:45 CET 2010 - jslaby@suse.cz + +- Revert "x86: allocate space within a region top-down" + (bnc#655048). + Backport to XEN. +- commit 92c0965 + +------------------------------------------------------------------- +Mon Dec 20 11:33:32 CET 2010 - jslaby@suse.cz + +- Revert "PCI: fix pci_bus_alloc_resource() hang, prefer positive + decode" (bnc#655048). +- Revert "x86: allocate space within a region top-down" + (bnc#655048). +- Revert "x86/PCI: allocate space from the end of a region, + not the beginning" (bnc#655048). +- Revert "PCI: allocate bus resources from the top down" + (bnc#655048). +- Revert "resources: support allocating space within a region + from the top down" (bnc#655048). +- resources: add arch hook for preventing allocation in reserved + areas (bnc#655048). +- x86: avoid low BIOS area when allocating address space + (bnc#655048). +- x86: avoid E820 regions when allocating address space + (bnc#655048). +- x86: avoid high BIOS area when allocating address space + (bnc#655048). +- Refresh patches.xen/xen3-patch-2.6.34. +- commit 7bbbf27 + +------------------------------------------------------------------- +Mon Dec 20 11:29:01 CET 2010 - jslaby@suse.cz + +- Revert "- resources: add arch hook for preventing allocation in reserved" + This reverts commit 7e253537787f4fb057e12a166356169c5adb9665. It was unintended to be pushed as the patches are obsoleted. +- commit 6f3bdf8 + +------------------------------------------------------------------- +Mon Dec 20 11:19:41 CET 2010 - jslaby@suse.cz + +- Delete + patches.fixes/res-0010-PCI-fix-pci_bus_alloc_resource-hang-prefer-positive-.patch. + It's unreferenced and wrong. +- commit 9e6fc50 + +------------------------------------------------------------------- +Thu Dec 16 23:21:40 CET 2010 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Define %kernelrelease +- commit 1d67b13 + +------------------------------------------------------------------- +Thu Dec 16 22:31:42 CET 2010 - jeffm@suse.com + +- Linux: 2.6.37-rc6. +- Update config files. +- Refresh patches.suse/SoN-23-mm-swapfile.patch. +- Refresh patches.suse/SoN-26-nfs-swapper.patch. +- Refresh patches.xen/xen3-fixup-xen. +- Refresh patches.xen/xen3-patch-2.6.24. +- commit 5650f90 + +------------------------------------------------------------------- +Mon Dec 13 12:17:49 CET 2010 - jbeulich@novell.com + +- Update Xen config files (XEN_NETDEV_LOOPBACK=n). +- supported.conf: Update. +- commit d385dff + +------------------------------------------------------------------- +Mon Dec 13 09:12:36 CET 2010 - tiwai@suse.de + +- Refresh patches.suse/bootsplash-scaler: Fix crash when bootsplash animation is used (bnc#646908) +- commit c5eced1 + +------------------------------------------------------------------- +Fri Dec 10 09:23:46 CET 2010 - jslaby@suse.cz + +- resources: add arch hook for preventing allocation in reserved + areas (bnc#655048). +- x86: avoid BIOS area when allocating address space (bnc#655048). +- x86: avoid PNP resources when allocating address space + (bnc#655048). +- Refresh patches.xen/xen3-patch-2.6.34. +- commit 7e25353 + +------------------------------------------------------------------- +Fri Dec 10 09:20:34 CET 2010 - jbeulich@novell.com + +- Update Xen config files (CONFIG_XEN_COMPAT=0x040000). +- commit 5343e5f + +------------------------------------------------------------------- +Fri Dec 10 09:11:01 CET 2010 - jbeulich@novell.com + +- Update Xen patches to 2.6.37-rc5. +- commit bef1a0d + +------------------------------------------------------------------- @@ -4,0 +130 @@ +- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config @@ -454,0 +581,8 @@ + +------------------------------------------------------------------- +Thu Sep 23 23:33:54 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Fix for kernel release strings like + 2.6.36-rc5-73-g57aebd7-vanilla. +- rpm/kernel-spec-macros: Cleanup. +- commit 0926a18 kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-net.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-vmi.changes: same change kernel-xen.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.37 -Release: 6 +Release: 7 %if %using_buildservice %else %endif @@ -302,8 +302,14 @@ else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -312,7 +318,6 @@ --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100 @@ -17,7 +17,7 @@ # norootforbuild -%define patchversion 2.6.37-rc5 +%define patchversion 2.6.37-rc7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -25,7 +25,7 @@ Name: kernel-docs Summary: Kernel Documentation Version: 2.6.37 -Release: 6 +Release: 7 %if %using_buildservice %else %endif ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel Version: 2.6.37 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -300,8 +300,14 @@ else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -310,7 +316,6 @@ --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else ++++++ kernel-net.spec ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-net Summary: Minimal kernel with disk and net support Version: 2.6.37 -Release: 6 +Release: 7 %if %using_buildservice %else %endif @@ -299,8 +299,14 @@ else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -309,7 +315,6 @@ --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else kernel-pae.spec: same change kernel-ppc64.spec: same change kernel-ps3.spec: same change kernel-s390.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100 @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,7 +31,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 2.6.37 -Release: 6 +Release: 7 %if %using_buildservice %else %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100 @@ -24,7 +24,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.37 -Release: 6 +Release: 7 %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features Version: 2.6.37 -Release: 6 +Release: 7 %if %using_buildservice %else %endif @@ -309,8 +309,14 @@ else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -319,7 +325,6 @@ --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else kernel-vanilla.spec: same change kernel-vmi.spec: same change ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.36 -%define patchversion 2.6.37-rc5 +%define kernelrelease 2.6.37-rc7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-xen Summary: The Xen Kernel Version: 2.6.37 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -300,8 +300,14 @@ else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -310,7 +316,6 @@ --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else ++++++ config-options.changes.txt ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon Dec 13 12:17:15 CEST 2010 - jbeulich@novell.com + +- */xen: XEN_NETDEV_LOOPBACK=n (no longer needed/supported). + +------------------------------------------------------------------- +Fri Dec 10 09:20:36 CEST 2010 - jbeulich@novell.com + +- */xen: CONFIG_XEN_COMPAT=0x040000. + +------------------------------------------------------------------- Tue Nov 16 20:18:04 CET 2010 - jeffm@suse.de - Updated to 2.6.36-rc2: ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2010-12-07 16:32:30.000000000 +0100 +++ new/config/i386/debug 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2671,6 +2671,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default --- old/config/i386/default 2010-12-07 16:32:30.000000000 +0100 +++ new/config/i386/default 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2643,6 +2643,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop --- old/config/i386/desktop 2010-12-07 16:32:30.000000000 +0100 +++ new/config/i386/desktop 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2566,6 +2566,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/ec2 new/config/i386/ec2 --- old/config/i386/ec2 2010-12-07 16:32:30.000000000 +0100 +++ new/config/i386/ec2 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2010-12-07 16:32:30.000000000 +0100 +++ new/config/i386/pae 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2568,6 +2568,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/trace new/config/i386/trace --- old/config/i386/trace 2010-12-07 16:32:30.000000000 +0100 +++ new/config/i386/trace 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2568,6 +2568,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vanilla new/config/i386/vanilla --- old/config/i386/vanilla 2010-12-07 16:32:30.000000000 +0100 +++ new/config/i386/vanilla 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2625,6 +2625,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vmi new/config/i386/vmi --- old/config/i386/vmi 2010-12-07 16:32:30.000000000 +0100 +++ new/config/i386/vmi 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2568,6 +2568,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2010-12-07 16:32:30.000000000 +0100 +++ new/config/i386/xen 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37-rc5 Kernel Configuration +# Linux/i386 2.6.37-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2415,6 +2415,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m @@ -4472,7 +4473,7 @@ CONFIG_XEN_NETDEV_BACKEND=m CONFIG_XEN_NETDEV_TX_SHIFT=10 # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set -CONFIG_XEN_NETDEV_LOOPBACK=m +# CONFIG_XEN_NETDEV_LOOPBACK is not set CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_XEN_PCIDEV_BACKEND_VPCI=y # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set @@ -4498,11 +4499,11 @@ # CONFIG_XEN_COMPAT_030004_AND_LATER is not set # CONFIG_XEN_COMPAT_030100_AND_LATER is not set # CONFIG_XEN_COMPAT_030200_AND_LATER is not set -CONFIG_XEN_COMPAT_030300_AND_LATER=y +# CONFIG_XEN_COMPAT_030300_AND_LATER is not set # CONFIG_XEN_COMPAT_030400_AND_LATER is not set -# CONFIG_XEN_COMPAT_040000_AND_LATER is not set +CONFIG_XEN_COMPAT_040000_AND_LATER=y # CONFIG_XEN_COMPAT_LATEST_ONLY is not set -CONFIG_XEN_COMPAT=0x030300 +CONFIG_XEN_COMPAT=0x040000 CONFIG_XEN_VCPU_INFO_PLACEMENT=y CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_ARCH_HAS_WALK_MEMORY=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ia64/debug 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/ia64 2.6.37-rc5 Kernel Configuration +# Linux/ia64 2.6.37-rc7 Kernel Configuration # CONFIG_SUSE_KERNEL=y # CONFIG_ENTERPRISE_SUPPORT is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ia64/default 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/ia64 2.6.37-rc5 Kernel Configuration +# Linux/ia64 2.6.37-rc7 Kernel Configuration # CONFIG_SUSE_KERNEL=y # CONFIG_ENTERPRISE_SUPPORT is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/trace new/config/ia64/trace --- old/config/ia64/trace 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ia64/trace 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/ia64 2.6.37-rc5 Kernel Configuration +# Linux/ia64 2.6.37-rc7 Kernel Configuration # CONFIG_SUSE_KERNEL=y # CONFIG_ENTERPRISE_SUPPORT is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/vanilla new/config/ia64/vanilla --- old/config/ia64/vanilla 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ia64/vanilla 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/ia64 2.6.37-rc5 Kernel Configuration +# Linux/ia64 2.6.37-rc6 Kernel Configuration # CONFIG_SUSE_KERNEL=y CONFIG_SPLIT_PACKAGE=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default --- old/config/ppc/default 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ppc/default 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/powerpc 2.6.37-rc5 Kernel Configuration +# Linux/powerpc 2.6.37-rc7 Kernel Configuration # # CONFIG_PPC64 is not set @@ -2034,6 +2034,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/ppc64 new/config/ppc/ppc64 --- old/config/ppc/ppc64 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ppc/ppc64 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/powerpc 2.6.37-rc5 Kernel Configuration +# Linux/powerpc 2.6.37-rc7 Kernel Configuration # CONFIG_PPC64=y @@ -2020,6 +2020,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/ps3 new/config/ppc/ps3 --- old/config/ppc/ps3 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ppc/ps3 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/powerpc 2.6.37-rc5 Kernel Configuration +# Linux/powerpc 2.6.37-rc7 Kernel Configuration # CONFIG_PPC64=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/vanilla new/config/ppc/vanilla --- old/config/ppc/vanilla 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ppc/vanilla 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/powerpc 2.6.37-rc5 Kernel Configuration +# Linux/powerpc 2.6.37-rc6 Kernel Configuration # # CONFIG_PPC64 is not set @@ -2025,6 +2025,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/debug new/config/ppc64/debug --- old/config/ppc64/debug 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ppc64/debug 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/powerpc 2.6.37-rc5 Kernel Configuration +# Linux/powerpc 2.6.37-rc7 Kernel Configuration # CONFIG_PPC64=y @@ -2037,6 +2037,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default --- old/config/ppc64/default 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ppc64/default 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/powerpc 2.6.37-rc5 Kernel Configuration +# Linux/powerpc 2.6.37-rc7 Kernel Configuration # CONFIG_PPC64=y @@ -2026,6 +2026,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/ppc64 new/config/ppc64/ppc64 --- old/config/ppc64/ppc64 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ppc64/ppc64 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/powerpc 2.6.37-rc5 Kernel Configuration +# Linux/powerpc 2.6.37-rc7 Kernel Configuration # CONFIG_PPC64=y @@ -2078,6 +2078,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/trace new/config/ppc64/trace --- old/config/ppc64/trace 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ppc64/trace 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/powerpc 2.6.37-rc5 Kernel Configuration +# Linux/powerpc 2.6.37-rc7 Kernel Configuration # CONFIG_PPC64=y @@ -2078,6 +2078,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/vanilla new/config/ppc64/vanilla --- old/config/ppc64/vanilla 2010-12-07 16:32:30.000000000 +0100 +++ new/config/ppc64/vanilla 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/powerpc 2.6.37-rc5 Kernel Configuration +# Linux/powerpc 2.6.37-rc6 Kernel Configuration # CONFIG_PPC64=y @@ -2015,6 +2015,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/s390 new/config/s390/s390 --- old/config/s390/s390 2010-12-07 16:32:30.000000000 +0100 +++ new/config/s390/s390 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/s390 2.6.37-rc5 Kernel Configuration +# Linux/s390 2.6.37-rc7 Kernel Configuration # CONFIG_SCHED_MC=y CONFIG_MMU=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/trace new/config/s390/trace --- old/config/s390/trace 2010-12-07 16:32:30.000000000 +0100 +++ new/config/s390/trace 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/s390 2.6.37-rc5 Kernel Configuration +# Linux/s390 2.6.37-rc7 Kernel Configuration # CONFIG_SCHED_MC=y CONFIG_MMU=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/vanilla new/config/s390/vanilla --- old/config/s390/vanilla 2010-12-07 16:32:30.000000000 +0100 +++ new/config/s390/vanilla 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/s390 2.6.37-rc5 Kernel Configuration +# Linux/s390 2.6.37-rc6 Kernel Configuration # CONFIG_SCHED_MC=y CONFIG_MMU=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/default new/config/s390x/default --- old/config/s390x/default 2010-12-07 16:32:30.000000000 +0100 +++ new/config/s390x/default 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/s390 2.6.37-rc5 Kernel Configuration +# Linux/s390 2.6.37-rc7 Kernel Configuration # CONFIG_SCHED_MC=y CONFIG_MMU=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/trace new/config/s390x/trace --- old/config/s390x/trace 2010-12-07 16:32:30.000000000 +0100 +++ new/config/s390x/trace 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/s390 2.6.37-rc5 Kernel Configuration +# Linux/s390 2.6.37-rc7 Kernel Configuration # CONFIG_SCHED_MC=y CONFIG_MMU=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/vanilla new/config/s390x/vanilla --- old/config/s390x/vanilla 2010-12-07 16:32:30.000000000 +0100 +++ new/config/s390x/vanilla 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/s390 2.6.37-rc5 Kernel Configuration +# Linux/s390 2.6.37-rc6 Kernel Configuration # CONFIG_SCHED_MC=y CONFIG_MMU=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/sparc64/default new/config/sparc64/default --- old/config/sparc64/default 2010-12-07 16:32:30.000000000 +0100 +++ new/config/sparc64/default 2010-12-27 23:10:04.000000000 +0100 @@ -4801,3 +4801,4 @@ CONFIG_LEDS_LP5523=m # CONFIG_SECURITY_DMESG_RESTRICT is not set # CONFIG_SCHED_AUTOGROUP is not set +CONFIG_KEYBOARD_GPIO_POLLED=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/sparc64/net new/config/sparc64/net --- old/config/sparc64/net 2010-12-07 16:32:30.000000000 +0100 +++ new/config/sparc64/net 2010-12-27 23:10:04.000000000 +0100 @@ -2021,3 +2021,4 @@ CONFIG_LEDS_LP5523=m # CONFIG_SECURITY_DMESG_RESTRICT is not set # CONFIG_SCHED_AUTOGROUP is not set +CONFIG_KEYBOARD_GPIO_POLLED=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2010-12-07 16:32:30.000000000 +0100 +++ new/config/x86_64/debug 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.37-rc5 Kernel Configuration +# Linux/x86_64 2.6.37-rc7 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2512,6 +2512,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2010-12-07 16:32:30.000000000 +0100 +++ new/config/x86_64/default 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.37-rc5 Kernel Configuration +# Linux/x86_64 2.6.37-rc7 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2503,6 +2503,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop --- old/config/x86_64/desktop 2010-12-07 16:32:30.000000000 +0100 +++ new/config/x86_64/desktop 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.37-rc5 Kernel Configuration +# Linux/x86_64 2.6.37-rc7 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2501,6 +2501,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/ec2 new/config/x86_64/ec2 --- old/config/x86_64/ec2 2010-12-07 16:32:30.000000000 +0100 +++ new/config/x86_64/ec2 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.37-rc5 Kernel Configuration +# Linux/x86_64 2.6.37-rc7 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/trace new/config/x86_64/trace --- old/config/x86_64/trace 2010-12-07 16:32:30.000000000 +0100 +++ new/config/x86_64/trace 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.37-rc5 Kernel Configuration +# Linux/x86_64 2.6.37-rc7 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2503,6 +2503,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/vanilla new/config/x86_64/vanilla --- old/config/x86_64/vanilla 2010-12-07 16:32:30.000000000 +0100 +++ new/config/x86_64/vanilla 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.37-rc5 Kernel Configuration +# Linux/x86_64 2.6.37-rc6 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2483,6 +2483,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2010-12-07 16:32:30.000000000 +0100 +++ new/config/x86_64/xen 2010-12-27 23:10:04.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.37-rc5 Kernel Configuration +# Linux/x86_64 2.6.37-rc7 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2367,6 +2367,7 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_TCA6416=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m @@ -4396,7 +4397,7 @@ CONFIG_XEN_NETDEV_BACKEND=m CONFIG_XEN_NETDEV_TX_SHIFT=10 # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set -CONFIG_XEN_NETDEV_LOOPBACK=m +# CONFIG_XEN_NETDEV_LOOPBACK is not set CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_XEN_PCIDEV_BACKEND_VPCI=y # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set @@ -4422,11 +4423,11 @@ # CONFIG_XEN_COMPAT_030004_AND_LATER is not set # CONFIG_XEN_COMPAT_030100_AND_LATER is not set # CONFIG_XEN_COMPAT_030200_AND_LATER is not set -CONFIG_XEN_COMPAT_030300_AND_LATER=y +# CONFIG_XEN_COMPAT_030300_AND_LATER is not set # CONFIG_XEN_COMPAT_030400_AND_LATER is not set -# CONFIG_XEN_COMPAT_040000_AND_LATER is not set +CONFIG_XEN_COMPAT_040000_AND_LATER=y # CONFIG_XEN_COMPAT_LATEST_ONLY is not set -CONFIG_XEN_COMPAT=0x030300 +CONFIG_XEN_COMPAT=0x040000 CONFIG_XEN_VCPU_INFO_PLACEMENT=y CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_ARCH_HAS_WALK_MEMORY=y ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:22.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:22.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion @SRCVERSION@ -%define patchversion @PATCHVERSION@ +%define kernelrelease @PATCHVERSION@ %define variant @VARIANT@%{nil} %include %_sourcedir/kernel-spec-macros @@ -227,8 +227,14 @@ else cp ../config/%cpu_arch_flavor .config fi + +MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" + +krel=%kernelrelease-%build_flavor +kver=$(make -s kernelversion $MAKE_ARGS) +# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION %build_src_dir/scripts/config \ - --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \ + --set-str CONFIG_LOCALVERSION ${krel#$kver} \ --enable CONFIG_SUSE_KERNEL \ %if 0%{?__debug_package:1} --enable CONFIG_DEBUG_INFO \ @@ -237,7 +243,6 @@ --disable CONFIG_DEBUG_INFO %endif -MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD" if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then yes '' | make oldconfig $MAKE_ARGS else ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:22.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:22.000000000 +0100 @@ -19,7 +19,7 @@ # icecream 0 %define srcversion @SRCVERSION@ -%define patchversion @PATCHVERSION@ +%define kernelrelease @PATCHVERSION@ %define variant @VARIANT@%{nil} %include %_sourcedir/kernel-spec-macros ++++++ kernel-spec-macros ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:23.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:23.000000000 +0100 @@ -11,9 +11,6 @@ %define source_rel %(release=%release; echo ${release%.*}) %endif -%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}") -%define kernelrelease %patchversion-%release_major - %define my_builddir %_builddir/%{name}-%{version} # macro to add the source timestamp to package descriptions ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:26.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:26.000000000 +0100 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:26.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:26.000000000 +0100 @@ -1 +1 @@ -6000 +6144 ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/sched-cgroup-use-exit-hook-to-avoid-use-after-free-crash new/patches.fixes/sched-cgroup-use-exit-hook-to-avoid-use-after-free-crash --- old/patches.fixes/sched-cgroup-use-exit-hook-to-avoid-use-after-free-crash 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/sched-cgroup-use-exit-hook-to-avoid-use-after-free-crash 2010-12-28 07:01:24.000000000 +0100 @@ -0,0 +1,55 @@ +Subject: sched, cgroup: Use exit hook to avoid use-after-free crash +From: Peter Zijlstra <peterz@infradead.org> +Date: Fri, 24 Dec 2010 16:59:13 +0100 +Patch-mainline: Maybe 2.6.37, see discussion at + http://groups.google.com/group/linux.kernel/browse_thread/thread/549060f23106acac/920f6adacc785e4f?lnk=gst&q=Zijlstra#920f6adacc785e4f + +By not notifying the controller of the on-exit move back to +init_css_set, we fail to move the task out of the previous cgroup's +cfs_rq. This leads to an opportunity for a cgroup-destroy to come in and +free the cgroup (there are no active tasks left in it after all) to +which the not-quite dead task is still enqueued. + +Cc: stable@kernel.org +Reported-by: Miklos Vajna <vmiklos@frugalware.org> +Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> +Acked-by: Jeff Mahoney <jeffm@suse.com> +--- + kernel/sched.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +Index: linux-2.6.37.git/kernel/sched.c +=================================================================== +--- linux-2.6.37.git.orig/kernel/sched.c ++++ linux-2.6.37.git/kernel/sched.c +@@ -613,6 +613,9 @@ static inline struct task_group *task_gr + struct task_group *tg; + struct cgroup_subsys_state *css; + ++ if (p->flags & PF_EXITING) ++ return &root_task_group; ++ + css = task_subsys_state_check(p, cpu_cgroup_subsys_id, + lockdep_is_held(&task_rq(p)->lock)); + tg = container_of(css, struct task_group, css); +@@ -9187,6 +9190,12 @@ cpu_cgroup_attach(struct cgroup_subsys * + } + } + ++static void ++cpu_cgroup_exit(struct cgroup_subsys *ss, struct task_struct *task) ++{ ++ sched_move_task(task); ++} ++ + #ifdef CONFIG_FAIR_GROUP_SCHED + static int cpu_shares_write_u64(struct cgroup *cgrp, struct cftype *cftype, + u64 shareval) +@@ -9259,6 +9268,7 @@ struct cgroup_subsys cpu_cgroup_subsys = + .destroy = cpu_cgroup_destroy, + .can_attach = cpu_cgroup_can_attach, + .attach = cpu_cgroup_attach, ++ .exit = cpu_cgroup_exit, + .populate = cpu_cgroup_populate, + .subsys_id = cpu_cgroup_subsys_id, + .early_init = 1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/sched-fix-autogroup-proc-interface-race new/patches.fixes/sched-fix-autogroup-proc-interface-race --- old/patches.fixes/sched-fix-autogroup-proc-interface-race 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/sched-fix-autogroup-proc-interface-race 2010-12-28 07:01:24.000000000 +0100 @@ -0,0 +1,85 @@ +Subject: sched: fix autogroup /proc interface race +From: Mike Galbraith <efault@gmx.de> +Date: Tue Dec 28 06:20:05 CET 2010 +Patch-mainline: submitted/queued +References: + +sched: autogroup, fix proc interface race + +Oleg pointed out that the /proc interface kref_get() useage may race with +the final put during autogroup_move_group(). A signal->autogroup assignment +may be in flight when the /proc interface dereference, leaving them taking +a reference to an already dead group. + +Acked-by: Mike Galbraith <mgalbraith@suse.de> +Reported-by: Oleg Nesterov <oleg@redhat.com> +Signed-off-by: Mike Galbraith <efault@gmx.de> + +--- + kernel/sched_autogroup.c | 25 +++++++++++++++++-------- + 1 file changed, 17 insertions(+), 8 deletions(-) + +Index: linux-2.6.36-master/kernel/sched_autogroup.c +=================================================================== +--- linux-2.6.36-master.orig/kernel/sched_autogroup.c ++++ linux-2.6.36-master/kernel/sched_autogroup.c +@@ -41,6 +41,20 @@ static inline struct autogroup *autogrou + return ag; + } + ++static inline struct autogroup *autogroup_task_get(struct task_struct *p) ++{ ++ struct autogroup *ag; ++ unsigned long flags; ++ ++ if (!lock_task_sighand(p, &flags)) ++ return autogroup_kref_get(&autogroup_default); ++ ++ ag = autogroup_kref_get(p->signal->autogroup); ++ unlock_task_sighand(p, &flags); ++ ++ return ag; ++} ++ + static inline struct autogroup *autogroup_create(void) + { + struct autogroup *ag = kzalloc(sizeof(*ag), GFP_KERNEL); +@@ -149,11 +163,7 @@ EXPORT_SYMBOL(sched_autogroup_detach); + + void sched_autogroup_fork(struct signal_struct *sig) + { +- struct task_struct *p = current; +- +- spin_lock_irq(&p->sighand->siglock); +- sig->autogroup = autogroup_kref_get(p->signal->autogroup); +- spin_unlock_irq(&p->sighand->siglock); ++ sig->autogroup = autogroup_task_get(current); + } + + void sched_autogroup_exit(struct signal_struct *sig) +@@ -172,7 +182,6 @@ __setup("noautogroup", setup_autogroup); + + #ifdef CONFIG_PROC_FS + +-/* Called with siglock held. */ + int proc_sched_autogroup_set_nice(struct task_struct *p, int *nice) + { + static unsigned long next = INITIAL_JIFFIES; +@@ -194,7 +203,7 @@ int proc_sched_autogroup_set_nice(struct + return -EAGAIN; + + next = HZ / 10 + jiffies; +- ag = autogroup_kref_get(p->signal->autogroup); ++ ag = autogroup_task_get(p); + + down_write(&ag->lock); + err = sched_group_set_shares(ag->tg, prio_to_weight[*nice + 20]); +@@ -209,7 +218,7 @@ int proc_sched_autogroup_set_nice(struct + + void proc_sched_autogroup_show_task(struct task_struct *p, struct seq_file *m) + { +- struct autogroup *ag = autogroup_kref_get(p->signal->autogroup); ++ struct autogroup *ag = autogroup_task_get(p); + + down_read(&ag->lock); + seq_printf(m, "/autogroup-%ld nice %d\n", ag->id, ag->nice); ++++++ patches.kernel.org.tar.bz2 ++++++ kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: char 11, line 1 ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/SoN-23-mm-swapfile.patch new/patches.suse/SoN-23-mm-swapfile.patch --- old/patches.suse/SoN-23-mm-swapfile.patch 2010-12-07 09:40:37.000000000 +0100 +++ new/patches.suse/SoN-23-mm-swapfile.patch 2010-12-16 22:31:42.000000000 +0100 @@ -48,7 +48,7 @@ --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking -@@ -176,6 +176,10 @@ prototypes: +@@ -177,6 +177,10 @@ prototypes: int (*direct_IO)(int, struct kiocb *, const struct iovec *iov, loff_t offset, unsigned long nr_segs); int (*launder_page) (struct page *); @@ -58,9 +58,9 @@ + int (*swap_in) (struct file *, struct page *); locking rules: - All except set_page_dirty may block -@@ -195,6 +199,10 @@ invalidatepage: no yes - releasepage: no yes + All except set_page_dirty and freepage may block +@@ -197,6 +201,10 @@ releasepage: no yes + freepage: no yes direct_IO: no launder_page: no yes +swapon no @@ -70,7 +70,7 @@ ->write_begin(), ->write_end(), ->sync_page() and ->readpage() may be called from the request handler (/dev/loop). -@@ -294,6 +302,20 @@ cleaned, or an error value if not. Note +@@ -299,6 +307,20 @@ cleaned, or an error value if not. Note getting mapped back in and redirtied, it needs to be kept locked across the entire operation. @@ -93,7 +93,7 @@ of contention. Normally they are calling library functions (in fs/buffer.c) --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt -@@ -542,6 +542,11 @@ struct address_space_operations { +@@ -543,6 +543,11 @@ struct address_space_operations { int (*migratepage) (struct page *, struct page *); int (*launder_page) (struct page *); int (*error_remove_page) (struct mapping *mapping, struct page *page); @@ -105,7 +105,7 @@ }; writepage: called by the VM to write a dirty page to backing store. -@@ -706,6 +711,19 @@ struct address_space_operations { +@@ -712,6 +717,19 @@ struct address_space_operations { unless you have them locked or reference counts increased. @@ -127,7 +127,7 @@ --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h -@@ -333,6 +333,7 @@ static inline int inode_has_buffers(stru +@@ -330,6 +330,7 @@ static inline int inode_has_buffers(stru static inline void invalidate_inode_buffers(struct inode *inode) {} static inline int remove_inode_buffers(struct inode *inode) { return 1; } static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; } @@ -137,7 +137,7 @@ #endif /* _LINUX_BUFFER_HEAD_H */ --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -621,6 +621,15 @@ struct address_space_operations { +@@ -622,6 +622,15 @@ struct address_space_operations { int (*is_partially_uptodate) (struct page *, read_descriptor_t *, unsigned long); int (*error_remove_page)(struct address_space *, struct page *); @@ -155,7 +155,7 @@ /* --- a/include/linux/swap.h +++ b/include/linux/swap.h -@@ -147,6 +147,7 @@ enum { +@@ -148,6 +148,7 @@ enum { SWP_SOLIDSTATE = (1 << 4), /* blkdev seeks are cheap */ SWP_CONTINUED = (1 << 5), /* swap_map has count continuation */ SWP_BLKDEV = (1 << 6), /* its a block device */ @@ -163,7 +163,7 @@ /* add others here before... */ SWP_SCANNING = (1 << 8), /* refcount in scan_swap_map */ }; -@@ -292,6 +293,8 @@ extern void swap_unplug_io_fn(struct bac +@@ -303,6 +304,8 @@ extern void swap_unplug_io_fn(struct bac /* linux/mm/page_io.c */ extern int swap_readpage(struct page *); extern int swap_writepage(struct page *page, struct writeback_control *wbc); @@ -172,7 +172,7 @@ extern void end_swap_bio_read(struct bio *bio, int err); /* linux/mm/swap_state.c */ -@@ -327,6 +330,7 @@ extern int swap_type_of(dev_t, sector_t, +@@ -339,6 +342,7 @@ extern int swap_type_of(dev_t, sector_t, extern unsigned int count_swap_pages(int, int); extern sector_t map_swap_page(struct page *, struct block_device **); extern sector_t swapdev_block(int, pgoff_t); @@ -282,7 +282,7 @@ --- a/mm/swapfile.c +++ b/mm/swapfile.c -@@ -1405,6 +1405,14 @@ static void destroy_swap_extents(struct +@@ -1373,6 +1373,14 @@ static void destroy_swap_extents(struct list_del(&se->list); kfree(se); } @@ -297,7 +297,7 @@ } /* -@@ -1486,7 +1494,9 @@ add_swap_extent(struct swap_info_struct +@@ -1454,7 +1462,9 @@ add_swap_extent(struct swap_info_struct */ static int setup_swap_extents(struct swap_info_struct *sis, sector_t *span) { @@ -308,7 +308,7 @@ unsigned blocks_per_page; unsigned long page_no; unsigned blkbits; -@@ -1497,13 +1507,22 @@ static int setup_swap_extents(struct swa +@@ -1465,13 +1475,22 @@ static int setup_swap_extents(struct swa int nr_extents = 0; int ret; @@ -332,7 +332,7 @@ blkbits = inode->i_blkbits; blocks_per_page = PAGE_SIZE >> blkbits; -@@ -2280,6 +2299,13 @@ int swapcache_prepare(swp_entry_t entry) +@@ -2290,6 +2309,13 @@ int swapcache_prepare(swp_entry_t entry) return __swap_duplicate(entry, SWAP_HAS_CACHE); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/SoN-26-nfs-swapper.patch new/patches.suse/SoN-26-nfs-swapper.patch --- old/patches.suse/SoN-26-nfs-swapper.patch 2010-12-07 09:40:37.000000000 +0100 +++ new/patches.suse/SoN-26-nfs-swapper.patch 2010-12-16 22:31:42.000000000 +0100 @@ -19,12 +19,12 @@ Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> --- fs/nfs/inode.c | 6 ++++ - fs/nfs/write.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++---------- - 2 files changed, 65 insertions(+), 12 deletions(-) + fs/nfs/write.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++----------- + 2 files changed, 67 insertions(+), 14 deletions(-) --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c -@@ -865,6 +865,12 @@ int nfs_revalidate_mapping(struct inode +@@ -868,6 +868,12 @@ int nfs_revalidate_mapping(struct inode struct nfs_inode *nfsi = NFS_I(inode); int ret = 0; @@ -39,7 +39,7 @@ || NFS_STALE(inode)) { --- a/fs/nfs/write.c +++ b/fs/nfs/write.c -@@ -109,25 +109,64 @@ static void nfs_context_set_write_error( +@@ -107,25 +107,64 @@ static void nfs_context_set_write_error( set_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags); } @@ -110,7 +110,7 @@ spin_unlock(&inode->i_lock); return req; } -@@ -230,7 +269,7 @@ static struct nfs_page *nfs_find_and_loc +@@ -228,7 +267,7 @@ static struct nfs_page *nfs_find_and_loc spin_lock(&inode->i_lock); for (;;) { @@ -119,10 +119,11 @@ if (req == NULL) break; if (nfs_set_page_tag_locked(req)) -@@ -395,8 +434,14 @@ static int nfs_inode_add_request(struct +@@ -391,9 +430,15 @@ static int nfs_inode_add_request(struct if (nfs_have_delegation(inode, FMODE_WRITE)) nfsi->change_attr++; } +- set_bit(PG_MAPPED, &req->wb_flags); - SetPagePrivate(req->wb_page); - set_page_private(req->wb_page, (unsigned long)req); + /* @@ -130,26 +131,29 @@ + * with invalidate/truncate. + */ + if (likely(!PageSwapCache(req->wb_page))) { ++ set_bit(PG_MAPPED, &req->wb_flags); + SetPagePrivate(req->wb_page); + set_page_private(req->wb_page, (unsigned long)req); + } nfsi->npages++; kref_get(&req->wb_kref); radix_tree_tag_set(&nfsi->nfs_page_tree, req->wb_index, -@@ -418,8 +463,10 @@ static void nfs_inode_remove_request(str +@@ -415,9 +460,11 @@ static void nfs_inode_remove_request(str BUG_ON (!NFS_WBACK_BUSY(req)); spin_lock(&inode->i_lock); - set_page_private(req->wb_page, 0); - ClearPagePrivate(req->wb_page); +- clear_bit(PG_MAPPED, &req->wb_flags); + if (likely(!PageSwapCache(req->wb_page))) { + set_page_private(req->wb_page, 0); + ClearPagePrivate(req->wb_page); ++ clear_bit(PG_MAPPED, &req->wb_flags); + } radix_tree_delete(&nfsi->nfs_page_tree, req->wb_index); nfsi->npages--; if (!nfsi->npages) { -@@ -588,7 +635,7 @@ static struct nfs_page *nfs_try_to_updat +@@ -585,7 +632,7 @@ static struct nfs_page *nfs_try_to_updat spin_lock(&inode->i_lock); for (;;) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/bootsplash-scaler new/patches.suse/bootsplash-scaler --- old/patches.suse/bootsplash-scaler 2010-12-07 09:40:37.000000000 +0100 +++ new/patches.suse/bootsplash-scaler 2010-12-16 22:31:42.000000000 +0100 @@ -19,12 +19,12 @@ Acked-by: Michal Marek <mmarek@suse.cz> --- - drivers/video/bootsplash/bootsplash.c | 858 +++++++++++++++++++++++++++++++--- + drivers/video/bootsplash/bootsplash.c | 855 +++++++++++++++++++++++++++++++--- drivers/video/bootsplash/decode-jpg.c | 4 drivers/video/bootsplash/render.c | 16 drivers/video/console/fbcon.h | 11 include/linux/fb.h | 3 - 5 files changed, 810 insertions(+), 82 deletions(-) + 5 files changed, 807 insertions(+), 82 deletions(-) --- a/drivers/video/bootsplash/bootsplash.c +++ b/drivers/video/bootsplash/bootsplash.c @@ -36,7 +36,7 @@ * * Ideas & SuSE screen work by Ken Wimer, <wimer@suse.de> * -@@ -55,7 +56,9 @@ static unsigned char *jpg_errors[] = { +@@ -55,7 +56,9 @@ "wrong marker", "no EOI", "bad tables", @@ -47,7 +47,7 @@ }; static struct jpeg_decdata *decdata = 0; /* private decoder data */ -@@ -64,7 +67,9 @@ static int splash_registered = 0; +@@ -64,7 +67,9 @@ static int splash_usesilent = 0; /* shall we display the silentjpeg? */ int splash_default = 0xf01; @@ -58,7 +58,7 @@ static int __init splash_setup(char *options) { -@@ -120,7 +125,8 @@ static int boxextract(unsigned char *buf +@@ -120,7 +125,8 @@ return 12; } @@ -68,7 +68,7 @@ { int x, y, p, doblend, r, g, b, a, add; unsigned int i = 0; -@@ -245,7 +251,7 @@ static void boxit(unsigned char *pic, in +@@ -245,7 +251,7 @@ } add = (xs & 1); add ^= (add ^ y) & 1 ? 1 : 3; /* 2x2 ordered dithering */ @@ -77,7 +77,7 @@ for (x = xs; x <= xe; x++) { if (!(sti & 0x80000000)) { sti <<= 1; -@@ -310,19 +316,172 @@ static void boxit(unsigned char *pic, in +@@ -310,19 +316,172 @@ } } @@ -253,7 +253,7 @@ if ((err = jpeg_decode(jpeg, mem, ((width + 15) & ~15), ((height + 15) & ~15), depth, decdata))) printk(KERN_INFO "bootsplash: error while decompressing picture: %s (%d)\n",jpg_errors[err - 1], err); vfree(mem); -@@ -337,6 +496,7 @@ static void splash_free(struct vc_data * +@@ -337,6 +496,7 @@ for (sd = vc->vc_splash_data; sd; sd = next) { next = sd->next; vfree(sd->splash_sboxes); @@ -261,7 +261,7 @@ vfree(sd); } vc->vc_splash_data = 0; -@@ -432,6 +592,11 @@ static void splash_pivot_current(struct +@@ -432,6 +592,11 @@ state = sd->splash_state; percent = sd->splash_percent; silent = sd->splash_dosilent; @@ -273,7 +273,7 @@ for (; sd->next; sd = sd->next) { if (sd->next == new) { sd->next = new->next; -@@ -441,6 +606,17 @@ static void splash_pivot_current(struct +@@ -441,6 +606,17 @@ new->splash_state = state; new->splash_percent = percent; new->splash_dosilent = silent; @@ -291,7 +291,7 @@ return; } } -@@ -459,7 +635,7 @@ static int splash_getraw(unsigned char * +@@ -459,7 +635,7 @@ int palcnt; int i, len; const int *offsets; @@ -300,7 +300,7 @@ struct fb_info *info; struct splash_data *sd; struct splash_data *splash_found = NULL; -@@ -489,7 +665,16 @@ static int splash_getraw(unsigned char * +@@ -489,7 +665,16 @@ vc_allocate(unit); } vc = vc_cons[unit].d; @@ -317,17 +317,7 @@ width = info->var.xres; height = info->var.yres; splash_size = splash_geti(ndata, SPLASH_OFF_SIZE); -@@ -539,6 +724,9 @@ static int splash_getraw(unsigned char * - } - if (update) - *update = up; -+ vfree(sd->splash_pic); -+ sd->splash_pic = NULL; -+ sd->splash_pic_size = 0; - } - return unit; - } -@@ -579,6 +767,12 @@ static int splash_getraw(unsigned char * +@@ -579,6 +764,12 @@ memset(sd, 0, sizeof(*sd)); jpeg_get_size(ndata + len + boxcnt * 12 + palcnt, &sd->splash_width, &sd->splash_height); @@ -340,7 +330,7 @@ if (silentsize) { sd->splash_silentjpeg = vmalloc(silentsize); if (sd->splash_silentjpeg) { -@@ -596,6 +790,8 @@ static int splash_getraw(unsigned char * +@@ -596,6 +787,8 @@ sd->splash_text_yo = splash_gets(ndata, SPLASH_OFF_YO); sd->splash_text_wi = splash_gets(ndata, SPLASH_OFF_WI); sd->splash_text_he = splash_gets(ndata, SPLASH_OFF_HE); @@ -349,7 +339,7 @@ sd->splash_percent = oldpercent == -1 ? splash_gets(ndata, SPLASH_OFF_PERCENT) : oldpercent; if (version == 1) { sd->splash_text_xo *= 8; -@@ -606,6 +802,9 @@ static int splash_getraw(unsigned char * +@@ -606,6 +799,9 @@ sd->splash_fg_color = (splash_default >> 4) & 0x0f; sd->splash_state = splash_default & 1; } @@ -359,7 +349,7 @@ /* fake penguin box for older formats */ if (version == 1) boxcnt = splash_mkpenguin(sd, sd->splash_text_xo + 10, sd->splash_text_yo + 10, sd->splash_text_wi - 20, sd->splash_text_he - 20, 0xf0, 0xf0, 0xf0); -@@ -627,15 +826,6 @@ static int splash_getraw(unsigned char * +@@ -627,15 +823,6 @@ ndata += len + splash_size - 1; continue; } @@ -375,7 +365,7 @@ printk(KERN_INFO "bootsplash: ...found (%dx%d, %d bytes, v%d).\n", width, height, splash_size, version); if (version == 1) { printk(KERN_WARNING "bootsplash: Using deprecated v1 header. Updating your splash utility recommended.\n"); -@@ -649,6 +839,16 @@ static int splash_getraw(unsigned char * +@@ -649,6 +836,16 @@ if (splash_found) { splash_pivot_current(vc, splash_found); return unit_found; @@ -392,7 +382,7 @@ } printk(KERN_ERR "bootsplash: ...no good signature found.\n"); -@@ -715,27 +915,71 @@ int splash_verbose(void) +@@ -715,27 +912,71 @@ return 0; } @@ -473,7 +463,7 @@ return -1; } -@@ -743,13 +987,14 @@ int splash_prepare(struct vc_data *vc, s +@@ -743,13 +984,14 @@ { int err; int width, height, depth, octpp, size, sbytes; @@ -489,7 +479,7 @@ return -1; } -@@ -759,52 +1004,62 @@ int splash_prepare(struct vc_data *vc, s +@@ -759,52 +1001,62 @@ octpp = (depth + 1) >> 3; if (depth == 24 || depth < 15) { /* Other targets might need fixing */ @@ -568,7 +558,7 @@ info->var.yres, info->var.xres, info->fix.line_length, sbytes, -@@ -813,27 +1068,43 @@ int splash_prepare(struct vc_data *vc, s +@@ -813,27 +1065,43 @@ } else vc->vc_splash_data->splash_dosilent = 0; @@ -624,7 +614,7 @@ return -5; } return 0; -@@ -856,12 +1127,16 @@ static struct proc_dir_entry *proc_splas +@@ -856,12 +1124,16 @@ static int splash_recolor(struct vc_data *vc) { @@ -642,7 +632,7 @@ if (fg_console == vc->vc_num) { update_region(vc, vc->vc_origin + vc->vc_size_row * vc->vc_top, -@@ -884,10 +1159,6 @@ static int splash_status(struct vc_data +@@ -884,10 +1156,6 @@ splash_prepare(vc, info); if (vc->vc_splash_data && vc->vc_splash_data->splash_state) { if (info->splash_data) { @@ -653,7 +643,7 @@ if (fg_console == vc->vc_num) { update_region(vc, vc->vc_origin + vc->vc_size_row * vc->vc_top, -@@ -895,11 +1166,9 @@ static int splash_status(struct vc_data +@@ -895,11 +1163,9 @@ splash_clear_margins(vc, info, 0); } } @@ -668,7 +658,7 @@ return 0; } -@@ -956,10 +1225,9 @@ void splash_set_percent(struct vc_data * +@@ -956,10 +1222,9 @@ || pe < oldpe) { if (splash_hasinter(vc->vc_splash_data->splash_boxes, vc->vc_splash_data->splash_boxcount)) { @@ -682,7 +672,7 @@ } else { int octpp = (info->var.bits_per_pixel + 1) >> 3; if (info->splash_data) { -@@ -970,6 +1238,8 @@ void splash_set_percent(struct vc_data * +@@ -970,6 +1235,8 @@ info->splash_data->splash_sboxes, info->splash_data->splash_sboxcount, info->splash_data->splash_percent, @@ -691,7 +681,7 @@ 1, octpp); #if 0 -@@ -979,6 +1249,8 @@ void splash_set_percent(struct vc_data * +@@ -979,6 +1246,8 @@ info->splash_data->splash_boxes, info->splash_data->splash_boxcount, info->splash_data->splash_percent, @@ -700,7 +690,7 @@ 1, octpp); #endif -@@ -1100,6 +1372,8 @@ static int splash_write_proc(struct file +@@ -1100,6 +1369,8 @@ info->splash_data->splash_sboxes, info->splash_data->splash_sboxcount, info->splash_data->splash_percent, @@ -709,7 +699,7 @@ 1, octpp); } else if ((up & 1) != 0) { -@@ -1108,6 +1382,8 @@ static int splash_write_proc(struct file +@@ -1108,6 +1379,8 @@ info->splash_data->splash_boxes, info->splash_data->splash_boxcount, info->splash_data->splash_percent, @@ -718,7 +708,7 @@ 1, octpp); } -@@ -1226,3 +1502,447 @@ void splash_init(void) +@@ -1226,3 +1499,447 @@ return; } @@ -1168,7 +1158,7 @@ +} --- a/drivers/video/bootsplash/decode-jpg.c +++ b/drivers/video/bootsplash/decode-jpg.c -@@ -888,9 +888,9 @@ PREC q[][64]; +@@ -888,9 +888,9 @@ #define PIC_32(yin, xin, p, xout) \ ( \ y = outy[(yin) * 8 + xin], \ @@ -1182,7 +1172,7 @@ --- a/drivers/video/bootsplash/render.c +++ b/drivers/video/bootsplash/render.c -@@ -45,7 +45,7 @@ void splash_putcs(struct vc_data *vc, st +@@ -45,7 +45,7 @@ transparent = sd->splash_color == bg_color; xpos = xpos * vc->vc_font.width + sd->splash_text_xo; ypos = ypos * vc->vc_font.height + sd->splash_text_yo; @@ -1191,7 +1181,7 @@ dst.ub = (u8 *)(info->screen_base + ypos * info->fix.line_length + xpos * octpp); fgx = ((u32 *)info->pseudo_palette)[fg_color]; if (transparent && sd->splash_color == 15) { -@@ -109,10 +109,10 @@ void splash_putcs(struct vc_data *vc, st +@@ -109,10 +109,10 @@ } } dst.ub += info->fix.line_length - vc->vc_font.width * octpp; @@ -1204,7 +1194,7 @@ } } -@@ -136,7 +136,7 @@ static void splash_renderc(struct fb_inf +@@ -136,7 +136,7 @@ sd = info->splash_data; transparent = sd->splash_color == bg_color; @@ -1213,7 +1203,7 @@ dst.ub = (u8*)(info->screen_base + ypos * info->fix.line_length + xpos * octpp); fgx = ((u32 *)info->pseudo_palette)[fg_color]; if (transparent && sd->splash_color == 15) { -@@ -197,7 +197,7 @@ static void splash_renderc(struct fb_inf +@@ -197,7 +197,7 @@ } } dst.ub += info->fix.line_length - width * octpp; @@ -1222,7 +1212,7 @@ } } -@@ -255,10 +255,11 @@ static void splashset(u8 *dst, int heigh +@@ -255,10 +255,11 @@ static void splashfill(struct fb_info *info, int sy, int sx, int height, int width) { int octpp = (info->var.bits_per_pixel + 1) >> 3; @@ -1236,7 +1226,7 @@ octpp); } -@@ -442,6 +443,7 @@ void splash_bmove_redraw(struct vc_data +@@ -442,6 +443,7 @@ void splash_blank(struct vc_data *vc, struct fb_info *info, int blank) { SPLASH_DEBUG(); @@ -1246,7 +1236,7 @@ info->var.yres, info->var.xres, --- a/drivers/video/console/fbcon.h +++ b/drivers/video/console/fbcon.h -@@ -34,8 +34,10 @@ struct splash_data { +@@ -34,8 +34,10 @@ int splash_height; /* height of image */ int splash_text_xo; /* text area origin */ int splash_text_yo; @@ -1258,7 +1248,7 @@ int splash_showtext; /* silent/verbose mode */ int splash_boxcount; int splash_percent; -@@ -45,12 +47,19 @@ struct splash_data { +@@ -45,12 +47,19 @@ unsigned char *splash_boxes; unsigned char *splash_jpeg; /* jpeg */ unsigned char *splash_palette; /* palette for 8-bit */ @@ -1280,7 +1270,7 @@ --- a/include/linux/fb.h +++ b/include/linux/fb.h -@@ -877,9 +877,6 @@ struct fb_info { +@@ -877,9 +877,6 @@ void *par; #ifdef CONFIG_BOOTSPLASH struct splash_data *splash_data; ++++++ patches.xen.tar.bz2 ++++++ ++++ 25728 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:28.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:28.000000000 +0100 @@ -32,6 +32,8 @@ patches.kernel.org/patch-2.6.37-rc2-rc3 patches.kernel.org/patch-2.6.37-rc3-rc4 patches.kernel.org/patch-2.6.37-rc4-rc5 + patches.kernel.org/patch-2.6.37-rc5-rc6 + patches.kernel.org/patch-2.6.37-rc6-rc7 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -93,6 +95,14 @@ +needs_update-33 patches.suse/sched-revert-latency-defaults patches.suse/sched-automated-per-session-task-groups + patches.fixes/sched-fix-autogroup-proc-interface-race + + # This is not the correct fix. The check can be done at + # cgroup exit instead with less of an impact on performance. + # Once that patch is released, then this one should go away. + # I'm accepting it for now because it fixes the crashes that + # many of us have been seeing with 2.6.37-rcX. -jeffm + patches.fixes/sched-cgroup-use-exit-hook-to-avoid-use-after-free-crash ######################################################## # Architecture-specific patches. These used to be all @@ -777,7 +787,9 @@ patches.xen/xen3-patch-2.6.35 patches.xen/xen3-patch-2.6.36 patches.xen/xen3-patch-2.6.37-rc3 - patches.xen/xen3-patch-2.6.37-rc3-git1 + patches.xen/xen3-patch-2.6.37-rc3-rc4 + patches.xen/xen3-patch-2.6.37-rc4-rc5 + patches.xen/xen3-res-0002-Revert-x86-allocate-space-within-a-region-top-down.patch patches.xen/xen3-seccomp-disable-tsc-option patches.xen/xen3-x86-mcp51-no-dac patches.xen/xen3-x86-mark_rodata_rw.patch ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:28.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:28.000000000 +0100 @@ -1,3 +1,3 @@ -2010-12-09 16:04:57 +0100 -GIT Revision: 149d22bc651b3083297e17b92842c6d7affba574 +2010-12-28 07:01:24 +0100 +GIT Revision: fd7019cdfca45c51ee47e59d2d4c6cb703074e51 GIT Branch: master ++++++ supported.conf ++++++ --- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:29.000000000 +0100 +++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:29.000000000 +0100 @@ -2041,6 +2041,7 @@ - kernel/drivers/watchdog/wdrtas # watchdog for RTAS on pSeries JS20 +isa kernel/drivers/watchdog/wdt kernel/drivers/watchdog/wdt_pci # Driver for the ICS PCI-WDT500/501 watchdog cards + kernel/drivers/watchdog/xen_wdt # Xen pv watchdog driver kernel/drivers/xen/blkback/blkbk # Xen block device backend kernel/drivers/xen/blkback/blkback-pagemap +base kernel/drivers/xen/blkfront/xenblk # Xen block device frontend @@ -2050,17 +2051,17 @@ kernel/drivers/xen/evtchn kernel/drivers/xen/gntdev/gntdev kernel/drivers/xen/netback/netbk # Xen network device backend - kernel/drivers/xen/netback/netloop # Xen network loopback device +- kernel/drivers/xen/netback/netloop # Xen network loopback device +base kernel/drivers/xen/netfront/xennet # Xen network device frontend kernel/drivers/xen/pciback/pciback # Xen PCI device backend -- kernel/drivers/xen/scsiback/xen-scsibk -- kernel/drivers/xen/scsifront/xenscsi + kernel/drivers/xen/scsiback/xen-scsibk + kernel/drivers/xen/scsifront/xenscsi +external kernel/drivers/xen/sfc_netback/sfc_netback +external kernel/drivers/xen/sfc_netback/sfc_netfront +external kernel/drivers/xen/sfc_netutil/sfc_netutil kernel/drivers/xen/tpmback/tpmbk # Xen TPM device backend -- kernel/drivers/xen/usbback/usbbk -- kernel/drivers/xen/usbfront/xen-hcd + kernel/drivers/xen/usbback/usbbk + kernel/drivers/xen/usbfront/xen-hcd kernel/drivers/xen/xenbus/xenbus_be # Xen XenBus backend driver support module kernel/fs/9p/9p - kernel/fs/adfs/adfs ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠hilbert.suse.de