Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Sun Apr 25 18:42:31 CEST 2010. -------- --- kernel-source/kernel-debug.changes 2010-04-19 21:26:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2010-04-23 07:00:19.000000000 +0200 @@ -1,0 +2,50 @@ +Thu Apr 22 21:18:11 CEST 2010 - jeffm@suse.com + +- patches.suse/s390-Kerntypes.diff: Fix slab.h vs slab_def.h + include ordering in kerntypes.c + +------------------------------------------------------------------- +Thu Apr 22 09:47:57 CEST 2010 - mmarek@suse.cz + +- rpm/kernel-*.spec.in: Provide %name = %version-%source_rel in + all spec files (bnc#598453). + +------------------------------------------------------------------- +Thu Apr 22 09:32:19 CEST 2010 - tiwai@suse.de + +- Update config files: Fix remaining CONFIG_LEDS_CLASS=m + +------------------------------------------------------------------- +Thu Apr 22 08:24:58 CEST 2010 - tiwai@suse.de + +- patches.drivers/input-Add-LED-support-to-Synaptics-device: + Refresh. Fix dependency with LED class. +- Update config files. + +------------------------------------------------------------------- +Wed Apr 21 16:44:28 CEST 2010 - tiwai@suse.de + +- patches.drivers/input-Add-LED-support-to-Synaptics-device: + input: Add LED support to Synaptics device + (bnc#547370,bnc#582529,bnc#589014). +- patches.drivers/input-Add-support-of-Synaptics-Clickpad-device: + input: Add support of Synaptics Clickpad device + (bnc#547370,bnc#582529,bnc#589014). +- patches.drivers/synaptics-hp-clickpad: Delete. + +------------------------------------------------------------------- +Wed Apr 21 03:01:21 CEST 2010 - jeffm@suse.com + +- Update to 2.6.34-rc5. + - Eliminated 1 patch. + +------------------------------------------------------------------- +Tue Apr 20 00:25:54 CEST 2010 - jack@suse.de + +- patches.fixes/novfs-LFS-initialization: fs: novfs: Initialize + super-block with standard macros. +- patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir: + fs: novfs: Return ENOTEMPTY when tyring to delete a non-empty + folder (bnc#583964). + +------------------------------------------------------------------- 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.PYxDgP/_old 2010-04-25 18:41:21.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:21.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %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.34 -Release: 5 +Release: 6 %if %using_buildservice %else %endif @@ -68,6 +68,7 @@ BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release +Provides: %name = %version-%source_rel %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:21.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:21.000000000 +0200 @@ -17,7 +17,7 @@ # norootforbuild -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %include %_sourcedir/kernel-spec-macros @@ -29,10 +29,11 @@ Group: Documentation/Man AutoReqProv: on Version: 2.6.34 -Release: 5 +Release: 6 %if %using_buildservice %else %endif +Provides: %name = %version-%source_rel Summary: Kernel Documentation BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:21.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:21.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel Version: 2.6.34 -Release: 5 +Release: 6 %if %using_buildservice %else %endif @@ -68,6 +68,7 @@ BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release +Provides: %name = %version-%source_rel %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase ++++++ kernel-net.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:22.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:22.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %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.34 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -68,6 +68,7 @@ BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release +Provides: %name = %version-%source_rel %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:22.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:22.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 2.6.34 -Release: 5 +Release: 6 %if %using_buildservice %else %endif @@ -68,6 +68,7 @@ BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release +Provides: %name = %version-%source_rel %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase kernel-ppc64.spec: same change kernel-ps3.spec: same change kernel-s390.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:22.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:22.000000000 +0200 @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 2.6.33 -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,7 +31,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 2.6.34 -Release: 5 +Release: 6 %if %using_buildservice %else %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:22.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:22.000000000 +0200 @@ -24,7 +24,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.34 -Release: 5 +Release: 6 %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) @@ -53,6 +53,7 @@ Requires: kernel-xen-devel = %version-%source_rel %endif Provides: multiversion(kernel) +Provides: %name = %version-%source_rel Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:22.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:22.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.33 -%define patchversion 2.6.34-rc4 +%define patchversion 2.6.34-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -56,7 +56,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.34 -Release: 5 +Release: 6 %if %using_buildservice %else %endif @@ -68,6 +68,7 @@ BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release +Provides: %name = %version-%source_rel %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase kernel-vanilla.spec: same change kernel-vmi.spec: same change kernel-xen.spec: same change ++++++ 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-04-15 15:13:46.000000000 +0200 +++ new/config/i386/debug 2010-04-22 09:32:45.000000000 +0200 @@ -2558,6 +2558,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -4283,7 +4284,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y # # LED drivers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default --- old/config/i386/default 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/default 2010-04-22 09:32:45.000000000 +0200 @@ -2528,6 +2528,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -4253,7 +4254,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y # # LED drivers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop --- old/config/i386/desktop 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/desktop 2010-04-22 09:32:45.000000000 +0200 @@ -2436,6 +2436,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/pae 2010-04-22 09:32:45.000000000 +0200 @@ -2456,6 +2456,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/trace new/config/i386/trace --- old/config/i386/trace 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/trace 2010-04-22 09:32:45.000000000 +0200 @@ -2456,6 +2456,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vmi new/config/i386/vmi --- old/config/i386/vmi 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/vmi 2010-04-22 09:32:45.000000000 +0200 @@ -2456,6 +2456,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2010-04-15 15:13:46.000000000 +0200 +++ new/config/i386/xen 2010-04-22 09:32:45.000000000 +0200 @@ -2308,6 +2308,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -3955,7 +3956,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y # # LED drivers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ia64/debug 2010-04-22 09:32:45.000000000 +0200 @@ -2080,6 +2080,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ia64/default 2010-04-22 09:32:45.000000000 +0200 @@ -2066,6 +2066,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/trace new/config/ia64/trace --- old/config/ia64/trace 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ia64/trace 2010-04-22 09:32:45.000000000 +0200 @@ -2069,6 +2069,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default --- old/config/ppc/default 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ppc/default 2010-04-22 09:32:45.000000000 +0200 @@ -1940,6 +1940,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/ppc64 new/config/ppc/ppc64 --- old/config/ppc/ppc64 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ppc/ppc64 2010-04-22 09:32:45.000000000 +0200 @@ -1929,6 +1929,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/debug new/config/ppc64/debug --- old/config/ppc64/debug 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ppc64/debug 2010-04-22 09:32:45.000000000 +0200 @@ -1949,6 +1949,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default --- old/config/ppc64/default 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ppc64/default 2010-04-22 09:32:45.000000000 +0200 @@ -1938,6 +1938,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/ppc64 new/config/ppc64/ppc64 --- old/config/ppc64/ppc64 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ppc64/ppc64 2010-04-22 09:32:45.000000000 +0200 @@ -1987,6 +1987,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/trace new/config/ppc64/trace --- old/config/ppc64/trace 2010-04-15 15:13:46.000000000 +0200 +++ new/config/ppc64/trace 2010-04-22 09:32:45.000000000 +0200 @@ -1987,6 +1987,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/vanilla new/config/s390x/vanilla --- old/config/s390x/vanilla 2010-04-15 15:13:46.000000000 +0200 +++ new/config/s390x/vanilla 2010-04-22 09:32:45.000000000 +0200 @@ -1032,7 +1032,6 @@ # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m -# CONFIG_MAX63XX_WATCHDOG is not set CONFIG_ZVM_WATCHDOG=m # CONFIG_REGULATOR is not set CONFIG_MEMSTICK=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/sparc64/default new/config/sparc64/default --- old/config/sparc64/default 2010-04-15 15:13:46.000000000 +0200 +++ new/config/sparc64/default 2010-04-22 09:32:45.000000000 +0200 @@ -2079,6 +2079,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y @@ -4162,6 +4163,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -4198,6 +4200,9 @@ # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y @@ -4233,7 +4238,6 @@ # CONFIG_KGDB_TESTS is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_DCFLUSH is not set -# CONFIG_STACK_DEBUG is not set # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/sparc64/net new/config/sparc64/net --- old/config/sparc64/net 2010-04-15 15:13:46.000000000 +0200 +++ new/config/sparc64/net 2010-04-22 09:32:45.000000000 +0200 @@ -860,6 +860,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_SYNAPTICS_LED is not set CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y @@ -1598,6 +1599,9 @@ # CONFIG_LATENCYTOP is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y @@ -1607,7 +1611,6 @@ # CONFIG_DMA_API_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_STACK_DEBUG is not set # # Security options 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-04-15 15:13:46.000000000 +0200 +++ new/config/x86_64/debug 2010-04-22 09:32:45.000000000 +0200 @@ -2415,6 +2415,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -4049,7 +4050,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y # # LED drivers 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-04-15 15:13:46.000000000 +0200 +++ new/config/x86_64/default 2010-04-22 09:32:45.000000000 +0200 @@ -2406,6 +2406,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y 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-04-15 15:13:46.000000000 +0200 +++ new/config/x86_64/desktop 2010-04-22 09:32:45.000000000 +0200 @@ -2386,6 +2386,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y 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-04-15 15:13:46.000000000 +0200 +++ new/config/x86_64/trace 2010-04-22 09:32:45.000000000 +0200 @@ -2406,6 +2406,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y 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-04-15 15:13:46.000000000 +0200 +++ new/config/x86_64/xen 2010-04-22 09:32:45.000000000 +0200 @@ -2278,6 +2278,7 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_LED=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -3903,7 +3904,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS=y # # LED drivers ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:23.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:23.000000000 +0200 @@ -69,6 +69,7 @@ BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release +Provides: %name = %version-%source_rel %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase ++++++ kernel-docs.spec.in ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:23.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:23.000000000 +0200 @@ -34,6 +34,7 @@ %else Release: @RELEASE_PREFIX@0 %endif +Provides: %name = %version-%source_rel Summary: Kernel Documentation BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kernel-syms.spec.in ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:23.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:23.000000000 +0200 @@ -37,6 +37,7 @@ BuildRequires: coreutils @REQUIRES@ Provides: multiversion(kernel) +Provides: %name = %version-%source_rel Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:24.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:24.000000000 +0200 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:24.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:24.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ patches.drivers.tar.bz2 ++++++ 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 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/input-Add-LED-support-to-Synaptics-device 2010-04-22 08:25:27.000000000 +0200 @@ -0,0 +1,218 @@ +From: Takashi Iwai <tiwai@suse.de> +Subject: [PATCH 2/2] input: Add LED support to Synaptics device +Patch-mainline: Submitted +References: bnc#547370,bnc#582529,bnc#589014 + +The new Synaptics devices have an LED on the top-left corner. +This patch adds a new LED class device to control it. It's created +dynamically upon synaptics device probing. + +The LED is controlled via the command 0x0a with parameters 0x88 or 0x10. +This seems only on/off control although other value might be accepted. + +The detection of the LED isn't clear yet. It should have been the new +capability bits that indicate the presence, but on real machines, it +doesn't fit. So, for the time being, the driver checks the product id +in the ext capability bits and assumes that LED exists on the known +devices. + +Signed-off-by: Takashi Iwai <tiwai@suse.de> + +--- + drivers/input/mouse/Kconfig | 9 +++ + drivers/input/mouse/synaptics.c | 111 ++++++++++++++++++++++++++++++++++++++++ + drivers/input/mouse/synaptics.h | 3 + + 3 files changed, 123 insertions(+) + +--- a/drivers/input/mouse/Kconfig ++++ b/drivers/input/mouse/Kconfig +@@ -19,6 +19,7 @@ + select SERIO_LIBPS2 + select SERIO_I8042 if X86 + select SERIO_GSCPS2 if GSC ++ select LEDS_CLASS if MOUSE_PS2_SYNAPICS_LED + 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 @@ + + If unsure, say Y. + ++config MOUSE_PS2_SYNAPTICS_LED ++ bool "Support embedded LED on Synaptics devices" ++ depends on MOUSE_PS2_SYNAPTICS ++ select NEW_LEDS ++ help ++ Say Y here if you have a Synaptics device with an embedded LED. ++ This will enable LED class driver to control the LED device. ++ + config MOUSE_PS2_LIFEBOOK + bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EMBEDDED + default y +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -28,6 +28,7 @@ + #include <linux/input.h> + #include <linux/serio.h> + #include <linux/libps2.h> ++#include <linux/leds.h> + #include <linux/slab.h> + #include "psmouse.h" + #include "synaptics.h" +@@ -335,6 +336,110 @@ + serio_register_port(serio); + } + ++#ifdef CONFIG_MOUSE_PS2_SYNAPTICS_LED ++/* ++ * LED handling: ++ * Some Synaptics devices have an embeded LED at the top-left corner. ++ */ ++ ++struct synaptics_led { ++ struct psmouse *psmouse; ++ struct work_struct work; ++ struct led_classdev cdev; ++}; ++ ++static void synaptics_set_led(struct psmouse *psmouse, int on) ++{ ++ int i; ++ unsigned char cmd = on ? 0x88 : 0x10; ++ ++ ps2_begin_command(&psmouse->ps2dev); ++ if (__ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSCALE11)) ++ goto out; ++ for (i = 6; i >= 0; i -= 2) { ++ unsigned char d = (cmd >> i) & 3; ++ if (__ps2_command(&psmouse->ps2dev, &d, PSMOUSE_CMD_SETRES)) ++ goto out; ++ } ++ cmd = 0x0a; ++ __ps2_command(&psmouse->ps2dev, &cmd, PSMOUSE_CMD_SETRATE); ++ out: ++ ps2_end_command(&psmouse->ps2dev); ++} ++ ++static void synaptics_led_work(struct work_struct *work) ++{ ++ struct synaptics_led *led; ++ ++ led = container_of(work, struct synaptics_led, work); ++ synaptics_set_led(led->psmouse, led->cdev.brightness); ++} ++ ++static void synaptics_led_cdev_brightness_set(struct led_classdev *cdev, ++ enum led_brightness value) ++{ ++ struct synaptics_led *led; ++ ++ led = container_of(cdev, struct synaptics_led, cdev); ++ schedule_work(&led->work); ++} ++ ++static void synaptics_sync_led(struct psmouse *psmouse) ++{ ++ struct synaptics_data *priv = psmouse->private; ++ ++ if (priv->led) ++ synaptics_set_led(psmouse, priv->led->cdev.brightness); ++} ++ ++static int synaptics_init_led(struct psmouse *psmouse) ++{ ++ struct synaptics_data *priv = psmouse->private; ++ struct synaptics_led *led; ++ int err; ++ ++ /* FIXME: LED is supposedly detectable in cap0c[1] 0x20, but it seems ++ * not working on real machines. ++ * So we check the product id to be sure. ++ */ ++ if (!priv->ext_cap_0c || SYN_CAP_PRODUCT_ID(priv->ext_cap) != 0xe4) ++ return 0; ++ ++ printk(KERN_INFO "synaptics: support LED control\n"); ++ led = kzalloc(sizeof(struct synaptics_led), GFP_KERNEL); ++ if (!led) ++ return -ENOMEM; ++ led->psmouse = psmouse; ++ INIT_WORK(&led->work, synaptics_led_work); ++ led->cdev.name = "psmouse::synaptics"; ++ led->cdev.brightness_set = synaptics_led_cdev_brightness_set; ++ led->cdev.flags = LED_CORE_SUSPENDRESUME; ++ err = led_classdev_register(NULL, &led->cdev); ++ if (err < 0) { ++ kfree(led); ++ return err; ++ } ++ priv->led = led; ++ return 0; ++} ++ ++static void synaptics_free_led(struct psmouse *psmouse) ++{ ++ struct synaptics_data *priv = psmouse->private; ++ ++ if (!priv->led) ++ return; ++ cancel_work_sync(&priv->led->work); ++ synaptics_set_led(psmouse, 0); ++ led_classdev_unregister(&priv->led->cdev); ++ kfree(priv->led); ++} ++#else ++#define synaptics_init_led(ps) 0 ++#define synaptics_free_led(ps) do {} while (0) ++#define synaptics_sync_led(ps) do {} while (0) ++#endif ++ + /***************************************************************************** + * Functions to interpret the absolute mode packets + ****************************************************************************/ +@@ -622,6 +727,7 @@ + + static void synaptics_disconnect(struct psmouse *psmouse) + { ++ synaptics_free_led(psmouse); + synaptics_reset(psmouse); + kfree(psmouse->private); + psmouse->private = NULL; +@@ -653,6 +759,8 @@ + return -1; + } + ++ synaptics_sync_led(psmouse); ++ + return 0; + } + +@@ -727,6 +835,9 @@ + SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity), + priv->model_id, priv->capabilities, priv->ext_cap, priv->ext_cap_0c); + ++ if (synaptics_init_led(psmouse) < 0) ++ goto init_fail; ++ + set_input_params(psmouse->dev, priv); + + /* +--- a/drivers/input/mouse/synaptics.h ++++ b/drivers/input/mouse/synaptics.h +@@ -94,6 +94,8 @@ + signed char scroll; + }; + ++struct synaptics_led; ++ + struct synaptics_data { + /* Data read from the touchpad */ + unsigned long int model_id; /* Model-ID */ +@@ -107,6 +109,7 @@ + unsigned char pkt_type; /* packet type - old, new, etc */ + unsigned char mode; /* current mode byte */ + int scroll; ++ struct synaptics_led *led; + }; + + void synaptics_module_init(void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/input-Add-support-of-Synaptics-Clickpad-device new/patches.drivers/input-Add-support-of-Synaptics-Clickpad-device --- old/patches.drivers/input-Add-support-of-Synaptics-Clickpad-device 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/input-Add-support-of-Synaptics-Clickpad-device 2010-04-22 08:25:27.000000000 +0200 @@ -0,0 +1,129 @@ +From: Takashi Iwai <tiwai@suse.de> +Subject: input: Add support of Synaptics Clickpad device +Patch-mainline: Submitted, likely in 2.6.34-rc6 +References: bnc#547370,bnc#582529,bnc#589014 + +The new type of touchpads can be detected via a new query command 0x0c. +The clickpad flags are in cap[0]:4 and cap[1]:0 bits. + +When the device is detected, the driver now reports only the left +button as the supported buttons so that X11 driver can detect that +the device is Clickpad. A Clickpad device gives the button events +only as the middle button. The kernel driver morphs to the left +button. The real handling of Clickpad is done rather in X driver +side. + +Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Dmitry Torokhov <dtor@mail.ru> + +--- + drivers/input/mouse/synaptics.c | 33 +++++++++++++++++++++++++++++---- + drivers/input/mouse/synaptics.h | 4 ++++ + 2 files changed, 33 insertions(+), 4 deletions(-) + +diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c +index 026df60..c7b5285 100644 +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -137,7 +137,8 @@ static int synaptics_capability(struct psmouse *psmouse) + if (synaptics_send_cmd(psmouse, SYN_QUE_CAPABILITIES, cap)) + return -1; + priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2]; +- priv->ext_cap = 0; ++ priv->ext_cap = priv->ext_cap_0c = 0; ++ + if (!SYN_CAP_VALID(priv->capabilities)) + return -1; + +@@ -162,6 +163,16 @@ static int synaptics_capability(struct psmouse *psmouse) + priv->ext_cap &= 0xff0fff; + } + } ++ ++ if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 4) { ++ if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_CAPAB_0C, cap)) { ++ printk(KERN_ERR "Synaptics claims to have extended capability 0x0c," ++ " but I'm not able to read it."); ++ } else { ++ priv->ext_cap_0c = (cap[0] << 16) | (cap[1] << 8) | cap[2]; ++ } ++ } ++ + return 0; + } + +@@ -348,7 +359,15 @@ static void synaptics_parse_hw_state(unsigned char buf[], struct synaptics_data + hw->left = (buf[0] & 0x01) ? 1 : 0; + hw->right = (buf[0] & 0x02) ? 1 : 0; + +- if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) { ++ if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) { ++ /* ++ * Clickpad's button is transmitted as middle button, ++ * however, since it is primary button, we will report ++ * it as BTN_LEFT. ++ */ ++ hw->left = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0; ++ ++ } else if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) { + hw->middle = ((buf[0] ^ buf[3]) & 0x01) ? 1 : 0; + if (hw->w == 2) + hw->scroll = (signed char)(buf[1]); +@@ -593,6 +612,12 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv) + + dev->absres[ABS_X] = priv->x_res; + dev->absres[ABS_Y] = priv->y_res; ++ ++ if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) { ++ /* Clickpads report only left button */ ++ __clear_bit(BTN_RIGHT, dev->keybit); ++ __clear_bit(BTN_MIDDLE, dev->keybit); ++ } + } + + static void synaptics_disconnect(struct psmouse *psmouse) +@@ -697,10 +722,10 @@ int synaptics_init(struct psmouse *psmouse) + + priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS; + +- printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx\n", ++ printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx\n", + SYN_ID_MODEL(priv->identity), + SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity), +- priv->model_id, priv->capabilities, priv->ext_cap); ++ priv->model_id, priv->capabilities, priv->ext_cap, priv->ext_cap_0c); + + set_input_params(psmouse->dev, priv); + +diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h +index f0f40a3..ae37c5d 100644 +--- a/drivers/input/mouse/synaptics.h ++++ b/drivers/input/mouse/synaptics.h +@@ -18,6 +18,7 @@ + #define SYN_QUE_SERIAL_NUMBER_SUFFIX 0x07 + #define SYN_QUE_RESOLUTION 0x08 + #define SYN_QUE_EXT_CAPAB 0x09 ++#define SYN_QUE_EXT_CAPAB_0C 0x0c + + /* synatics modes */ + #define SYN_BIT_ABSOLUTE_MODE (1 << 7) +@@ -48,6 +49,8 @@ + #define SYN_CAP_VALID(c) ((((c) & 0x00ff00) >> 8) == 0x47) + #define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20) + #define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12) ++#define SYN_CAP_PRODUCT_ID(ec) (((ec) & 0xff0000) >> 16) ++#define SYN_CAP_CLICKPAD(ex0c) ((ex0c) & 0x100100) + + /* synaptics modes query bits */ + #define SYN_MODE_ABSOLUTE(m) ((m) & (1 << 7)) +@@ -96,6 +99,7 @@ struct synaptics_data { + unsigned long int model_id; /* Model-ID */ + unsigned long int capabilities; /* Capabilities */ + unsigned long int ext_cap; /* Extended Capabilities */ ++ unsigned long int ext_cap_0c; /* Ext Caps from 0x0c query */ + unsigned long int identity; /* Identification */ + int x_res; /* X resolution in units/mm */ + int y_res; /* Y resolution in units/mm */ +-- +1.7.0.4 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/synaptics-hp-clickpad new/patches.drivers/synaptics-hp-clickpad --- old/patches.drivers/synaptics-hp-clickpad 2010-03-21 23:34:57.000000000 +0100 +++ new/patches.drivers/synaptics-hp-clickpad 1970-01-01 01:00:00.000000000 +0100 @@ -1,109 +0,0 @@ -From: Takashi Iwai <tiwai@suse.de> -Subject: Input: Add support of clickpad mode to synaptics mouse driver -Patch-mainline: -References: bnc#547370 -Patch-mainline: not yet - -Add the experimental support of Synatpics Clickpad on new HP laptops. - -Right now only "ClickZone" mode is implemented. That is, the buttons -are emulated as clicks in the bottom button zone. Clicking the narrow -middle point in the button zone gives a middle click. - -Signed-off-by: Takashi Iwai <tiwai@suse.de> - ---- - drivers/input/mouse/synaptics.c | 48 ++++++++++++++++++++++++++++++++++++++++ - drivers/input/mouse/synaptics.h | 3 ++ - 2 files changed, 51 insertions(+) - ---- a/drivers/input/mouse/synaptics.c -+++ b/drivers/input/mouse/synaptics.c -@@ -327,6 +327,45 @@ static void synaptics_pt_create(struct p - * Functions to interpret the absolute mode packets - ****************************************************************************/ - -+/* left and right clickpad button ranges; -+ * the gap between them is interpreted as a middle-button click -+ */ -+#define CLICKPAD_LEFT_BTN_X \ -+ ((XMAX_NOMINAL - XMIN_NOMINAL) * 2 / 5 + XMIN_NOMINAL) -+#define CLICKPAD_RIGHT_BTN_X \ -+ ((XMAX_NOMINAL - XMIN_NOMINAL) * 3 / 5 + XMIN_NOMINAL) -+ -+/* handle clickpad events */ -+static void clickpad_process_packet(struct synaptics_data *priv, -+ struct synaptics_hw_state *hw) -+{ -+ /* clickpad mode reports Y range from 0 to YMAX_NOMINAL, -+ * where the area Y < YMIN_NOMINAL is used as click buttons -+ */ -+ if (hw->y < YMIN_NOMINAL) { -+ /* button area */ -+ hw->z = 0; /* don't move pointer */ -+ /* clickpad reports only the middle button, and we need -+ * to fake left/right buttons depending on the touch position -+ */ -+ if (hw->middle) { /* clicked? */ -+ hw->middle = 0; -+ if (hw->x < CLICKPAD_LEFT_BTN_X) -+ hw->left = 1; -+ else if (hw->x > CLICKPAD_RIGHT_BTN_X) -+ hw->right = 1; -+ else -+ hw->middle = 1; -+ } -+ } else if (hw->middle) { -+ /* dragging */ -+ hw->left = priv->prev_hw.left; -+ hw->right = priv->prev_hw.right; -+ hw->middle = priv->prev_hw.middle; -+ } -+ priv->prev_hw = *hw; -+} -+ - static void synaptics_parse_hw_state(unsigned char buf[], struct synaptics_data *priv, struct synaptics_hw_state *hw) - { - memset(hw, 0, sizeof(struct synaptics_hw_state)); -@@ -407,6 +446,9 @@ static void synaptics_process_packet(str - - synaptics_parse_hw_state(psmouse->packet, priv, &hw); - -+ if (SYN_CAP_CLICKPAD(priv->ext_cap)) -+ clickpad_process_packet(priv, &hw); -+ - if (hw.scroll) { - priv->scroll += hw.scroll; - -@@ -701,6 +743,12 @@ int synaptics_init(struct psmouse *psmou - SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity), - priv->model_id, priv->capabilities, priv->ext_cap); - -+ if (SYN_CAP_CLICKPAD(priv->ext_cap)) { -+ printk(KERN_INFO "Synaptics: Clickpad mode enabled\n"); -+ /* force to enable the middle button */ -+ priv->capabilities |= (1 << 18); -+ } -+ - set_input_params(psmouse->dev, priv); - - /* ---- a/drivers/input/mouse/synaptics.h -+++ b/drivers/input/mouse/synaptics.h -@@ -48,6 +48,8 @@ - #define SYN_CAP_VALID(c) ((((c) & 0x00ff00) >> 8) == 0x47) - #define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20) - #define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12) -+#define SYN_CAP_PRODUCT_ID(ec) (((ec) & 0xff0000) >> 16) -+#define SYN_CAP_CLICKPAD(ec) (SYN_CAP_PRODUCT_ID(ec) == 0xe4) - - /* synaptics modes query bits */ - #define SYN_MODE_ABSOLUTE(m) ((m) & (1 << 7)) -@@ -103,6 +105,7 @@ struct synaptics_data { - unsigned char pkt_type; /* packet type - old, new, etc */ - unsigned char mode; /* current mode byte */ - int scroll; -+ struct synaptics_hw_state prev_hw; - }; - - void synaptics_module_init(void); ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/hibernation-fix-s2disk.patch new/patches.fixes/hibernation-fix-s2disk.patch --- old/patches.fixes/hibernation-fix-s2disk.patch 2010-04-19 21:21:36.000000000 +0200 +++ new/patches.fixes/hibernation-fix-s2disk.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -From 182220e26134122e6bf12ea24c68f1a022c8da9e Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <jslaby@suse.cz> -Date: Thu, 8 Apr 2010 23:38:56 +0200 -Subject: PM / Hibernate: user.c, fix SNAPSHOT_SET_SWAP_AREA handling -References: bko#15728 -Patch-mainline: on-the-way - -When CONFIG_DEBUG_BLOCK_EXT_DEVT is set we decode the device -improperly by old_decode_dev and it results in an error while -hibernating with s2disk. - -All users already passes the new device number, so switch to -new_decode_dev. - -Signed-off-by: Jiri Slaby <jslaby@suse.cz> -Cc: "Rafael J. Wysocki" <rjw@sisk.pl> -Cc: Pavel Machek <pavel@ucw.cz> ---- - kernel/power/user.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/kernel/power/user.c b/kernel/power/user.c -index 9eafb8c..6ca76a6 100644 ---- a/kernel/power/user.c -+++ b/kernel/power/user.c -@@ -593,7 +593,7 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, - * User space encodes device types as two-byte values, - * so we need to recode them - */ -- swdev = old_decode_dev(swap_area.dev); -+ swdev = new_decode_dev(swap_area.dev); - if (swdev) { - offset = swap_area.offset; - data->swap = swap_type_of(swdev, offset, NULL); --- -1.7.0.3 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/novfs-LFS-initialization new/patches.fixes/novfs-LFS-initialization --- old/patches.fixes/novfs-LFS-initialization 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/novfs-LFS-initialization 2010-04-20 00:26:03.000000000 +0200 @@ -0,0 +1,26 @@ +From: Sankar P <psankar@novell.com> +Subject: fs: novfs: Initialize super-block with standard macros +Patch-mainline: no + +Initialize the super block's maxbytes with MAX_LFS_FILESIZE macro. + +Signed-off-by: Sankar P <psankar@novell.com> +Signed-off-by: Samrat Kannikar <ksamrat@novell.com> +Acked-by: Jan Kara <jack@suse.cz> + +diff --git a/fs/novfs/inode.c b/fs/novfs/inode.c +index e33a5f8..1c17f7f 100644 +--- a/fs/novfs/inode.c ++++ b/fs/novfs/inode.c +@@ -3826,7 +3826,7 @@ int novfs_fill_super(struct super_block *SB, void *Data, int Silent) + + SB->s_blocksize = PAGE_CACHE_SIZE; + SB->s_blocksize_bits = PAGE_CACHE_SHIFT; +- SB->s_maxbytes = 0xFFFFFFFFFFFFFFFFULL; /* Max file size */ ++ SB->s_maxbytes = MAX_LFS_FILESIZE; /* Max file size */ + SB->s_op = &novfs_ops; + SB->s_flags |= (MS_NODIRATIME | MS_NODEV | MS_POSIXACL); + SB->s_magic = NOVFS_MAGIC; +-- +1.6.4.2 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir new/patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir --- old/patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir 2010-04-20 00:26:03.000000000 +0200 @@ -0,0 +1,42 @@ +From: Sankar P <psankar@novell.com> +Subject: fs: novfs: Return ENOTEMPTY when tyring to delete a non-empty folder +References: bnc#583964 +Patch-mainline: no + +The patch returns the ENOTEMPTY error code, when an user issues +delete command on a non-empty folder. This fix makes Nautilus +behave correctly in novfs, just like other file-systems. + +Signed-off-by: Sankar P <psankar@novell.com> +Acked-by: Jan Kara <jack@suse.cz> +--- + tmp/linux-2.6.32-sle11-sp1/fs/novfs/file.c | 11 ++++++++--- + 1 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/fs/novfs/file.c b/fs/novfs/file.c +index b7033ff..5da32ca 100644 +--- a/fs/novfs/file.c ++++ b/fs/novfs/file.c +@@ -1569,11 +1569,16 @@ int novfs_delete(unsigned char * Path, int DirectoryFlag, struct novfs_schandle + if (reply) { + retCode = 0; + if (reply->Reply.ErrorCode) { +- if ((reply->Reply.ErrorCode & 0xFFFF) == 0x0006) { /* Access Denied Error */ ++ ++ /* Refer to the file ncp.c, in xtier's ++ * NCP89_08 Function for various error codes */ ++ ++ if ((reply->Reply.ErrorCode & 0xFFFF) == 0x0006) + retCode = -EACCES; +- } else { ++ else if ((reply->Reply.ErrorCode & 0xFFFF) == 0x0513) ++ retCode = -ENOTEMPTY; ++ else + retCode = -EIO; +- } + } + kfree(reply); + } +-- +1.6.4.2 + ++++++ 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-25-nfs-swapcache.patch new/patches.suse/SoN-25-nfs-swapcache.patch --- old/patches.suse/SoN-25-nfs-swapcache.patch 2010-04-14 22:25:09.000000000 +0200 +++ new/patches.suse/SoN-25-nfs-swapcache.patch 2010-04-22 21:18:20.000000000 +0200 @@ -162,7 +162,7 @@ + struct inode *inode = page_file_mapping(page)->host; struct nfs_server *nfss = NFS_SERVER(inode); - if (atomic_long_inc_return(&nfss->writeback) > + page_cache_get(page); @@ -212,7 +212,7 @@ static int nfs_set_page_writeback(struct static void nfs_end_page_writeback(struct page *page) 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 2010-04-14 22:25:09.000000000 +0200 +++ new/patches.suse/s390-Kerntypes.diff 2010-04-22 21:18:20.000000000 +0200 @@ -96,6 +96,7 @@ +#include <linux/module.h> +#include <linux/sched.h> +#include <linux/mm.h> ++#include <linux/slab.h> +#ifdef CONFIG_SLUB + #include <linux/slub_def.h> +#endif @@ -105,7 +106,6 @@ +#ifdef CONFIG_SLQB + #include <linux/slqb_def.h> +#endif -+#include <linux/slab.h> +#include <linux/bio.h> +#include <linux/bitmap.h> +#include <linux/bitops.h> ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:25.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:25.000000000 +0200 @@ -31,6 +31,7 @@ patches.kernel.org/patch-2.6.34-rc1-rc2 patches.kernel.org/patch-2.6.34-rc2-rc3 patches.kernel.org/patch-2.6.34-rc3-rc4 + patches.kernel.org/patch-2.6.34-rc4-rc5 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -107,8 +108,6 @@ patches.fixes/make-note_interrupt-fast.diff patches.fixes/twl6030-fix-note_interrupt-call - patches.fixes/hibernation-fix-s2disk.patch - ######################################################## # Architecture-specific patches. These used to be all @@ -390,6 +389,8 @@ patches.fixes/novfs-truncate-fix patches.fixes/novfs-fix-oops-in-scope-finding patches.fixes/novfs-dentry-cache-limit.patch + patches.fixes/novfs-return-ENOTEMPTY-when-deleting-nonempty-dir + patches.fixes/novfs-LFS-initialization ######################################################## # other filesystem stuff @@ -555,7 +556,8 @@ patches.suse/bootsplash-console-fix patches.drivers/elousb.patch patches.fixes/input-add-acer-aspire-5710-to-nomux.patch - patches.drivers/synaptics-hp-clickpad + patches.drivers/input-Add-support-of-Synaptics-Clickpad-device + patches.drivers/input-Add-LED-support-to-Synaptics-device ########################################################## # Sound ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.PYxDgP/_old 2010-04-25 18:41:25.000000000 +0200 +++ /var/tmp/diff_new_pack.PYxDgP/_new 2010-04-25 18:41:25.000000000 +0200 @@ -1,3 +1,3 @@ -2010-04-19 21:21:36 +0200 -GIT Revision: edfae1aa21950bd4200dd722852583ed4d4f08cd +2010-04-22 21:18:20 +0200 +GIT Revision: 72f7d49ac45380c1b71bd38e86c3bbf74577b9f6 GIT Branch: master ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org