Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Tue Feb 3 23:53:14 CET 2009. -------- --- kernel-source/kernel-debug.changes 2009-01-13 17:58:43.000000000 +0100 +++ kernel-source/kernel-debug.changes 2009-01-29 20:00:24.939605000 +0100 @@ -1,0 +2,977 @@ +Thu Jan 29 18:45:32 CET 2009 - gregkh@suse.de + +- add ability to debug kernel using USB debug connector. +- Update config files. +- patches.suse/usb-move-ehci-reg-def.patch: usb: move ehci + reg def. +- patches.suse/x86-usb-debug-port-early-console-v4.patch: x86: + usb debug port early console, v4. + +------------------------------------------------------------------- +Thu Jan 29 11:43:32 CET 2009 - mmarek@suse.cz + +- patches.kabi/abi-fix-add-s_syncing-back-to-struct-super_block.patch + patches.kabi/abi-fix-add-wb_sync_hold-enum-writeback_sync_modes.patch + patches.kabi/export-iwl_rx_allocate + patches.kabi/sched-kabi-compat-hack.patch: Introduce + patches.kabi/ for patches that only work around kabi issues and + can be safely dropped at the next SP. + +------------------------------------------------------------------- +Wed Jan 28 20:34:29 CET 2009 - agruen@suse.de + +- patches.xen/xen-x86-mark_rodata_rw.patch: Add missing pageattr.c + changes to pageattr-xen.c (bnc#439348). + +------------------------------------------------------------------- +Wed Jan 28 18:50:59 CET 2009 - agruen@suse.de + +- patches.suse/x86-mark_rodata_rw.patch: Add mark_rodata_rw() + to un-protect read-only kernel code pages (bnc#439348). +- patches.xen/xen-x86-mark_rodata_rw.patch: xen specific part + (bnc#439348). + +------------------------------------------------------------------- +Wed Jan 28 15:59:27 CET 2009 - mmarek@suse.cz + +- config/s390/s390: the -man package still fails for s390, disable + it + +------------------------------------------------------------------- +Wed Jan 28 14:27:18 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: fix build of the -man subpackage on + 31bit s390 + +------------------------------------------------------------------- +Wed Jan 28 13:23:01 CET 2009 - mmarek@suse.cz + +- fix kernel-default.ppc64 reference symsets + +------------------------------------------------------------------- +Wed Jan 28 12:06:53 CET 2009 - jslaby@suse.cz + +- patches.arch/x86_sgi_cpus4096-05-update-send_IPI_mask.patch: + x86 cpumask: Updates to support NR_CPUS=4096 (bnc#425240 + FATE304266). + [cpu_mask_to_apicid bigsmp fix] + +------------------------------------------------------------------- +Wed Jan 28 08:16:54 CET 2009 - olh@suse.de + +- patches.fixes/scsi-ibmvscsi-module_alias.patch: + map scsi proc_name to module name (bnc#459933 - LTC50724) + +------------------------------------------------------------------- +Tue Jan 27 23:33:09 CET 2009 - jeffm@suse.de + +- Update config files: Disable ftrace in -debug on ppc64 + +------------------------------------------------------------------- +Tue Jan 27 23:16:03 CET 2009 - jeffm@suse.de + +- config.conf: Added -debug flavor for ppc64. + +------------------------------------------------------------------- +Tue Jan 27 13:40:53 CET 2009 - bwalle@suse.de + +- patches.drivers/libfc-set-the-release-function.diff: + Whitespace change. + +------------------------------------------------------------------- +Tue Jan 27 09:05:30 CET 2009 - hare@suse.de + +- patches.drivers/libfc-fix-read-IO-data-integrity: libfc: + IO data integrity issue when a IO data frame lost (bnc#469536). + +------------------------------------------------------------------- +Tue Jan 27 08:52:49 CET 2009 - jbeulich@novell.com + +- re-enable patches.xen/xen3-e1000e_Export_set_memory_ro-rw. + +------------------------------------------------------------------- +Tue Jan 27 07:44:18 CET 2009 - olh@suse.de + +- update patches.arch/ppc-memoryless-nodes.patch: + include prototype for PFN_UP() (bnc#462546 - LTC50009) + +------------------------------------------------------------------- +Mon Jan 26 19:53:20 CET 2009 - kkeil@suse.de + +- patches.suse/e1000e_Export_set_memory_ro-rw: Export + set_memory_ro() and set_memory_rw() calls. + readded to avoid kabi change + +------------------------------------------------------------------- +Mon Jan 26 19:36:59 CET 2009 - jeffm@suse.de + +- config.conf: Added kernel-vmi to i386. + +------------------------------------------------------------------- +Mon Jan 26 19:08:43 CET 2009 - olh@suse.de + +- update patches.arch/ppc-memoryless-nodes.patch: + use PFN_UP() for end_pfn (bnc#462546 - LTC50009) + +------------------------------------------------------------------- +Mon Jan 26 17:14:44 CET 2009 - mmarek@suse.cz + +- kabi: import FCoE changes + +------------------------------------------------------------------- +Mon Jan 26 17:00:44 CET 2009 - hare@suse.de + +- patches.suse/dm-mpath-requeue-for-stopped-queue: disable + wrong debug message again. + +------------------------------------------------------------------- +Mon Jan 26 15:35:41 CET 2009 - rw@suse.de + +- patches.fixes/taskstats-alignment: + IA64: fill 'struct taskstats' on stack and 'memcpy' result to skb. + (bnc#448410) + +------------------------------------------------------------------- +Mon Jan 26 15:31:39 CET 2009 - olh@suse.de + +- update patches.arch/ppc-memoryless-nodes.patch: + fix calculation of reserve_size (bnc#462546 - LTC50009) + +------------------------------------------------------------------- +Mon Jan 26 14:19:30 CET 2009 - kkeil@suse.de + +- patches.fixes/disable-lro-per-default: Disable LRO per default + in igb and ixgbe. (bnc#467519) + +------------------------------------------------------------------- +Mon Jan 26 13:44:37 CET 2009 - jbeulich@novell.com + +- Just comment out patches.xen/xen3-e1000e_* (to address build error) + until disposition of their originals is known. + +------------------------------------------------------------------- +Mon Jan 26 13:01:24 CET 2009 - kkeil@suse.de + +- patches.fixes/sctp_do_not_use_stale_copy_of_sk: Do not use + stale copy of sk. (bnc#440104) + +------------------------------------------------------------------- +Mon Jan 26 12:52:21 CET 2009 - jblunck@suse.de + +Renamed some patches so they get included in vanilla builds. +- patches.rpmify/firmware-path: Renamed. +- patches.rpmify/no-include-asm: Renamed. +- patches.suse/md-raid-metadata-PAGE_SIZE.patch: Renamed. + +------------------------------------------------------------------- +Mon Jan 26 12:18:00 CET 2009 - olh@suse.de + +- patches.suse/led_classdev.sysfs-name.patch: use correct name + for /sys/devices/virtual/leds/ entries (bnc#468350) + +------------------------------------------------------------------- +Mon Jan 26 12:15:15 CET 2009 - kkeil@suse.de + +- patches.suse/e1000e_Export_set_memory_ro-rw: Delete. +- patches.suse/e1000e_allow_bad_checksum: Delete. +- patches.suse/e1000e_call_dump_eeprom: Delete. +- patches.suse/e1000e_ioremap_sanity_check: Delete. +- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory: + Delete. + Remove not mainline e1000e patches which were added to help with + the e1000e NVM corruption - root issue is fixed + +------------------------------------------------------------------- +Mon Jan 26 12:06:30 CET 2009 - kkeil@suse.de + +- patches.drivers/tg3_libphy_workaround: tg3 libphy workaround. + (bnc#468725) + +------------------------------------------------------------------- +Mon Jan 26 09:17:49 CET 2009 - hare@suse.de + +- supported.conf: Correct spelling for dm-least-pending + path checker. + +------------------------------------------------------------------- +Mon Jan 26 09:16:31 CET 2009 - hare@suse.de ++++ 787 more lines (skipped) ++++ between kernel-source/kernel-debug.changes ++++ and kernel-source/kernel-debug.changes kernel-default.changes: same change kernel-dummy.changes: same change kernel-kdump.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 New Changes file: --- /dev/null 2008-04-22 03:09:48.000000000 +0200 +++ kernel-source/kernel-vmi.changes 2009-01-29 20:00:26.441101000 +0100 @@ -0,0 +1,48699 @@ +------------------------------------------------------------------- +Thu Jan 29 18:45:32 CET 2009 - gregkh@suse.de + +- add ability to debug kernel using USB debug connector. +- Update config files. +- patches.suse/usb-move-ehci-reg-def.patch: usb: move ehci + reg def. +- patches.suse/x86-usb-debug-port-early-console-v4.patch: x86: + usb debug port early console, v4. + +------------------------------------------------------------------- +Thu Jan 29 11:43:32 CET 2009 - mmarek@suse.cz + +- patches.kabi/abi-fix-add-s_syncing-back-to-struct-super_block.patch + patches.kabi/abi-fix-add-wb_sync_hold-enum-writeback_sync_modes.patch + patches.kabi/export-iwl_rx_allocate + patches.kabi/sched-kabi-compat-hack.patch: Introduce + patches.kabi/ for patches that only work around kabi issues and + can be safely dropped at the next SP. + +------------------------------------------------------------------- +Wed Jan 28 20:34:29 CET 2009 - agruen@suse.de + +- patches.xen/xen-x86-mark_rodata_rw.patch: Add missing pageattr.c + changes to pageattr-xen.c (bnc#439348). + +------------------------------------------------------------------- +Wed Jan 28 18:50:59 CET 2009 - agruen@suse.de + +- patches.suse/x86-mark_rodata_rw.patch: Add mark_rodata_rw() + to un-protect read-only kernel code pages (bnc#439348). +- patches.xen/xen-x86-mark_rodata_rw.patch: xen specific part + (bnc#439348). + +------------------------------------------------------------------- +Wed Jan 28 15:59:27 CET 2009 - mmarek@suse.cz + +- config/s390/s390: the -man package still fails for s390, disable + it + +------------------------------------------------------------------- +Wed Jan 28 14:27:18 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: fix build of the -man subpackage on + 31bit s390 + +------------------------------------------------------------------- +Wed Jan 28 13:23:01 CET 2009 - mmarek@suse.cz + +- fix kernel-default.ppc64 reference symsets + +------------------------------------------------------------------- +Wed Jan 28 12:06:53 CET 2009 - jslaby@suse.cz + +- patches.arch/x86_sgi_cpus4096-05-update-send_IPI_mask.patch: + x86 cpumask: Updates to support NR_CPUS=4096 (bnc#425240 + FATE304266). + [cpu_mask_to_apicid bigsmp fix] + +------------------------------------------------------------------- +Wed Jan 28 08:16:54 CET 2009 - olh@suse.de + +- patches.fixes/scsi-ibmvscsi-module_alias.patch: + map scsi proc_name to module name (bnc#459933 - LTC50724) + +------------------------------------------------------------------- +Tue Jan 27 23:33:09 CET 2009 - jeffm@suse.de + +- Update config files: Disable ftrace in -debug on ppc64 + +------------------------------------------------------------------- +Tue Jan 27 23:16:03 CET 2009 - jeffm@suse.de + +- config.conf: Added -debug flavor for ppc64. + +------------------------------------------------------------------- +Tue Jan 27 13:40:53 CET 2009 - bwalle@suse.de + +- patches.drivers/libfc-set-the-release-function.diff: + Whitespace change. + +------------------------------------------------------------------- +Tue Jan 27 09:05:30 CET 2009 - hare@suse.de + +- patches.drivers/libfc-fix-read-IO-data-integrity: libfc: + IO data integrity issue when a IO data frame lost (bnc#469536). + +------------------------------------------------------------------- +Tue Jan 27 08:52:49 CET 2009 - jbeulich@novell.com + +- re-enable patches.xen/xen3-e1000e_Export_set_memory_ro-rw. + +------------------------------------------------------------------- +Tue Jan 27 07:44:18 CET 2009 - olh@suse.de + +- update patches.arch/ppc-memoryless-nodes.patch: + include prototype for PFN_UP() (bnc#462546 - LTC50009) + +------------------------------------------------------------------- +Mon Jan 26 19:53:20 CET 2009 - kkeil@suse.de + +- patches.suse/e1000e_Export_set_memory_ro-rw: Export + set_memory_ro() and set_memory_rw() calls. + readded to avoid kabi change + +------------------------------------------------------------------- +Mon Jan 26 19:36:59 CET 2009 - jeffm@suse.de + +- config.conf: Added kernel-vmi to i386. + +------------------------------------------------------------------- +Mon Jan 26 19:08:43 CET 2009 - olh@suse.de + +- update patches.arch/ppc-memoryless-nodes.patch: + use PFN_UP() for end_pfn (bnc#462546 - LTC50009) + +------------------------------------------------------------------- +Mon Jan 26 17:14:44 CET 2009 - mmarek@suse.cz + +- kabi: import FCoE changes + +------------------------------------------------------------------- +Mon Jan 26 17:00:44 CET 2009 - hare@suse.de + +- patches.suse/dm-mpath-requeue-for-stopped-queue: disable + wrong debug message again. + +------------------------------------------------------------------- +Mon Jan 26 15:35:41 CET 2009 - rw@suse.de + +- patches.fixes/taskstats-alignment: + IA64: fill 'struct taskstats' on stack and 'memcpy' result to skb. + (bnc#448410) + +------------------------------------------------------------------- +Mon Jan 26 15:31:39 CET 2009 - olh@suse.de + +- update patches.arch/ppc-memoryless-nodes.patch: + fix calculation of reserve_size (bnc#462546 - LTC50009) + +------------------------------------------------------------------- +Mon Jan 26 14:19:30 CET 2009 - kkeil@suse.de + +- patches.fixes/disable-lro-per-default: Disable LRO per default + in igb and ixgbe. (bnc#467519) + +------------------------------------------------------------------- +Mon Jan 26 13:44:37 CET 2009 - jbeulich@novell.com + +- Just comment out patches.xen/xen3-e1000e_* (to address build error) + until disposition of their originals is known. + +------------------------------------------------------------------- +Mon Jan 26 13:01:24 CET 2009 - kkeil@suse.de + +- patches.fixes/sctp_do_not_use_stale_copy_of_sk: Do not use + stale copy of sk. (bnc#440104) + +------------------------------------------------------------------- +Mon Jan 26 12:52:21 CET 2009 - jblunck@suse.de + +Renamed some patches so they get included in vanilla builds. +- patches.rpmify/firmware-path: Renamed. +- patches.rpmify/no-include-asm: Renamed. +- patches.suse/md-raid-metadata-PAGE_SIZE.patch: Renamed. + +------------------------------------------------------------------- +Mon Jan 26 12:18:00 CET 2009 - olh@suse.de + +- patches.suse/led_classdev.sysfs-name.patch: use correct name + for /sys/devices/virtual/leds/ entries (bnc#468350) + +------------------------------------------------------------------- +Mon Jan 26 12:15:15 CET 2009 - kkeil@suse.de + +- patches.suse/e1000e_Export_set_memory_ro-rw: Delete. +- patches.suse/e1000e_allow_bad_checksum: Delete. +- patches.suse/e1000e_call_dump_eeprom: Delete. +- patches.suse/e1000e_ioremap_sanity_check: Delete. +- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory: + Delete. + Remove not mainline e1000e patches which were added to help with + the e1000e NVM corruption - root issue is fixed + +------------------------------------------------------------------- +Mon Jan 26 12:06:30 CET 2009 - kkeil@suse.de + +- patches.drivers/tg3_libphy_workaround: tg3 libphy workaround. + (bnc#468725) + +------------------------------------------------------------------- +Mon Jan 26 09:17:49 CET 2009 - hare@suse.de + +- supported.conf: Correct spelling for dm-least-pending + path checker. + +------------------------------------------------------------------- ++++ 48502 more lines (skipped) ++++ between /dev/null ++++ and kernel-source/kernel-vmi.changes --- kernel-source/kernel-xen.changes 2009-01-13 17:58:44.000000000 +0100 +++ kernel-source/kernel-xen.changes 2009-01-29 20:00:26.603939000 +0100 @@ -1,0 +2,977 @@ +Thu Jan 29 18:45:32 CET 2009 - gregkh@suse.de + +- add ability to debug kernel using USB debug connector. +- Update config files. +- patches.suse/usb-move-ehci-reg-def.patch: usb: move ehci + reg def. +- patches.suse/x86-usb-debug-port-early-console-v4.patch: x86: + usb debug port early console, v4. + +------------------------------------------------------------------- +Thu Jan 29 11:43:32 CET 2009 - mmarek@suse.cz + +- patches.kabi/abi-fix-add-s_syncing-back-to-struct-super_block.patch + patches.kabi/abi-fix-add-wb_sync_hold-enum-writeback_sync_modes.patch + patches.kabi/export-iwl_rx_allocate + patches.kabi/sched-kabi-compat-hack.patch: Introduce + patches.kabi/ for patches that only work around kabi issues and + can be safely dropped at the next SP. + +------------------------------------------------------------------- +Wed Jan 28 20:34:29 CET 2009 - agruen@suse.de + +- patches.xen/xen-x86-mark_rodata_rw.patch: Add missing pageattr.c + changes to pageattr-xen.c (bnc#439348). + +------------------------------------------------------------------- +Wed Jan 28 18:50:59 CET 2009 - agruen@suse.de + +- patches.suse/x86-mark_rodata_rw.patch: Add mark_rodata_rw() + to un-protect read-only kernel code pages (bnc#439348). +- patches.xen/xen-x86-mark_rodata_rw.patch: xen specific part + (bnc#439348). + +------------------------------------------------------------------- +Wed Jan 28 15:59:27 CET 2009 - mmarek@suse.cz + +- config/s390/s390: the -man package still fails for s390, disable + it + +------------------------------------------------------------------- +Wed Jan 28 14:27:18 CET 2009 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: fix build of the -man subpackage on + 31bit s390 + +------------------------------------------------------------------- +Wed Jan 28 13:23:01 CET 2009 - mmarek@suse.cz + +- fix kernel-default.ppc64 reference symsets + +------------------------------------------------------------------- +Wed Jan 28 12:06:53 CET 2009 - jslaby@suse.cz + +- patches.arch/x86_sgi_cpus4096-05-update-send_IPI_mask.patch: + x86 cpumask: Updates to support NR_CPUS=4096 (bnc#425240 + FATE304266). + [cpu_mask_to_apicid bigsmp fix] + +------------------------------------------------------------------- +Wed Jan 28 08:16:54 CET 2009 - olh@suse.de + +- patches.fixes/scsi-ibmvscsi-module_alias.patch: + map scsi proc_name to module name (bnc#459933 - LTC50724) + +------------------------------------------------------------------- +Tue Jan 27 23:33:09 CET 2009 - jeffm@suse.de + +- Update config files: Disable ftrace in -debug on ppc64 + +------------------------------------------------------------------- +Tue Jan 27 23:16:03 CET 2009 - jeffm@suse.de + +- config.conf: Added -debug flavor for ppc64. + +------------------------------------------------------------------- +Tue Jan 27 13:40:53 CET 2009 - bwalle@suse.de + +- patches.drivers/libfc-set-the-release-function.diff: + Whitespace change. + +------------------------------------------------------------------- +Tue Jan 27 09:05:30 CET 2009 - hare@suse.de + +- patches.drivers/libfc-fix-read-IO-data-integrity: libfc: + IO data integrity issue when a IO data frame lost (bnc#469536). + +------------------------------------------------------------------- +Tue Jan 27 08:52:49 CET 2009 - jbeulich@novell.com + +- re-enable patches.xen/xen3-e1000e_Export_set_memory_ro-rw. + +------------------------------------------------------------------- +Tue Jan 27 07:44:18 CET 2009 - olh@suse.de + +- update patches.arch/ppc-memoryless-nodes.patch: + include prototype for PFN_UP() (bnc#462546 - LTC50009) + +------------------------------------------------------------------- +Mon Jan 26 19:53:20 CET 2009 - kkeil@suse.de + +- patches.suse/e1000e_Export_set_memory_ro-rw: Export + set_memory_ro() and set_memory_rw() calls. + readded to avoid kabi change + +------------------------------------------------------------------- +Mon Jan 26 19:36:59 CET 2009 - jeffm@suse.de + +- config.conf: Added kernel-vmi to i386. + +------------------------------------------------------------------- +Mon Jan 26 19:08:43 CET 2009 - olh@suse.de + +- update patches.arch/ppc-memoryless-nodes.patch: + use PFN_UP() for end_pfn (bnc#462546 - LTC50009) + +------------------------------------------------------------------- +Mon Jan 26 17:14:44 CET 2009 - mmarek@suse.cz + +- kabi: import FCoE changes + +------------------------------------------------------------------- +Mon Jan 26 17:00:44 CET 2009 - hare@suse.de + +- patches.suse/dm-mpath-requeue-for-stopped-queue: disable + wrong debug message again. + +------------------------------------------------------------------- +Mon Jan 26 15:35:41 CET 2009 - rw@suse.de + +- patches.fixes/taskstats-alignment: + IA64: fill 'struct taskstats' on stack and 'memcpy' result to skb. + (bnc#448410) + +------------------------------------------------------------------- +Mon Jan 26 15:31:39 CET 2009 - olh@suse.de + +- update patches.arch/ppc-memoryless-nodes.patch: + fix calculation of reserve_size (bnc#462546 - LTC50009) + +------------------------------------------------------------------- +Mon Jan 26 14:19:30 CET 2009 - kkeil@suse.de + +- patches.fixes/disable-lro-per-default: Disable LRO per default + in igb and ixgbe. (bnc#467519) + +------------------------------------------------------------------- +Mon Jan 26 13:44:37 CET 2009 - jbeulich@novell.com + +- Just comment out patches.xen/xen3-e1000e_* (to address build error) + until disposition of their originals is known. + +------------------------------------------------------------------- +Mon Jan 26 13:01:24 CET 2009 - kkeil@suse.de + +- patches.fixes/sctp_do_not_use_stale_copy_of_sk: Do not use + stale copy of sk. (bnc#440104) + +------------------------------------------------------------------- +Mon Jan 26 12:52:21 CET 2009 - jblunck@suse.de + +Renamed some patches so they get included in vanilla builds. +- patches.rpmify/firmware-path: Renamed. +- patches.rpmify/no-include-asm: Renamed. +- patches.suse/md-raid-metadata-PAGE_SIZE.patch: Renamed. + +------------------------------------------------------------------- +Mon Jan 26 12:18:00 CET 2009 - olh@suse.de + +- patches.suse/led_classdev.sysfs-name.patch: use correct name + for /sys/devices/virtual/leds/ entries (bnc#468350) + +------------------------------------------------------------------- +Mon Jan 26 12:15:15 CET 2009 - kkeil@suse.de + +- patches.suse/e1000e_Export_set_memory_ro-rw: Delete. +- patches.suse/e1000e_allow_bad_checksum: Delete. +- patches.suse/e1000e_call_dump_eeprom: Delete. +- patches.suse/e1000e_ioremap_sanity_check: Delete. +- patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory: + Delete. + Remove not mainline e1000e patches which were added to help with + the e1000e NVM corruption - root issue is fixed + +------------------------------------------------------------------- +Mon Jan 26 12:06:30 CET 2009 - kkeil@suse.de + +- patches.drivers/tg3_libphy_workaround: tg3 libphy workaround. + (bnc#468725) + +------------------------------------------------------------------- +Mon Jan 26 09:17:49 CET 2009 - hare@suse.de + +- supported.conf: Correct spelling for dm-least-pending + path checker. + +------------------------------------------------------------------- +Mon Jan 26 09:16:31 CET 2009 - hare@suse.de ++++ 787 more lines (skipped) ++++ between kernel-source/kernel-xen.changes ++++ and kernel-source/kernel-xen.changes calling whatdependson for head-i586 New: ---- kernel-vmi.changes kernel-vmi.spec patches.kabi.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:40.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-debug (Version 2.6.27.10) +# spec file for package kernel-debug (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,7 +47,7 @@ %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/debug$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %ifarch %ix86 x86_64 %define install_vdso 1 @@ -62,8 +62,8 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -98,8 +98,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.10 -Obsoletes: kernel-xenpae <= 2.6.27.10 +Provides: kernel-xenpae = 2.6.27.13 +Obsoletes: kernel-xenpae <= 2.6.27.13 %endif #!BuildIgnore: xen %endif @@ -121,15 +121,18 @@ %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif -Provides: kernel = 2.6.27.10-%source_rel +Provides: kernel = 2.6.27.13-%source_rel %ifarch %ix86 %else %ifarch ia64 %else +%ifarch ppc64 +%else %ifarch x86_64 %endif %endif %endif +%endif Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -161,10 +164,11 @@ Source110: patches.apparmor.tar.bz2 Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 %define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ia64 x86_64 +ExclusiveArch: %ix86 ia64 ppc64 x86_64 # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -204,7 +208,7 @@ %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 6, 8 or 15, # 31 is the maximum; see scripts/kabi-checks) -%define tolerate_kabi_changes 31 +%define tolerate_kabi_changes 6 %description This kernel has several debug facilities enabled that hurt performance. @@ -212,18 +216,18 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-debug-2.6.27.10.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.10.src.rpm." + echo "The kernel-debug-2.6.27.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.13.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols # Unpack all sources and patches -%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 supported_conf() { %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | sort -u } @@ -273,7 +277,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.27.10-$RELEASE-debug +KERNELRELEASE=2.6.27.13-$RELEASE-debug EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -321,18 +325,15 @@ | tr -dc 0-9)" export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 EOF source .kernel-binary.spec.buildenv -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" chmod +x scripts/kmsg-doc make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif -%else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y -%endif %install source .rpm-defs @@ -414,7 +415,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then dwarfextract vmlinux %buildroot/boot/Kerntypes-$KERNELRELEASE fi -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif @@ -614,8 +615,6 @@ --max-badness=%tolerate_kabi_changes || KABI=$? fi if [ $KABI -ne 0 ]; then - echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ - "of %tolerate_kabi_changes. Please try to avoid the kABI changes." if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-debug -a \ ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ @@ -732,8 +731,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun base -f preun-base.sh @@ -774,8 +773,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun extra -f preun-extra.sh @@ -789,8 +788,7 @@ %files -n kernel-debug-extra -f kernel-extra.files %defattr(-, root, root) %endif -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" %package -n kernel-debug-man License: GPL v2 only @@ -803,12 +801,11 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %files -n kernel-debug-man %defattr(-,root,root) /usr/share/man/man9/* %endif -%endif ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:41.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-default (Version 2.6.27.10) +# spec file for package kernel-default (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,7 +47,7 @@ %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/default$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %ifarch %ix86 x86_64 %define install_vdso 1 @@ -62,8 +62,8 @@ Name: kernel-default Summary: The Standard Kernel -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -98,8 +98,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.10 -Obsoletes: kernel-xenpae <= 2.6.27.10 +Provides: kernel-xenpae = 2.6.27.13 +Obsoletes: kernel-xenpae <= 2.6.27.13 %endif #!BuildIgnore: xen %endif @@ -121,7 +121,7 @@ %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif -Provides: kernel = 2.6.27.10-%source_rel +Provides: kernel = 2.6.27.13-%source_rel %ifarch %ix86 Provides: k_athlon k_debug k_deflt k_deflt_22 k_deflt_24 k_eide k_laptop k_orig k_pentiu k_pos_ibm k_psmp k_smp k_smp_22 k_smp_24 smp kernel-smp Obsoletes: k_athlon k_debug k_deflt k_deflt_22 k_deflt_24 k_eide k_laptop k_orig k_pentiu k_pos_ibm k_psmp k_smp k_smp_22 k_smp_24 smp kernel-smp @@ -180,6 +180,7 @@ Source110: patches.apparmor.tar.bz2 Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 %define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -223,25 +224,25 @@ %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 6, 8 or 15, # 31 is the maximum; see scripts/kabi-checks) -%define tolerate_kabi_changes 31 +%define tolerate_kabi_changes 6 %description The standard kernel for both uniprocessor and multiprocessor systems. -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-default-2.6.27.10.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.10.src.rpm." + echo "The kernel-default-2.6.27.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.13.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols # Unpack all sources and patches -%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 supported_conf() { %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | sort -u } @@ -291,7 +292,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.27.10-$RELEASE-default +KERNELRELEASE=2.6.27.13-$RELEASE-default EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -339,18 +340,15 @@ | tr -dc 0-9)" export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 EOF source .kernel-binary.spec.buildenv -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" chmod +x scripts/kmsg-doc make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif -%else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y -%endif %install source .rpm-defs @@ -432,7 +430,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then dwarfextract vmlinux %buildroot/boot/Kerntypes-$KERNELRELEASE fi -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif @@ -632,8 +630,6 @@ --max-badness=%tolerate_kabi_changes || KABI=$? fi if [ $KABI -ne 0 ]; then - echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ - "of %tolerate_kabi_changes. Please try to avoid the kABI changes." if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-default -a \ ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ @@ -749,8 +745,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun base -f preun-base.sh @@ -790,8 +786,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun extra -f preun-extra.sh @@ -805,8 +801,7 @@ %files -n kernel-default-extra -f kernel-extra.files %defattr(-, root, root) %endif -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" %package -n kernel-default-man License: GPL v2 only @@ -818,12 +813,11 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %files -n kernel-default-man %defattr(-,root,root) /usr/share/man/man9/* %endif -%endif ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:42.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-dummy (Version 2.6.27.10) +# spec file for package kernel-dummy (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ Name: kernel-dummy Summary: Internal dummy package for synchronizing release numbers -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: System/Kernel AutoReqProv: off @@ -36,8 +36,8 @@ -------- Andreas Gruenbacher <agruen@suse.de> -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %install rm -rf %buildroot ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:42.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-kdump (Version 2.6.27.10) +# spec file for package kernel-kdump (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,7 +47,7 @@ %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/kdump$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %ifarch %ix86 x86_64 %define install_vdso 1 @@ -62,8 +62,8 @@ Name: kernel-kdump Summary: kernel for kdump -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -98,8 +98,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.10 -Obsoletes: kernel-xenpae <= 2.6.27.10 +Provides: kernel-xenpae = 2.6.27.13 +Obsoletes: kernel-xenpae <= 2.6.27.13 %endif #!BuildIgnore: xen %endif @@ -121,7 +121,7 @@ %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif -Provides: kernel = 2.6.27.10-%source_rel +Provides: kernel = 2.6.27.13-%source_rel %ifarch ppc %else %ifarch ppc64 @@ -158,6 +158,7 @@ Source110: patches.apparmor.tar.bz2 Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 %define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -201,7 +202,7 @@ %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 6, 8 or 15, # 31 is the maximum; see scripts/kabi-checks) -%define tolerate_kabi_changes 31 +%define tolerate_kabi_changes 6 %description This kernel is intended for kdump. It can not be booted with a normal @@ -211,18 +212,18 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-kdump-2.6.27.10.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.10.src.rpm." + echo "The kernel-kdump-2.6.27.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.13.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols # Unpack all sources and patches -%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 supported_conf() { %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | sort -u } @@ -272,7 +273,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.27.10-$RELEASE-kdump +KERNELRELEASE=2.6.27.13-$RELEASE-kdump EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -320,18 +321,15 @@ | tr -dc 0-9)" export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 EOF source .kernel-binary.spec.buildenv -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" chmod +x scripts/kmsg-doc make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif -%else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y -%endif %install source .rpm-defs @@ -413,7 +411,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then dwarfextract vmlinux %buildroot/boot/Kerntypes-$KERNELRELEASE fi -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif @@ -613,8 +611,6 @@ --max-badness=%tolerate_kabi_changes || KABI=$? fi if [ $KABI -ne 0 ]; then - echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ - "of %tolerate_kabi_changes. Please try to avoid the kABI changes." if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-kdump -a \ ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ @@ -733,8 +729,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun base -f preun-base.sh @@ -777,8 +773,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun extra -f preun-extra.sh @@ -792,8 +788,7 @@ %files -n kernel-kdump-extra -f kernel-extra.files %defattr(-, root, root) %endif -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" %package -n kernel-kdump-man License: GPL v2 only @@ -808,12 +803,11 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %files -n kernel-kdump-man %defattr(-,root,root) /usr/share/man/man9/* %endif -%endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:43.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-pae (Version 2.6.27.10) +# spec file for package kernel-pae (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,7 +47,7 @@ %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/pae$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %ifarch %ix86 x86_64 %define install_vdso 1 @@ -62,8 +62,8 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -98,8 +98,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.10 -Obsoletes: kernel-xenpae <= 2.6.27.10 +Provides: kernel-xenpae = 2.6.27.13 +Obsoletes: kernel-xenpae <= 2.6.27.13 %endif #!BuildIgnore: xen %endif @@ -121,7 +121,7 @@ %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif -Provides: kernel = 2.6.27.10-%source_rel +Provides: kernel = 2.6.27.13-%source_rel Provides: k_smp4G kernel-bigsmp Obsoletes: k_smp4G kernel-bigsmp Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2 @@ -155,6 +155,7 @@ Source110: patches.apparmor.tar.bz2 Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 %define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -198,7 +199,7 @@ %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 6, 8 or 15, # 31 is the maximum; see scripts/kabi-checks) -%define tolerate_kabi_changes 31 +%define tolerate_kabi_changes 6 %description This kernel supports up to 64GB of main memory. It requires Physical @@ -212,18 +213,18 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-pae-2.6.27.10.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.10.src.rpm." + echo "The kernel-pae-2.6.27.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.13.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols # Unpack all sources and patches -%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 supported_conf() { %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | sort -u } @@ -273,7 +274,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.27.10-$RELEASE-pae +KERNELRELEASE=2.6.27.13-$RELEASE-pae EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -321,18 +322,15 @@ | tr -dc 0-9)" export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 EOF source .kernel-binary.spec.buildenv -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" chmod +x scripts/kmsg-doc make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif -%else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y -%endif %install source .rpm-defs @@ -414,7 +412,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then dwarfextract vmlinux %buildroot/boot/Kerntypes-$KERNELRELEASE fi -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif @@ -614,8 +612,6 @@ --max-badness=%tolerate_kabi_changes || KABI=$? fi if [ $KABI -ne 0 ]; then - echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ - "of %tolerate_kabi_changes. Please try to avoid the kABI changes." if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-pae -a \ ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ @@ -738,8 +734,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun base -f preun-base.sh @@ -786,8 +782,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun extra -f preun-extra.sh @@ -801,8 +797,7 @@ %files -n kernel-pae-extra -f kernel-extra.files %defattr(-, root, root) %endif -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" %package -n kernel-pae-man License: GPL v2 only @@ -821,12 +816,11 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %files -n kernel-pae-man %defattr(-,root,root) /usr/share/man/man9/* %endif -%endif ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:43.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 2.6.27.10) +# spec file for package kernel-ppc64 (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,7 +47,7 @@ %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/ppc64$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %ifarch %ix86 x86_64 %define install_vdso 1 @@ -62,8 +62,8 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -98,8 +98,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.10 -Obsoletes: kernel-xenpae <= 2.6.27.10 +Provides: kernel-xenpae = 2.6.27.13 +Obsoletes: kernel-xenpae <= 2.6.27.13 %endif #!BuildIgnore: xen %endif @@ -121,7 +121,7 @@ %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif -Provides: kernel = 2.6.27.10-%source_rel +Provides: kernel = 2.6.27.13-%source_rel %ifarch ppc Provides: kernel-pmac64 kernel-pseries64 kernel-iseries64 Obsoletes: kernel-pmac64 kernel-pseries64 kernel-iseries64 @@ -160,6 +160,7 @@ Source110: patches.apparmor.tar.bz2 Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 %define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -203,7 +204,7 @@ %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 6, 8 or 15, # 31 is the maximum; see scripts/kabi-checks) -%define tolerate_kabi_changes 31 +%define tolerate_kabi_changes 6 %description This package contains the kernel for: @@ -224,18 +225,18 @@ Tom Gall <tom_gall@vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-ppc64-2.6.27.10.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.10.src.rpm." + echo "The kernel-ppc64-2.6.27.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.13.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols # Unpack all sources and patches -%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 supported_conf() { %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | sort -u } @@ -285,7 +286,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.27.10-$RELEASE-ppc64 +KERNELRELEASE=2.6.27.13-$RELEASE-ppc64 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -333,18 +334,15 @@ | tr -dc 0-9)" export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 EOF source .kernel-binary.spec.buildenv -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" chmod +x scripts/kmsg-doc make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif -%else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y -%endif %install source .rpm-defs @@ -426,7 +424,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then dwarfextract vmlinux %buildroot/boot/Kerntypes-$KERNELRELEASE fi -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif @@ -626,8 +624,6 @@ --max-badness=%tolerate_kabi_changes || KABI=$? fi if [ $KABI -ne 0 ]; then - echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ - "of %tolerate_kabi_changes. Please try to avoid the kABI changes." if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-ppc64 -a \ ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ @@ -757,8 +753,8 @@ Tom Gall <tom_gall@vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun base -f preun-base.sh @@ -812,8 +808,8 @@ Tom Gall <tom_gall@vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun extra -f preun-extra.sh @@ -827,8 +823,7 @@ %files -n kernel-ppc64-extra -f kernel-extra.files %defattr(-, root, root) %endif -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" %package -n kernel-ppc64-man License: GPL v2 only @@ -854,12 +849,11 @@ Tom Gall <tom_gall@vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %files -n kernel-ppc64-man %defattr(-,root,root) /usr/share/man/man9/* %endif -%endif ++++++ kernel-ps3.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:44.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ps3 (Version 2.6.27.10) +# spec file for package kernel-ps3 (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,7 +47,7 @@ %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/ps3$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %ifarch %ix86 x86_64 %define install_vdso 1 @@ -62,8 +62,8 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -98,8 +98,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.10 -Obsoletes: kernel-xenpae <= 2.6.27.10 +Provides: kernel-xenpae = 2.6.27.13 +Obsoletes: kernel-xenpae <= 2.6.27.13 %endif #!BuildIgnore: xen %endif @@ -121,7 +121,7 @@ %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif -Provides: kernel = 2.6.27.10-%source_rel +Provides: kernel = 2.6.27.13-%source_rel Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -153,6 +153,7 @@ Source110: patches.apparmor.tar.bz2 Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 %define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -196,7 +197,7 @@ %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 6, 8 or 15, # 31 is the maximum; see scripts/kabi-checks) -%define tolerate_kabi_changes 31 +%define tolerate_kabi_changes 6 %description This package contains the kernel for the PS3 bootloader. PS3 systems @@ -206,18 +207,18 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-ps3-2.6.27.10.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.10.src.rpm." + echo "The kernel-ps3-2.6.27.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.13.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols # Unpack all sources and patches -%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 supported_conf() { %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | sort -u } @@ -267,7 +268,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.27.10-$RELEASE-ps3 +KERNELRELEASE=2.6.27.13-$RELEASE-ps3 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -315,18 +316,15 @@ | tr -dc 0-9)" export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 EOF source .kernel-binary.spec.buildenv -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" chmod +x scripts/kmsg-doc make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif -%else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y -%endif %install source .rpm-defs @@ -408,7 +406,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then dwarfextract vmlinux %buildroot/boot/Kerntypes-$KERNELRELEASE fi -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif @@ -608,8 +606,6 @@ --max-badness=%tolerate_kabi_changes || KABI=$? fi if [ $KABI -ne 0 ]; then - echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ - "of %tolerate_kabi_changes. Please try to avoid the kABI changes." if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-ps3 -a \ ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ @@ -725,8 +721,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun base -f preun-base.sh @@ -766,8 +762,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun extra -f preun-extra.sh @@ -781,8 +777,7 @@ %files -n kernel-ps3-extra -f kernel-extra.files %defattr(-, root, root) %endif -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" %package -n kernel-ps3-man License: GPL v2 only @@ -797,12 +792,11 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %files -n kernel-ps3-man %defattr(-,root,root) /usr/share/man/man9/* %endif -%endif ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:45.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:45.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 2.6.27.10) +# spec file for package kernel-s390 (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,7 +47,7 @@ %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/s390$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %ifarch %ix86 x86_64 %define install_vdso 1 @@ -62,8 +62,8 @@ Name: kernel-s390 Summary: The Standard Kernel -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -98,8 +98,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.10 -Obsoletes: kernel-xenpae <= 2.6.27.10 +Provides: kernel-xenpae = 2.6.27.13 +Obsoletes: kernel-xenpae <= 2.6.27.13 %endif #!BuildIgnore: xen %endif @@ -121,7 +121,7 @@ %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif -Provides: kernel = 2.6.27.10-%source_rel +Provides: kernel = 2.6.27.13-%source_rel Provides: kernel-32bit k_deflt Obsoletes: kernel-32bit k_deflt Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2 @@ -155,6 +155,7 @@ Source110: patches.apparmor.tar.bz2 Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 %define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -198,25 +199,25 @@ %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 6, 8 or 15, # 31 is the maximum; see scripts/kabi-checks) -%define tolerate_kabi_changes 31 +%define tolerate_kabi_changes 6 %description The standard kernel. -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-s390-2.6.27.10.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.10.src.rpm." + echo "The kernel-s390-2.6.27.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.13.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols # Unpack all sources and patches -%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 supported_conf() { %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | sort -u } @@ -266,7 +267,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.27.10-$RELEASE-s390 +KERNELRELEASE=2.6.27.13-$RELEASE-s390 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -314,18 +315,15 @@ | tr -dc 0-9)" export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 EOF source .kernel-binary.spec.buildenv -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" chmod +x scripts/kmsg-doc make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif -%else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y -%endif %install source .rpm-defs @@ -407,7 +405,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then dwarfextract vmlinux %buildroot/boot/Kerntypes-$KERNELRELEASE fi -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif @@ -607,8 +605,6 @@ --max-badness=%tolerate_kabi_changes || KABI=$? fi if [ $KABI -ne 0 ]; then - echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ - "of %tolerate_kabi_changes. Please try to avoid the kABI changes." if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-s390 -a \ ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ @@ -724,8 +720,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun base -f preun-base.sh @@ -765,8 +761,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun extra -f preun-extra.sh @@ -780,8 +776,7 @@ %files -n kernel-s390-extra -f kernel-extra.files %defattr(-, root, root) %endif -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" %package -n kernel-s390-man License: GPL v2 only @@ -793,12 +788,11 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %files -n kernel-s390-man %defattr(-,root,root) /usr/share/man/man9/* %endif -%endif ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:45.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:45.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.27.10) +# spec file for package kernel-source (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -42,7 +42,7 @@ %endif ExclusiveArch: %ix86 ppc ppc64 s390 s390x ia64 x86_64 Provides: linux -Provides: kernel-source = 2.6.27.10-%source_rel +Provides: kernel-source = 2.6.27.13-%source_rel %if "kernel-source" == "kernel-source" Provides: linux lx_suse lx_sus22 lx_sus24 Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24 @@ -83,7 +83,8 @@ Source57: kernel-s390.spec Source58: kernel-trace.spec Source59: kernel-vanilla.spec -Source60: kernel-xen.spec +Source60: kernel-vmi.spec +Source61: kernel-xen.spec Source100: config.tar.bz2 Source101: patches.arch.tar.bz2 Source102: patches.drivers.tar.bz2 @@ -96,6 +97,7 @@ Source110: patches.apparmor.tar.bz2 Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: /usr/src @@ -118,8 +120,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then @@ -128,7 +130,7 @@ fi echo "Architecture symbol(s): %symbols" # Unpack all sources and patches -%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 +%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 %build # Release number without the EXTRAVERSION @@ -136,7 +138,7 @@ while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do RELEASE=${RELEASE#[^0-9]*.} done -KERNELRELEASE=2.6.27.10-$RELEASE +KERNELRELEASE=2.6.27.13-$RELEASE case kernel-source in (*-rt) variant=-rt @@ -165,7 +167,7 @@ > .patches for patch in $(< .patches); do if ! patch -s -F0 -E -p1 --no-backup-if-mismatch \ - -i %_builddir/kernel-source-2.6.27.10/$patch; then + -i %_builddir/kernel-source-2.6.27.13/$patch; then echo "*** Patch $patch failed ***" exit 1 fi @@ -215,6 +217,9 @@ cat $config \ | %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-$RELEASE-$flavor'"' \ | %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \ +%if 0%{?__debug_package:1} + | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \ +%endif > $o/.config MAKE_ARGS="O=$o" # Works around a "fix" in mainline that ends up causing the makefile ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:46.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 2.6.27.10) +# spec file for package kernel-syms (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -39,13 +39,13 @@ %endif ExclusiveArch: %ix86 ppc ppc64 s390 s390x ia64 x86_64 %ifarch %ix86 -BuildRequires: kernel-debug kernel-default kernel-pae kernel-trace kernel-xen +BuildRequires: kernel-debug kernel-default kernel-pae kernel-trace kernel-vmi kernel-xen %else %ifarch ppc BuildRequires: kernel-default kernel-kdump kernel-ppc64 kernel-ps3 %else %ifarch ppc64 -BuildRequires: kernel-default kernel-kdump kernel-ppc64 +BuildRequires: kernel-debug kernel-default kernel-kdump kernel-ppc64 %else %ifarch s390 BuildRequires: kernel-s390 @@ -69,7 +69,7 @@ #!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd Requires: linux -Requires: kernel-source = 2.6.27.10-%source_rel +Requires: kernel-source = 2.6.27.13-%source_rel Source11: arch-symbols Source12: guards Source21: config.conf @@ -94,8 +94,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %prep echo "Architecture symbol(s):" %symbols ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:46.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-trace (Version 2.6.27.10) +# spec file for package kernel-trace (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,7 +47,7 @@ %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/trace$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %ifarch %ix86 x86_64 %define install_vdso 1 @@ -62,8 +62,8 @@ Name: kernel-trace Summary: The Realtime Linux Kernel -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -98,8 +98,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.10 -Obsoletes: kernel-xenpae <= 2.6.27.10 +Provides: kernel-xenpae = 2.6.27.13 +Obsoletes: kernel-xenpae <= 2.6.27.13 %endif #!BuildIgnore: xen %endif @@ -121,7 +121,7 @@ %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif -Provides: kernel = 2.6.27.10-%source_rel +Provides: kernel = 2.6.27.13-%source_rel %ifarch %ix86 %else %ifarch ia64 @@ -161,6 +161,7 @@ Source110: patches.apparmor.tar.bz2 Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 %define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -204,7 +205,7 @@ %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 6, 8 or 15, # 31 is the maximum; see scripts/kabi-checks) -%define tolerate_kabi_changes 31 +%define tolerate_kabi_changes 6 %description This kernel is compiled for realtime applications. @@ -217,18 +218,18 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-trace-2.6.27.10.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.10.src.rpm." + echo "The kernel-trace-2.6.27.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.13.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols # Unpack all sources and patches -%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 supported_conf() { %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | sort -u } @@ -278,7 +279,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.27.10-$RELEASE-trace +KERNELRELEASE=2.6.27.13-$RELEASE-trace EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -326,18 +327,15 @@ | tr -dc 0-9)" export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 EOF source .kernel-binary.spec.buildenv -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" chmod +x scripts/kmsg-doc make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif -%else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y -%endif %install source .rpm-defs @@ -419,7 +417,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then dwarfextract vmlinux %buildroot/boot/Kerntypes-$KERNELRELEASE fi -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif @@ -619,8 +617,6 @@ --max-badness=%tolerate_kabi_changes || KABI=$? fi if [ $KABI -ne 0 ]; then - echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ - "of %tolerate_kabi_changes. Please try to avoid the kABI changes." if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-trace -a \ ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ @@ -740,8 +736,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun base -f preun-base.sh @@ -785,8 +781,8 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun extra -f preun-extra.sh @@ -800,8 +796,7 @@ %files -n kernel-trace-extra -f kernel-extra.files %defattr(-, root, root) %endif -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" %package -n kernel-trace-man License: GPL v2 only @@ -819,12 +814,11 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %files -n kernel-trace-man %defattr(-,root,root) /usr/share/man/man9/* %endif -%endif ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:47.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-vanilla (Version 2.6.27.10) +# spec file for package kernel-vanilla (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,7 +47,7 @@ %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/vanilla$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %ifarch %ix86 x86_64 %define install_vdso 1 @@ -62,8 +62,8 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -98,8 +98,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.10 -Obsoletes: kernel-xenpae <= 2.6.27.10 +Provides: kernel-xenpae = 2.6.27.13 +Obsoletes: kernel-xenpae <= 2.6.27.13 %endif #!BuildIgnore: xen %endif @@ -121,7 +121,7 @@ %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif -Provides: kernel = 2.6.27.10-%source_rel +Provides: kernel = 2.6.27.13-%source_rel %ifarch %ix86 %else %ifarch ia64 @@ -177,6 +177,7 @@ Source110: patches.apparmor.tar.bz2 Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 %define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -220,25 +221,25 @@ %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 6, 8 or 15, # 31 is the maximum; see scripts/kabi-checks) -%define tolerate_kabi_changes 31 +%define tolerate_kabi_changes 6 %description The standard kernel - without any SUSE patches -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-vanilla-2.6.27.10.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.10.src.rpm." + echo "The kernel-vanilla-2.6.27.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.13.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols # Unpack all sources and patches -%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 supported_conf() { %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | sort -u } @@ -288,7 +289,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.27.10-$RELEASE-vanilla +KERNELRELEASE=2.6.27.13-$RELEASE-vanilla EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -336,18 +337,15 @@ | tr -dc 0-9)" export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 EOF source .kernel-binary.spec.buildenv -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" chmod +x scripts/kmsg-doc make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif -%else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y -%endif %install source .rpm-defs @@ -429,7 +427,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then dwarfextract vmlinux %buildroot/boot/Kerntypes-$KERNELRELEASE fi -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif @@ -629,8 +627,6 @@ --max-badness=%tolerate_kabi_changes || KABI=$? fi if [ $KABI -ne 0 ]; then - echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ - "of %tolerate_kabi_changes. Please try to avoid the kABI changes." if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-vanilla -a \ ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ @@ -744,8 +740,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun base -f preun-base.sh @@ -783,8 +779,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun extra -f preun-extra.sh @@ -798,8 +794,7 @@ %files -n kernel-vanilla-extra -f kernel-extra.files %defattr(-, root, root) %endif -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" %package -n kernel-vanilla-man License: GPL v2 only @@ -811,12 +806,11 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %files -n kernel-vanilla-man %defattr(-,root,root) /usr/share/man/man9/* %endif -%endif ++++++ kernel-vmi.spec ++++++ ++++ 28868 lines (skipped) ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:48.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xen (Version 2.6.27.10) +# spec file for package kernel-xen (Version 2.6.27.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,7 +47,7 @@ %define cpu_arch_flavor %(%_sourcedir/guards %symbols < %_sourcedir/config.conf | grep '/xen$') # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %ifarch %ix86 x86_64 %define install_vdso 1 @@ -62,8 +62,8 @@ Name: kernel-xen Summary: The Xen Kernel -Version: 2.6.27.10 -Release: 5 +Version: 2.6.27.13 +Release: 3 License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -98,8 +98,8 @@ %endif %if %build_xen %ifarch %ix86 -Provides: kernel-xenpae = 2.6.27.10 -Obsoletes: kernel-xenpae <= 2.6.27.10 +Provides: kernel-xenpae = 2.6.27.13 +Obsoletes: kernel-xenpae <= 2.6.27.13 %endif #!BuildIgnore: xen %endif @@ -121,7 +121,7 @@ %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif -Provides: kernel = 2.6.27.10-%source_rel +Provides: kernel = 2.6.27.13-%source_rel %ifarch %ix86 %else %ifarch x86_64 @@ -158,6 +158,7 @@ Source110: patches.apparmor.tar.bz2 Source111: patches.rt.tar.bz2 Source112: patches.trace.tar.bz2 +Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 %define my_builddir %_builddir/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -201,7 +202,7 @@ %define tolerate_unknown_new_config_options 0 # kABI change tolerance (default in maintenance should be 4, 6, 8 or 15, # 31 is the maximum; see scripts/kabi-checks) -%define tolerate_kabi_changes 31 +%define tolerate_kabi_changes 6 %description The Linux kernel for Xen paravirtualization. @@ -211,18 +212,18 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %prep if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then - echo "The kernel-xen-2.6.27.10.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.27.10.src.rpm." + echo "The kernel-xen-2.6.27.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.27.13.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols # Unpack all sources and patches -%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 120 +%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 supported_conf() { %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | sort -u } @@ -272,7 +273,7 @@ cpu_arch_flavor="%cpu_arch_flavor" cat >> ../.rpm-defs <<EOF cpu_arch=${cpu_arch_flavor%/*} -KERNELRELEASE=2.6.27.10-$RELEASE-xen +KERNELRELEASE=2.6.27.13-$RELEASE-xen EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -320,18 +321,15 @@ | tr -dc 0-9)" export KBUILD_VERBOSE=0 export KBUILD_SYMTYPES=1 +export KBUILD_OVERRIDE=1 EOF source .kernel-binary.spec.buildenv -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" chmod +x scripts/kmsg-doc make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 %else make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y %endif -%else - make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y -%endif %install source .rpm-defs @@ -413,7 +411,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then dwarfextract vmlinux %buildroot/boot/Kerntypes-$KERNELRELEASE fi -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif @@ -613,8 +611,6 @@ --max-badness=%tolerate_kabi_changes || KABI=$? fi if [ $KABI -ne 0 ]; then - echo "kABI changes of badness $KABI exceed the maximum allowed badness" \ - "of %tolerate_kabi_changes. Please try to avoid the kABI changes." if [ ! -e %my_builddir/kabi/$cpu_arch/ignore-xen -a \ ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \ @@ -733,8 +729,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun base -f preun-base.sh @@ -777,8 +773,8 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %preun extra -f preun-extra.sh @@ -792,8 +788,7 @@ %files -n kernel-xen-extra -f kernel-extra.files %defattr(-, root, root) %endif -%ifarch s390x -%if ! %build_vanilla +%if %CONFIG_KMSG_IDS == "y" %package -n kernel-xen-man License: GPL v2 only @@ -808,12 +803,11 @@ -Source Timestamp: 2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +Source Timestamp: 2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 %files -n kernel-xen-man %defattr(-,root,root) /usr/share/man/man9/* %endif -%endif ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:48.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:48.000000000 +0100 @@ -1,2 +1,2 @@ -2009-01-13 16:46:43 +0100 -GIT Revision: 6d77fbf8a3482dfe1a1fdb9937023093a56fd9ae +2009-01-29 18:46:06 +0100 +GIT Revision: f26939fca9f48c8beb326c77beedf4a50533a024 ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:50.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:50.000000000 +0100 @@ -10,6 +10,7 @@ +IA32 i386/pae +IA32 i386/debug +IA32 i386/xen ++IA32 i386/vmi +IA32 i386/vanilla +IA32 - i386/rt +IA32 - i386/rt_debug @@ -47,6 +48,7 @@ # kernel-default.ppc.rpm and a kernel-default.ppc64.rpm to continue # supporting 32bit and 64bit systems. +ppc64 ppc64/default ++ppc64 ppc64/debug # pSeries +ppc64 ppc64/kdump # G5 pSeries ++++++ config.tar.bz2 ++++++ ++++ 8724 lines of diff (skipped) ++++++ get_release_number.sh ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:52.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:52.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh prefix= suffix= -commit=6d77fbf8 +commit=f26939fc if [ "$3" = kernel-dummy -o -n "$suffix" ]; then [ -n "$suffix" ] || suffix=$2 while [ "$suffix" != "${suffix#[^0-9]*.}" ]; do ++++++ kabi.tar.bz2 ++++++ kernel-source/kabi.tar.bz2 kernel-source/kabi.tar.bz2 differ: byte 11, line 1 ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:57.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:57.000000000 +0100 @@ -1 +1 @@ -2096000 +1048576 ++++++ modversions ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:57.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:57.000000000 +0100 @@ -115,6 +115,7 @@ } my $override = /^override\s/; + s/^override\s//; if (/^([^ ])#(#?)([^ ]+) *(.*)$/) { my $sym = "$1#$3"; ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:20:57.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:20:57.000000000 +0100 @@ -1 +1 @@ -6000 +6144 ++++++ patches.addon.tar.bz2 ++++++ ++++++ patches.apparmor.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/add-path_permission.diff new/patches.apparmor/add-path_permission.diff --- old/patches.apparmor/add-path_permission.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/add-path_permission.diff 2009-01-26 19:33:23.000000000 +0100 @@ -130,7 +130,7 @@ if (err) return ERR_PTR(err); return __lookup_hash(&nd->last, nd->path.dentry, nd); -@@ -2908,6 +2923,7 @@ EXPORT_SYMBOL(page_symlink_inode_operati +@@ -2907,6 +2922,7 @@ EXPORT_SYMBOL(page_symlink_inode_operati EXPORT_SYMBOL(path_lookup); EXPORT_SYMBOL(vfs_path_lookup); EXPORT_SYMBOL(inode_permission); @@ -140,7 +140,7 @@ EXPORT_SYMBOL(unlock_rename); --- a/fs/open.c +++ b/fs/open.c -@@ -250,7 +250,7 @@ static long do_sys_truncate(const char _ +@@ -248,7 +248,7 @@ static long do_sys_truncate(const char _ if (error) goto dput_and_out; @@ -149,7 +149,7 @@ if (error) goto mnt_drop_write_and_out; -@@ -474,7 +474,7 @@ asmlinkage long sys_faccessat(int dfd, c +@@ -493,7 +493,7 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con goto out_path_release; } @@ -158,7 +158,7 @@ /* SuS v2 requires we report a read only fs too */ if (res || !(mode & S_IWOTH) || special_file(inode->i_mode)) goto out_path_release; -@@ -517,7 +517,7 @@ asmlinkage long sys_chdir(const char __u +@@ -536,7 +536,7 @@ SYSCALL_DEFINE1(chdir, const char __user if (error) goto out; @@ -167,7 +167,7 @@ if (error) goto dput_and_out; -@@ -546,7 +546,7 @@ asmlinkage long sys_fchdir(unsigned int +@@ -565,7 +565,7 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd if (!S_ISDIR(inode->i_mode)) goto out_putf; @@ -176,7 +176,7 @@ if (!error) set_fs_pwd(current->fs, &file->f_path); out_putf: -@@ -564,7 +564,7 @@ asmlinkage long sys_chroot(const char __ +@@ -583,7 +583,7 @@ SYSCALL_DEFINE1(chroot, const char __use if (error) goto out; @@ -187,7 +187,7 @@ --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1192,6 +1192,11 @@ extern void dentry_unhash(struct dentry +@@ -1195,6 +1195,11 @@ extern void dentry_unhash(struct dentry extern int file_permission(struct file *, int); /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/d_namespace_path.diff new/patches.apparmor/d_namespace_path.diff --- old/patches.apparmor/d_namespace_path.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/d_namespace_path.diff 2009-01-26 19:33:23.000000000 +0100 @@ -15,7 +15,7 @@ --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -2357,3 +2357,33 @@ void __put_mnt_ns(struct mnt_namespace * +@@ -2299,3 +2299,33 @@ void __put_mnt_ns(struct mnt_namespace * release_mounts(&umount_list); kfree(ns); } @@ -51,7 +51,7 @@ +EXPORT_SYMBOL(d_namespace_path); --- a/include/linux/mount.h +++ b/include/linux/mount.h -@@ -114,4 +114,6 @@ extern void mark_mounts_for_expiry(struc +@@ -134,4 +134,6 @@ extern void mark_mounts_for_expiry(struc extern spinlock_t vfsmount_lock; extern dev_t name_to_dev_t(char *name); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/d_namespace_path_oops_fix.diff new/patches.apparmor/d_namespace_path_oops_fix.diff --- old/patches.apparmor/d_namespace_path_oops_fix.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/d_namespace_path_oops_fix.diff 2009-01-26 19:33:23.000000000 +0100 @@ -12,11 +12,9 @@ fs/namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.27/fs/namespace.c -=================================================================== ---- linux-2.6.27.orig/fs/namespace.c 2008-10-31 11:58:02.000000000 +0100 -+++ linux-2.6.27/fs/namespace.c 2008-10-31 14:53:44.000000000 +0100 -@@ -2370,7 +2370,7 @@ char *d_namespace_path(struct dentry *de +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -2312,7 +2312,7 @@ char *d_namespace_path(struct dentry *de path_get(¤t->fs->root); read_unlock(¤t->fs->lock); spin_lock(&vfsmount_lock); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/file-handle-ops.diff new/patches.apparmor/file-handle-ops.diff --- old/patches.apparmor/file-handle-ops.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/file-handle-ops.diff 2009-01-24 01:45:04.000000000 +0100 @@ -63,7 +63,7 @@ } --- a/fs/open.c +++ b/fs/open.c -@@ -604,7 +604,7 @@ asmlinkage long sys_fchmod(unsigned int +@@ -623,7 +623,7 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd if (mode == (mode_t) -1) mode = inode->i_mode; newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); @@ -72,7 +72,7 @@ err = fnotify_change(dentry, file->f_path.mnt, &newattrs, file); mutex_unlock(&inode->i_mutex); mnt_drop_write(file->f_path.mnt); -@@ -668,6 +668,9 @@ static int chown_common(struct dentry * +@@ -686,6 +686,9 @@ static int chown_common(struct dentry * if (!S_ISDIR(inode->i_mode)) newattrs.ia_valid |= ATTR_KILL_SUID | ATTR_KILL_SGID | ATTR_KILL_PRIV; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/fsetattr.diff new/patches.apparmor/fsetattr.diff --- old/patches.apparmor/fsetattr.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/fsetattr.diff 2009-01-26 19:33:23.000000000 +0100 @@ -260,7 +260,7 @@ */ --- a/fs/open.c +++ b/fs/open.c -@@ -209,16 +209,12 @@ int do_truncate(struct dentry *dentry, s +@@ -207,16 +207,12 @@ int do_truncate(struct dentry *dentry, s newattrs.ia_size = length; newattrs.ia_valid = ATTR_SIZE | time_attrs; @@ -278,7 +278,7 @@ mutex_unlock(&dentry->d_inode->i_mutex); return err; } -@@ -606,7 +602,7 @@ asmlinkage long sys_fchmod(unsigned int +@@ -625,7 +621,7 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd mode = inode->i_mode; newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; @@ -287,7 +287,7 @@ mutex_unlock(&inode->i_mutex); mnt_drop_write(file->f_path.mnt); out_putf: -@@ -651,7 +647,7 @@ asmlinkage long sys_chmod(const char __u +@@ -669,7 +665,7 @@ SYSCALL_DEFINE2(chmod, const char __user } static int chown_common(struct dentry * dentry, struct vfsmount *mnt, @@ -296,7 +296,7 @@ { struct inode *inode = dentry->d_inode; int error; -@@ -670,7 +666,7 @@ static int chown_common(struct dentry * +@@ -688,7 +684,7 @@ static int chown_common(struct dentry * newattrs.ia_valid |= ATTR_KILL_SUID | ATTR_KILL_SGID | ATTR_KILL_PRIV; mutex_lock(&inode->i_mutex); @@ -305,7 +305,7 @@ mutex_unlock(&inode->i_mutex); return error; -@@ -687,7 +683,7 @@ asmlinkage long sys_chown(const char __u +@@ -705,7 +701,7 @@ SYSCALL_DEFINE3(chown, const char __user error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -314,7 +314,7 @@ mnt_drop_write(path.mnt); out_release: path_put(&path); -@@ -712,7 +708,7 @@ asmlinkage long sys_fchownat(int dfd, co +@@ -730,7 +726,7 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -323,7 +323,7 @@ mnt_drop_write(path.mnt); out_release: path_put(&path); -@@ -731,7 +727,7 @@ asmlinkage long sys_lchown(const char __ +@@ -749,7 +745,7 @@ SYSCALL_DEFINE3(lchown, const char __use error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -332,7 +332,7 @@ mnt_drop_write(path.mnt); out_release: path_put(&path); -@@ -755,7 +751,7 @@ asmlinkage long sys_fchown(unsigned int +@@ -772,7 +768,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd goto out_fput; dentry = file->f_path.dentry; audit_inode(NULL, dentry); @@ -396,7 +396,7 @@ }; /* -@@ -1271,6 +1264,7 @@ struct file_operations { +@@ -1274,6 +1267,7 @@ struct file_operations { #define HAVE_FOP_OPEN_EXEC int (*open_exec) (struct inode *); int (*setlease)(struct file *, long, struct file_lock **); @@ -404,7 +404,7 @@ }; struct inode_operations { -@@ -1790,6 +1784,7 @@ extern int do_remount_sb(struct super_bl +@@ -1793,6 +1787,7 @@ extern int do_remount_sb(struct super_bl extern sector_t bmap(struct inode *, sector_t); #endif extern int notify_change(struct dentry *, struct vfsmount *, struct iattr *); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/fsetattr-reintro-ATTR_FILE.diff new/patches.apparmor/fsetattr-reintro-ATTR_FILE.diff --- old/patches.apparmor/fsetattr-reintro-ATTR_FILE.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/fsetattr-reintro-ATTR_FILE.diff 2009-01-24 01:45:04.000000000 +0100 @@ -16,7 +16,7 @@ --- a/fs/open.c +++ b/fs/open.c -@@ -210,6 +210,9 @@ int do_truncate(struct dentry *dentry, s +@@ -208,6 +208,9 @@ int do_truncate(struct dentry *dentry, s newattrs.ia_size = length; newattrs.ia_valid = ATTR_SIZE | time_attrs; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/remove_suid.diff new/patches.apparmor/remove_suid.diff --- old/patches.apparmor/remove_suid.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/remove_suid.diff 2009-01-26 19:33:23.000000000 +0100 @@ -15,7 +15,7 @@ --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -1764,12 +1764,12 @@ int should_remove_suid(struct dentry *de +@@ -1826,12 +1826,12 @@ int should_remove_suid(struct dentry *de } EXPORT_SYMBOL(should_remove_suid); @@ -30,7 +30,7 @@ } int file_remove_suid(struct file *file) -@@ -1784,7 +1784,7 @@ int file_remove_suid(struct file *file) +@@ -1846,7 +1846,7 @@ int file_remove_suid(struct file *file) if (killpriv) error = security_inode_killpriv(dentry); if (!error && killsuid) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-readlink.diff new/patches.apparmor/security-readlink.diff --- old/patches.apparmor/security-readlink.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/security-readlink.diff 2009-01-24 01:45:04.000000000 +0100 @@ -17,7 +17,7 @@ --- a/fs/stat.c +++ b/fs/stat.c -@@ -306,7 +306,7 @@ asmlinkage long sys_readlinkat(int dfd, +@@ -308,7 +308,7 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, co error = -EINVAL; if (inode->i_op && inode->i_op->readlink) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-rename.diff new/patches.apparmor/security-rename.diff --- old/patches.apparmor/security-rename.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/security-rename.diff 2009-01-24 01:45:04.000000000 +0100 @@ -18,7 +18,7 @@ --- a/fs/namei.c +++ b/fs/namei.c -@@ -2564,7 +2564,8 @@ static int vfs_rename_dir(struct inode * +@@ -2563,7 +2563,8 @@ static int vfs_rename_dir(struct inode * return error; } @@ -28,7 +28,7 @@ if (error) return error; -@@ -2598,7 +2599,8 @@ static int vfs_rename_other(struct inode +@@ -2597,7 +2598,8 @@ static int vfs_rename_other(struct inode struct inode *target; int error; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-xattr-file.diff new/patches.apparmor/security-xattr-file.diff --- old/patches.apparmor/security-xattr-file.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/security-xattr-file.diff 2009-01-24 01:45:04.000000000 +0100 @@ -19,8 +19,8 @@ security/smack/smack_lsm.c | 14 ++++++---- 8 files changed, 87 insertions(+), 69 deletions(-) ---- a/fs/xattr.c -+++ b/fs/xattr.c +--- linux-2.6.27.orig/fs/xattr.c ++++ linux-2.6.27/fs/xattr.c @@ -68,7 +68,7 @@ xattr_permission(struct inode *inode, co int @@ -109,7 +109,7 @@ kfree(kvalue); return error; } -@@ -266,7 +267,7 @@ sys_setxattr(const char __user *pathname +@@ -266,7 +267,7 @@ SYSCALL_DEFINE5(setxattr, const char __u return error; error = mnt_want_write(path.mnt); if (!error) { @@ -118,7 +118,7 @@ mnt_drop_write(path.mnt); } path_put(&path); -@@ -285,7 +286,7 @@ sys_lsetxattr(const char __user *pathnam +@@ -285,7 +286,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __ return error; error = mnt_want_write(path.mnt); if (!error) { @@ -127,9 +127,9 @@ mnt_drop_write(path.mnt); } path_put(&path); -@@ -307,7 +308,8 @@ sys_fsetxattr(int fd, const char __user +@@ -306,7 +307,8 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, cons audit_inode(NULL, dentry); - error = mnt_want_write(f->f_path.mnt); + error = mnt_want_write_file(f->f_path.mnt, f); if (!error) { - error = setxattr(dentry, f->f_vfsmnt, name, value, size, flags); + error = setxattr(dentry, f->f_vfsmnt, name, value, size, flags, @@ -137,7 +137,7 @@ mnt_drop_write(f->f_path.mnt); } fput(f); -@@ -319,7 +321,7 @@ sys_fsetxattr(int fd, const char __user +@@ -318,7 +320,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, cons */ static ssize_t getxattr(struct dentry *dentry, struct vfsmount *mnt, const char __user *name, @@ -146,7 +146,7 @@ { ssize_t error; void *kvalue = NULL; -@@ -339,7 +341,7 @@ getxattr(struct dentry *dentry, struct v +@@ -338,7 +340,7 @@ getxattr(struct dentry *dentry, struct v return -ENOMEM; } @@ -155,7 +155,7 @@ if (error > 0) { if (size && copy_to_user(value, kvalue, error)) error = -EFAULT; -@@ -362,7 +364,7 @@ sys_getxattr(const char __user *pathname +@@ -360,7 +362,7 @@ SYSCALL_DEFINE4(getxattr, const char __u error = user_path(pathname, &path); if (error) return error; @@ -164,7 +164,7 @@ path_put(&path); return error; } -@@ -377,7 +379,7 @@ sys_lgetxattr(const char __user *pathnam +@@ -374,7 +376,7 @@ SYSCALL_DEFINE4(lgetxattr, const char __ error = user_lpath(pathname, &path); if (error) return error; @@ -173,7 +173,7 @@ path_put(&path); return error; } -@@ -392,7 +394,7 @@ sys_fgetxattr(int fd, const char __user +@@ -389,7 +391,7 @@ SYSCALL_DEFINE4(fgetxattr, int, fd, cons if (!f) return error; audit_inode(NULL, f->f_path.dentry); @@ -182,7 +182,7 @@ fput(f); return error; } -@@ -402,7 +404,7 @@ sys_fgetxattr(int fd, const char __user +@@ -399,7 +401,7 @@ SYSCALL_DEFINE4(fgetxattr, int, fd, cons */ static ssize_t listxattr(struct dentry *dentry, struct vfsmount *mnt, char __user *list, @@ -191,7 +191,7 @@ { ssize_t error; char *klist = NULL; -@@ -415,7 +417,7 @@ listxattr(struct dentry *dentry, struct +@@ -412,7 +414,7 @@ listxattr(struct dentry *dentry, struct return -ENOMEM; } @@ -200,7 +200,7 @@ if (error > 0) { if (size && copy_to_user(list, klist, error)) error = -EFAULT; -@@ -437,7 +439,7 @@ sys_listxattr(const char __user *pathnam +@@ -434,7 +436,7 @@ SYSCALL_DEFINE3(listxattr, const char __ error = user_path(pathname, &path); if (error) return error; @@ -209,7 +209,7 @@ path_put(&path); return error; } -@@ -451,7 +453,7 @@ sys_llistxattr(const char __user *pathna +@@ -448,7 +450,7 @@ SYSCALL_DEFINE3(llistxattr, const char _ error = user_lpath(pathname, &path); if (error) return error; @@ -218,7 +218,7 @@ path_put(&path); return error; } -@@ -466,7 +468,7 @@ sys_flistxattr(int fd, char __user *list +@@ -462,7 +464,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, cha if (!f) return error; audit_inode(NULL, f->f_path.dentry); @@ -227,7 +227,7 @@ fput(f); return error; } -@@ -475,7 +477,8 @@ sys_flistxattr(int fd, char __user *list +@@ -471,7 +473,8 @@ SYSCALL_DEFINE3(flistxattr, int, fd, cha * Extended attribute REMOVE operations */ static long @@ -237,7 +237,7 @@ { int error; char kname[XATTR_NAME_MAX + 1]; -@@ -486,7 +489,7 @@ removexattr(struct dentry *dentry, struc +@@ -482,7 +485,7 @@ removexattr(struct dentry *dentry, struc if (error < 0) return error; @@ -245,8 +245,8 @@ + return vfs_removexattr(dentry, mnt, kname, file); } - asmlinkage long -@@ -500,7 +503,7 @@ sys_removexattr(const char __user *pathn + SYSCALL_DEFINE2(removexattr, const char __user *, pathname, +@@ -496,7 +499,7 @@ SYSCALL_DEFINE2(removexattr, const char return error; error = mnt_want_write(path.mnt); if (!error) { @@ -255,7 +255,7 @@ mnt_drop_write(path.mnt); } path_put(&path); -@@ -518,7 +521,7 @@ sys_lremovexattr(const char __user *path +@@ -514,7 +517,7 @@ SYSCALL_DEFINE2(lremovexattr, const char return error; error = mnt_want_write(path.mnt); if (!error) { @@ -264,17 +264,17 @@ mnt_drop_write(path.mnt); } path_put(&path); -@@ -539,7 +542,7 @@ sys_fremovexattr(int fd, const char __us +@@ -534,7 +537,7 @@ SYSCALL_DEFINE2(fremovexattr, int, fd, c audit_inode(NULL, dentry); - error = mnt_want_write(f->f_path.mnt); + error = mnt_want_write_file(f->f_path.mnt, f); if (!error) { - error = removexattr(dentry, f->f_path.mnt, name); + error = removexattr(dentry, f->f_path.mnt, name, f); mnt_drop_write(f->f_path.mnt); } fput(f); ---- a/include/linux/security.h -+++ b/include/linux/security.h +--- linux-2.6.27.orig/include/linux/security.h ++++ linux-2.6.27/include/linux/security.h @@ -56,9 +56,9 @@ extern void cap_bprm_apply_creds(struct extern int cap_bprm_secureexec(struct linux_binprm *bprm); extern int cap_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt, @@ -373,8 +373,8 @@ } static inline int security_inode_need_killpriv(struct dentry *dentry) ---- a/include/linux/xattr.h -+++ b/include/linux/xattr.h +--- linux-2.6.27.orig/include/linux/xattr.h ++++ linux-2.6.27/include/linux/xattr.h @@ -17,6 +17,7 @@ #include <linux/types.h> @@ -398,8 +398,8 @@ ssize_t generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t size); ssize_t generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size); ---- a/security/capability.c -+++ b/security/capability.c +--- linux-2.6.27.orig/security/capability.c ++++ linux-2.6.27/security/capability.c @@ -242,12 +242,13 @@ static void cap_inode_post_setxattr(stru } @@ -416,8 +416,8 @@ { return 0; } ---- a/security/commoncap.c -+++ b/security/commoncap.c +--- linux-2.6.27.orig/security/commoncap.c ++++ linux-2.6.27/security/commoncap.c @@ -416,7 +416,7 @@ int cap_bprm_secureexec (struct linux_bi int cap_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt, @@ -436,8 +436,8 @@ { if (!strcmp(name, XATTR_NAME_CAPS)) { if (!capable(CAP_SETFCAP)) ---- a/security/security.c -+++ b/security/security.c +--- linux-2.6.27.orig/security/security.c ++++ linux-2.6.27/security/security.c @@ -473,12 +473,12 @@ void security_inode_delete(struct inode int security_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt, @@ -487,8 +487,8 @@ } int security_inode_need_killpriv(struct dentry *dentry) ---- a/security/selinux/hooks.c -+++ b/security/selinux/hooks.c +--- linux-2.6.27.orig/security/selinux/hooks.c ++++ linux-2.6.27/security/selinux/hooks.c @@ -2715,7 +2715,7 @@ static int selinux_inode_setotherxattr(s static int selinux_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt, @@ -522,8 +522,8 @@ { if (strcmp(name, XATTR_NAME_SELINUX)) return selinux_inode_setotherxattr(dentry, name); ---- a/security/smack/smack_lsm.c -+++ b/security/smack/smack_lsm.c +--- linux-2.6.27.orig/security/smack/smack_lsm.c ++++ linux-2.6.27/security/smack/smack_lsm.c @@ -600,6 +600,7 @@ static int smack_inode_getattr(struct vf * @value: unused * @size: unused diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/unambiguous-__d_path.diff new/patches.apparmor/unambiguous-__d_path.diff --- old/patches.apparmor/unambiguous-__d_path.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/unambiguous-__d_path.diff 2009-01-24 01:45:04.000000000 +0100 @@ -32,7 +32,7 @@ --- a/fs/dcache.c +++ b/fs/dcache.c -@@ -1897,44 +1897,46 @@ static int prepend_name(char **buffer, i +@@ -1898,44 +1898,46 @@ static int prepend_name(char **buffer, i * @root: root vfsmnt/dentry (may be modified by this function) * @buffer: buffer to return value in * @buflen: buffer length @@ -100,7 +100,7 @@ if (vfsmnt->mnt_parent == vfsmnt) { goto global_root; } -@@ -1944,27 +1946,51 @@ char *__d_path(const struct path *path, +@@ -1945,27 +1947,51 @@ char *__d_path(const struct path *path, } parent = dentry->d_parent; prefetch(parent); @@ -159,7 +159,7 @@ goto out; } -@@ -2001,10 +2027,8 @@ char *d_path(const struct path *path, ch +@@ -2002,10 +2028,8 @@ char *d_path(const struct path *path, ch root = current->fs->root; path_get(&root); read_unlock(¤t->fs->lock); @@ -171,9 +171,9 @@ path_put(&root); return res; } -@@ -2087,9 +2111,9 @@ Elong: +@@ -2088,9 +2112,9 @@ Elong: */ - asmlinkage long sys_getcwd(char __user *buf, unsigned long size) + SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size) { - int error; - struct path pwd, root; @@ -184,7 +184,7 @@ if (!page) return -ENOMEM; -@@ -2101,30 +2125,20 @@ asmlinkage long sys_getcwd(char __user * +@@ -2102,30 +2126,20 @@ SYSCALL_DEFINE2(getcwd, char __user *, b path_get(&root); read_unlock(¤t->fs->lock); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-getxattr.diff new/patches.apparmor/vfs-getxattr.diff --- old/patches.apparmor/vfs-getxattr.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/vfs-getxattr.diff 2009-01-24 01:45:04.000000000 +0100 @@ -118,7 +118,7 @@ { struct inode *inode = dentry->d_inode; int error; -@@ -315,8 +316,8 @@ sys_fsetxattr(int fd, const char __user +@@ -314,8 +315,8 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, cons * Extended attribute GET operations */ static ssize_t @@ -129,7 +129,7 @@ { ssize_t error; void *kvalue = NULL; -@@ -336,7 +337,7 @@ getxattr(struct dentry *d, const char __ +@@ -335,7 +336,7 @@ getxattr(struct dentry *d, const char __ return -ENOMEM; } @@ -138,7 +138,7 @@ if (error > 0) { if (size && copy_to_user(value, kvalue, error)) error = -EFAULT; -@@ -359,7 +360,7 @@ sys_getxattr(const char __user *pathname +@@ -357,7 +358,7 @@ SYSCALL_DEFINE4(getxattr, const char __u error = user_path(pathname, &path); if (error) return error; @@ -147,7 +147,7 @@ path_put(&path); return error; } -@@ -374,7 +375,7 @@ sys_lgetxattr(const char __user *pathnam +@@ -371,7 +372,7 @@ SYSCALL_DEFINE4(lgetxattr, const char __ error = user_lpath(pathname, &path); if (error) return error; @@ -156,7 +156,7 @@ path_put(&path); return error; } -@@ -389,7 +390,7 @@ sys_fgetxattr(int fd, const char __user +@@ -386,7 +387,7 @@ SYSCALL_DEFINE4(fgetxattr, int, fd, cons if (!f) return error; audit_inode(NULL, f->f_path.dentry); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-link.diff new/patches.apparmor/vfs-link.diff --- old/patches.apparmor/vfs-link.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/vfs-link.diff 2009-01-26 19:33:23.000000000 +0100 @@ -46,7 +46,7 @@ rc = ecryptfs_interpose(lower_new_dentry, new_dentry, dir->i_sb, 0); --- a/fs/namei.c +++ b/fs/namei.c -@@ -2412,7 +2412,7 @@ asmlinkage long sys_symlink(const char _ +@@ -2412,7 +2412,7 @@ SYSCALL_DEFINE2(symlink, const char __us return sys_symlinkat(oldname, AT_FDCWD, newname); } @@ -55,7 +55,7 @@ { struct inode *inode = old_dentry->d_inode; int error; -@@ -2491,7 +2491,9 @@ asmlinkage long sys_linkat(int olddfd, c +@@ -2490,7 +2490,9 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con error = mnt_want_write(nd.path.mnt); if (error) goto out_dput; @@ -80,7 +80,7 @@ err = nfserrno(nfsd_sync_dir(ddir)); --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1172,7 +1172,7 @@ extern int vfs_create(struct inode *, st +@@ -1175,7 +1175,7 @@ extern int vfs_create(struct inode *, st extern int vfs_mkdir(struct inode *, struct dentry *, struct vfsmount *, int); extern int vfs_mknod(struct inode *, struct dentry *, struct vfsmount *, int, dev_t); extern int vfs_symlink(struct inode *, struct dentry *, struct vfsmount *, const char *); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-listxattr.diff new/patches.apparmor/vfs-listxattr.diff --- old/patches.apparmor/vfs-listxattr.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/vfs-listxattr.diff 2009-01-24 01:45:04.000000000 +0100 @@ -42,7 +42,7 @@ if (size && error > size) error = -ERANGE; } -@@ -399,7 +401,8 @@ sys_fgetxattr(int fd, const char __user +@@ -396,7 +398,8 @@ SYSCALL_DEFINE4(fgetxattr, int, fd, cons * Extended attribute LIST operations */ static ssize_t @@ -52,7 +52,7 @@ { ssize_t error; char *klist = NULL; -@@ -412,7 +415,7 @@ listxattr(struct dentry *d, char __user +@@ -409,7 +412,7 @@ listxattr(struct dentry *d, char __user return -ENOMEM; } @@ -61,7 +61,7 @@ if (error > 0) { if (size && copy_to_user(list, klist, error)) error = -EFAULT; -@@ -434,7 +437,7 @@ sys_listxattr(const char __user *pathnam +@@ -431,7 +434,7 @@ SYSCALL_DEFINE3(listxattr, const char __ error = user_path(pathname, &path); if (error) return error; @@ -70,7 +70,7 @@ path_put(&path); return error; } -@@ -448,7 +451,7 @@ sys_llistxattr(const char __user *pathna +@@ -445,7 +448,7 @@ SYSCALL_DEFINE3(llistxattr, const char _ error = user_lpath(pathname, &path); if (error) return error; @@ -79,7 +79,7 @@ path_put(&path); return error; } -@@ -463,7 +466,7 @@ sys_flistxattr(int fd, char __user *list +@@ -459,7 +462,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, cha if (!f) return error; audit_inode(NULL, f->f_path.dentry); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-mkdir.diff new/patches.apparmor/vfs-mkdir.diff --- old/patches.apparmor/vfs-mkdir.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/vfs-mkdir.diff 2009-01-26 19:33:23.000000000 +0100 @@ -37,7 +37,7 @@ rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0); --- a/fs/namei.c +++ b/fs/namei.c -@@ -2077,7 +2077,8 @@ asmlinkage long sys_mknod(const char __u +@@ -2077,7 +2077,8 @@ SYSCALL_DEFINE3(mknod, const char __user return sys_mknodat(AT_FDCWD, filename, mode, dev); } @@ -47,7 +47,7 @@ { int error = may_create(dir, dentry, 1); -@@ -2120,7 +2121,7 @@ asmlinkage long sys_mkdirat(int dfd, con +@@ -2120,7 +2121,7 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const error = mnt_want_write(nd.path.mnt); if (error) goto out_dput; @@ -115,7 +115,7 @@ } --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1169,7 +1169,7 @@ extern void unlock_super(struct super_bl +@@ -1172,7 +1172,7 @@ extern void unlock_super(struct super_bl */ extern int vfs_permission(struct nameidata *, int); extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *); @@ -126,7 +126,7 @@ extern int vfs_link(struct dentry *, struct inode *, struct dentry *); --- a/kernel/cgroup.c +++ b/kernel/cgroup.c -@@ -2907,7 +2907,7 @@ int cgroup_clone(struct task_struct *tsk +@@ -2911,7 +2911,7 @@ int cgroup_clone(struct task_struct *tsk } /* Create the cgroup directory, which also creates the cgroup */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-mknod.diff new/patches.apparmor/vfs-mknod.diff --- old/patches.apparmor/vfs-mknod.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/vfs-mknod.diff 2009-01-26 19:33:23.000000000 +0100 @@ -46,7 +46,7 @@ { int error = may_create(dir, dentry, 0); -@@ -2054,11 +2055,12 @@ asmlinkage long sys_mknodat(int dfd, con +@@ -2054,11 +2055,12 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const error = vfs_create(nd.path.dentry->d_inode,dentry,mode,&nd); break; case S_IFCHR: case S_IFBLK: @@ -76,7 +76,7 @@ if (host_err < 0) { --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1170,7 +1170,7 @@ extern void unlock_super(struct super_bl +@@ -1173,7 +1173,7 @@ extern void unlock_super(struct super_bl extern int vfs_permission(struct nameidata *, int); extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *); extern int vfs_mkdir(struct inode *, struct dentry *, struct vfsmount *, int); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-notify_change.diff new/patches.apparmor/vfs-notify_change.diff --- old/patches.apparmor/vfs-notify_change.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/vfs-notify_change.diff 2009-01-26 19:33:23.000000000 +0100 @@ -36,7 +36,7 @@ mode_t mode = inode->i_mode; --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c -@@ -849,6 +849,7 @@ static int ecryptfs_setattr(struct dentr +@@ -850,6 +850,7 @@ static int ecryptfs_setattr(struct dentr { int rc = 0; struct dentry *lower_dentry; @@ -44,7 +44,7 @@ struct inode *inode; struct inode *lower_inode; struct ecryptfs_crypt_stat *crypt_stat; -@@ -859,6 +860,7 @@ static int ecryptfs_setattr(struct dentr +@@ -860,6 +861,7 @@ static int ecryptfs_setattr(struct dentr inode = dentry->d_inode; lower_inode = ecryptfs_inode_to_lower(inode); lower_dentry = ecryptfs_dentry_to_lower(dentry); @@ -52,7 +52,7 @@ mutex_lock(&crypt_stat->cs_mutex); if (S_ISDIR(dentry->d_inode->i_mode)) crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED); -@@ -910,7 +912,7 @@ static int ecryptfs_setattr(struct dentr +@@ -911,7 +913,7 @@ static int ecryptfs_setattr(struct dentr ia->ia_valid &= ~ATTR_MODE; mutex_lock(&lower_dentry->d_inode->i_mutex); @@ -133,7 +133,7 @@ static ino_t last_ino; --- a/fs/open.c +++ b/fs/open.c -@@ -197,8 +197,8 @@ out: +@@ -195,8 +195,8 @@ out: return error; } @@ -144,7 +144,7 @@ { int err; struct iattr newattrs; -@@ -218,7 +218,7 @@ int do_truncate(struct dentry *dentry, l +@@ -216,7 +216,7 @@ int do_truncate(struct dentry *dentry, l newattrs.ia_valid |= should_remove_suid(dentry); mutex_lock(&dentry->d_inode->i_mutex); @@ -153,7 +153,7 @@ mutex_unlock(&dentry->d_inode->i_mutex); return err; } -@@ -274,7 +274,7 @@ static long do_sys_truncate(const char _ +@@ -272,7 +272,7 @@ static long do_sys_truncate(const char _ error = locks_verify_truncate(inode, NULL, length); if (!error) { DQUOT_INIT(inode); @@ -162,7 +162,7 @@ } put_write_and_out: -@@ -329,7 +329,8 @@ static long do_sys_ftruncate(unsigned in +@@ -327,7 +327,8 @@ static long do_sys_ftruncate(unsigned in error = locks_verify_truncate(inode, file, length); if (!error) @@ -172,7 +172,7 @@ out_putf: fput(file); out: -@@ -605,7 +606,7 @@ asmlinkage long sys_fchmod(unsigned int +@@ -624,7 +625,7 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd mode = inode->i_mode; newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; @@ -181,7 +181,7 @@ mutex_unlock(&inode->i_mutex); mnt_drop_write(file->f_path.mnt); out_putf: -@@ -635,7 +636,7 @@ asmlinkage long sys_fchmodat(int dfd, co +@@ -653,7 +654,7 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons mode = inode->i_mode; newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; @@ -190,7 +190,7 @@ mutex_unlock(&inode->i_mutex); mnt_drop_write(path.mnt); dput_and_out: -@@ -649,7 +650,8 @@ asmlinkage long sys_chmod(const char __u +@@ -667,7 +668,8 @@ SYSCALL_DEFINE2(chmod, const char __user return sys_fchmodat(AT_FDCWD, filename, mode); } @@ -200,7 +200,7 @@ { struct inode *inode = dentry->d_inode; int error; -@@ -668,7 +670,7 @@ static int chown_common(struct dentry * +@@ -686,7 +688,7 @@ static int chown_common(struct dentry * newattrs.ia_valid |= ATTR_KILL_SUID | ATTR_KILL_SGID | ATTR_KILL_PRIV; mutex_lock(&inode->i_mutex); @@ -209,7 +209,7 @@ mutex_unlock(&inode->i_mutex); return error; -@@ -685,7 +687,7 @@ asmlinkage long sys_chown(const char __u +@@ -703,7 +705,7 @@ SYSCALL_DEFINE3(chown, const char __user error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -218,7 +218,7 @@ mnt_drop_write(path.mnt); out_release: path_put(&path); -@@ -710,7 +712,7 @@ asmlinkage long sys_fchownat(int dfd, co +@@ -728,7 +730,7 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -227,7 +227,7 @@ mnt_drop_write(path.mnt); out_release: path_put(&path); -@@ -729,7 +731,7 @@ asmlinkage long sys_lchown(const char __ +@@ -747,7 +749,7 @@ SYSCALL_DEFINE3(lchown, const char __use error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -236,7 +236,7 @@ mnt_drop_write(path.mnt); out_release: path_put(&path); -@@ -753,7 +755,7 @@ asmlinkage long sys_fchown(unsigned int +@@ -770,7 +772,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd goto out_fput; dentry = file->f_path.dentry; audit_inode(NULL, dentry); @@ -258,7 +258,7 @@ mnt_drop_write_and_out: --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1627,8 +1627,8 @@ static inline int break_lease(struct ino +@@ -1630,8 +1630,8 @@ static inline int break_lease(struct ino /* fs/open.c */ @@ -269,7 +269,7 @@ extern long do_sys_open(int dfd, const char __user *filename, int flags, int mode); extern struct file *filp_open(const char *, int, int); -@@ -1789,7 +1789,7 @@ extern int do_remount_sb(struct super_bl +@@ -1792,7 +1792,7 @@ extern int do_remount_sb(struct super_bl #ifdef CONFIG_BLOCK extern sector_t bmap(struct inode *, sector_t); #endif @@ -280,7 +280,7 @@ int (*check_acl)(struct inode *, int)); --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -1769,7 +1769,7 @@ static int __remove_suid(struct path *pa +@@ -1831,7 +1831,7 @@ static int __remove_suid(struct path *pa struct iattr newattrs; newattrs.ia_valid = ATTR_FORCE | kill; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-removexattr.diff new/patches.apparmor/vfs-removexattr.diff --- old/patches.apparmor/vfs-removexattr.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/vfs-removexattr.diff 2009-01-24 01:45:04.000000000 +0100 @@ -14,8 +14,8 @@ include/linux/xattr.h | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) ---- a/fs/nfsd/vfs.c -+++ b/fs/nfsd/vfs.c +--- linux-2.6.27.orig/fs/nfsd/vfs.c ++++ linux-2.6.27/fs/nfsd/vfs.c @@ -2095,6 +2095,7 @@ nfsd_get_posix_acl(struct svc_fh *fhp, i int nfsd_set_posix_acl(struct svc_fh *fhp, int type, struct posix_acl *acl) @@ -52,8 +52,8 @@ getout: kfree(value); ---- a/fs/xattr.c -+++ b/fs/xattr.c +--- linux-2.6.27.orig/fs/xattr.c ++++ linux-2.6.27/fs/xattr.c @@ -190,7 +190,7 @@ vfs_listxattr(struct dentry *dentry, str EXPORT_SYMBOL_GPL(vfs_listxattr); @@ -63,7 +63,7 @@ { struct inode *inode = dentry->d_inode; int error; -@@ -475,7 +475,7 @@ sys_flistxattr(int fd, char __user *list +@@ -471,7 +471,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, cha * Extended attribute REMOVE operations */ static long @@ -72,7 +72,7 @@ { int error; char kname[XATTR_NAME_MAX + 1]; -@@ -486,7 +486,7 @@ removexattr(struct dentry *d, const char +@@ -482,7 +482,7 @@ removexattr(struct dentry *d, const char if (error < 0) return error; @@ -80,8 +80,8 @@ + return vfs_removexattr(dentry, mnt, kname); } - asmlinkage long -@@ -500,7 +500,7 @@ sys_removexattr(const char __user *pathn + SYSCALL_DEFINE2(removexattr, const char __user *, pathname, +@@ -496,7 +496,7 @@ SYSCALL_DEFINE2(removexattr, const char return error; error = mnt_want_write(path.mnt); if (!error) { @@ -90,7 +90,7 @@ mnt_drop_write(path.mnt); } path_put(&path); -@@ -518,7 +518,7 @@ sys_lremovexattr(const char __user *path +@@ -514,7 +514,7 @@ SYSCALL_DEFINE2(lremovexattr, const char return error; error = mnt_want_write(path.mnt); if (!error) { @@ -99,17 +99,17 @@ mnt_drop_write(path.mnt); } path_put(&path); -@@ -539,7 +539,7 @@ sys_fremovexattr(int fd, const char __us +@@ -534,7 +534,7 @@ SYSCALL_DEFINE2(fremovexattr, int, fd, c audit_inode(NULL, dentry); - error = mnt_want_write(f->f_path.mnt); + error = mnt_want_write_file(f->f_path.mnt, f); if (!error) { - error = removexattr(dentry, name); + error = removexattr(dentry, f->f_path.mnt, name); mnt_drop_write(f->f_path.mnt); } fput(f); ---- a/include/linux/xattr.h -+++ b/include/linux/xattr.h +--- linux-2.6.27.orig/include/linux/xattr.h ++++ linux-2.6.27/include/linux/xattr.h @@ -51,7 +51,7 @@ ssize_t xattr_getsecurity(struct inode * ssize_t vfs_getxattr(struct dentry *, struct vfsmount *, const char *, void *, size_t); ssize_t vfs_listxattr(struct dentry *d, struct vfsmount *, char *list, size_t size); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-rename.diff new/patches.apparmor/vfs-rename.diff --- old/patches.apparmor/vfs-rename.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/vfs-rename.diff 2009-01-26 19:33:23.000000000 +0100 @@ -45,7 +45,7 @@ fsstack_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode, NULL); --- a/fs/namei.c +++ b/fs/namei.c -@@ -2548,7 +2548,8 @@ asmlinkage long sys_link(const char __us +@@ -2547,7 +2547,8 @@ SYSCALL_DEFINE2(link, const char __user * locking]. */ static int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, @@ -55,7 +55,7 @@ { int error = 0; struct inode *target; -@@ -2591,7 +2592,8 @@ static int vfs_rename_dir(struct inode * +@@ -2590,7 +2591,8 @@ static int vfs_rename_dir(struct inode * } static int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry, @@ -65,7 +65,7 @@ { struct inode *target; int error; -@@ -2619,7 +2621,8 @@ static int vfs_rename_other(struct inode +@@ -2618,7 +2620,8 @@ static int vfs_rename_other(struct inode } int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, @@ -75,7 +75,7 @@ { int error; int is_dir = S_ISDIR(old_dentry->d_inode->i_mode); -@@ -2648,9 +2651,11 @@ int vfs_rename(struct inode *old_dir, st +@@ -2647,9 +2650,11 @@ int vfs_rename(struct inode *old_dir, st old_name = fsnotify_oldname_init(old_dentry->d_name.name); if (is_dir) @@ -89,7 +89,7 @@ if (!error) { const char *new_name = old_dentry->d_name.name; fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir, -@@ -2727,8 +2732,8 @@ asmlinkage long sys_renameat(int olddfd, +@@ -2726,8 +2731,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c error = mnt_want_write(oldnd.path.mnt); if (error) goto exit5; @@ -114,7 +114,7 @@ if (!host_err) --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1175,7 +1175,7 @@ extern int vfs_symlink(struct inode *, s +@@ -1178,7 +1178,7 @@ extern int vfs_symlink(struct inode *, s extern int vfs_link(struct dentry *, struct vfsmount *, struct inode *, struct dentry *, struct vfsmount *); extern int vfs_rmdir(struct inode *, struct dentry *, struct vfsmount *); extern int vfs_unlink(struct inode *, struct dentry *, struct vfsmount *); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-rmdir.diff new/patches.apparmor/vfs-rmdir.diff --- old/patches.apparmor/vfs-rmdir.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/vfs-rmdir.diff 2009-01-26 19:33:23.000000000 +0100 @@ -112,7 +112,7 @@ out_drop: --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1173,7 +1173,7 @@ extern int vfs_mkdir(struct inode *, str +@@ -1176,7 +1176,7 @@ extern int vfs_mkdir(struct inode *, str extern int vfs_mknod(struct inode *, struct dentry *, struct vfsmount *, int, dev_t); extern int vfs_symlink(struct inode *, struct dentry *, struct vfsmount *, const char *); extern int vfs_link(struct dentry *, struct vfsmount *, struct inode *, struct dentry *, struct vfsmount *); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-setxattr.diff new/patches.apparmor/vfs-setxattr.diff --- old/patches.apparmor/vfs-setxattr.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/vfs-setxattr.diff 2009-01-24 01:45:04.000000000 +0100 @@ -14,8 +14,8 @@ include/linux/xattr.h | 3 ++- 3 files changed, 21 insertions(+), 14 deletions(-) ---- a/fs/nfsd/vfs.c -+++ b/fs/nfsd/vfs.c +--- linux-2.6.27.orig/fs/nfsd/vfs.c ++++ linux-2.6.27/fs/nfsd/vfs.c @@ -438,7 +438,8 @@ static ssize_t nfsd_getxattr(struct dent #if defined(CONFIG_NFSD_V4) @@ -78,8 +78,8 @@ else { if (!S_ISDIR(inode->i_mode) && type == ACL_TYPE_DEFAULT) error = 0; ---- a/fs/xattr.c -+++ b/fs/xattr.c +--- linux-2.6.27.orig/fs/xattr.c ++++ linux-2.6.27/fs/xattr.c @@ -67,8 +67,8 @@ xattr_permission(struct inode *inode, co } @@ -111,7 +111,7 @@ kfree(kvalue); return error; } -@@ -263,7 +263,7 @@ sys_setxattr(const char __user *pathname +@@ -263,7 +263,7 @@ SYSCALL_DEFINE5(setxattr, const char __u return error; error = mnt_want_write(path.mnt); if (!error) { @@ -120,7 +120,7 @@ mnt_drop_write(path.mnt); } path_put(&path); -@@ -282,7 +282,7 @@ sys_lsetxattr(const char __user *pathnam +@@ -282,7 +282,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __ return error; error = mnt_want_write(path.mnt); if (!error) { @@ -129,17 +129,17 @@ mnt_drop_write(path.mnt); } path_put(&path); -@@ -304,7 +304,7 @@ sys_fsetxattr(int fd, const char __user +@@ -303,7 +303,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, cons audit_inode(NULL, dentry); - error = mnt_want_write(f->f_path.mnt); + error = mnt_want_write_file(f->f_path.mnt, f); if (!error) { - error = setxattr(dentry, name, value, size, flags); + error = setxattr(dentry, f->f_vfsmnt, name, value, size, flags); mnt_drop_write(f->f_path.mnt); } fput(f); ---- a/include/linux/xattr.h -+++ b/include/linux/xattr.h +--- linux-2.6.27.orig/include/linux/xattr.h ++++ linux-2.6.27/include/linux/xattr.h @@ -16,6 +16,7 @@ #ifdef __KERNEL__ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-symlink.diff new/patches.apparmor/vfs-symlink.diff --- old/patches.apparmor/vfs-symlink.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/vfs-symlink.diff 2009-01-26 19:33:23.000000000 +0100 @@ -44,7 +44,7 @@ if (rc || !lower_dentry->d_inode) --- a/fs/namei.c +++ b/fs/namei.c -@@ -2347,7 +2347,8 @@ asmlinkage long sys_unlink(const char __ +@@ -2347,7 +2347,8 @@ SYSCALL_DEFINE1(unlink, const char __use return do_unlinkat(AT_FDCWD, pathname); } @@ -54,7 +54,7 @@ { int error = may_create(dir, dentry, 0); -@@ -2393,7 +2394,7 @@ asmlinkage long sys_symlinkat(const char +@@ -2393,7 +2394,7 @@ SYSCALL_DEFINE3(symlinkat, const char __ error = mnt_want_write(nd.path.mnt); if (error) goto out_dput; @@ -112,7 +112,7 @@ out: --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1171,7 +1171,7 @@ extern int vfs_permission(struct nameida +@@ -1174,7 +1174,7 @@ extern int vfs_permission(struct nameida extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *); extern int vfs_mkdir(struct inode *, struct dentry *, struct vfsmount *, int); extern int vfs_mknod(struct inode *, struct dentry *, struct vfsmount *, int, dev_t); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-unlink.diff new/patches.apparmor/vfs-unlink.diff --- old/patches.apparmor/vfs-unlink.diff 2009-01-13 11:01:16.000000000 +0100 +++ new/patches.apparmor/vfs-unlink.diff 2009-01-26 19:33:23.000000000 +0100 @@ -35,7 +35,7 @@ goto out_unlock; --- a/fs/namei.c +++ b/fs/namei.c -@@ -2248,7 +2248,7 @@ asmlinkage long sys_rmdir(const char __u +@@ -2248,7 +2248,7 @@ SYSCALL_DEFINE1(rmdir, const char __user return do_rmdir(AT_FDCWD, pathname); } @@ -77,7 +77,7 @@ } --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1174,7 +1174,7 @@ extern int vfs_mknod(struct inode *, str +@@ -1177,7 +1177,7 @@ extern int vfs_mknod(struct inode *, str extern int vfs_symlink(struct inode *, struct dentry *, struct vfsmount *, const char *); extern int vfs_link(struct dentry *, struct vfsmount *, struct inode *, struct dentry *, struct vfsmount *); extern int vfs_rmdir(struct inode *, struct dentry *, struct vfsmount *); @@ -88,7 +88,7 @@ /* --- a/ipc/mqueue.c +++ b/ipc/mqueue.c -@@ -745,7 +745,7 @@ asmlinkage long sys_mq_unlink(const char +@@ -745,7 +745,7 @@ SYSCALL_DEFINE1(mq_unlink, const char __ err = mnt_want_write(mqueue_mnt); if (err) goto out_err; ++++++ patches.arch.tar.bz2 ++++++ ++++ 2519 lines of diff (skipped) ++++++ patches.drivers.tar.bz2 ++++++ ++++ 12960 lines of diff (skipped) ++++++ patches.fixes.tar.bz2 ++++++ ++++ 4199 lines of diff (skipped) ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 9608 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/firmware-path new/patches.rpmify/firmware-path --- old/patches.rpmify/firmware-path 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/firmware-path 2009-01-26 19:33:24.000000000 +0100 @@ -0,0 +1,25 @@ +From: Jeff Mahoney <jeffm@suse.com> +Subject: [PATCH] firmware: Allow release-specific firmware dir + + Every kernel package trying to provide files under /lib/firmware runs + into problems really quickly with multiple kernels installed. + + This patch moves them to /lib/firmware/$KERNELRELEASE. udev v127's + firmware.sh looks there first before falling back to /lib/firmware. + +Signed-off-by: Jeff Mahoney <jeffm@suse.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Makefile ++++ b/Makefile +@@ -1032,7 +1032,7 @@ depend dep: + + # --------------------------------------------------------------------------- + # Firmware install +-INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware ++INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware/$(KERNELRELEASE) + export INSTALL_FW_PATH + + PHONY += firmware_install diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/no-include-asm new/patches.rpmify/no-include-asm --- old/patches.rpmify/no-include-asm 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/no-include-asm 2009-01-26 19:33:24.000000000 +0100 @@ -0,0 +1,33 @@ +From: Takashi Iwai <tiwai@suse.de> +Subject: [PATCH] kbuild: correctly link include/asm in external builds +Patch-mainline: 2.6.27? + +Looking at this problem now, and found that it's likely a bug in the +upstream. The patch below should fix the creation of include2/asm +symlink, which resulted in build errors. + + +Takashi + +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + +--- + Makefile | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/Makefile ++++ b/Makefile +@@ -934,7 +934,11 @@ ifneq ($(KBUILD_SRC),) + fi; + $(Q)if [ ! -d include2 ]; then \ + mkdir -p include2; \ +- ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ ++ if [ -d $(srctree)/arch/$(SRCARCH)/include/asm ]; then \ ++ ln -fsn $(srctree)/arch/$(SRCARCH)/include/asm include2/asm; \ ++ else \ ++ ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ ++ fi; \ + fi + endif + ++++++ patches.rt.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ ++++ 10363 lines of diff (skipped) ++++++ patches.trace.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.trace/lttng-instrumentation-filemap.patch new/patches.trace/lttng-instrumentation-filemap.patch --- old/patches.trace/lttng-instrumentation-filemap.patch 2009-01-13 11:01:19.000000000 +0100 +++ new/patches.trace/lttng-instrumentation-filemap.patch 2009-01-24 01:45:08.000000000 +0100 @@ -58,7 +58,7 @@ /* * FIXME: remove all knowledge of the buffer layer from the core VM -@@ -545,9 +546,11 @@ void wait_on_page_bit(struct page *page, +@@ -540,9 +541,11 @@ void wait_on_page_bit(struct page *page, { DEFINE_WAIT_BIT(wait, &page->flags, bit_nr); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.trace/lttng-instrumentation-fs.patch new/patches.trace/lttng-instrumentation-fs.patch --- old/patches.trace/lttng-instrumentation-fs.patch 2009-01-13 11:01:19.000000000 +0100 +++ new/patches.trace/lttng-instrumentation-fs.patch 2009-01-24 01:45:08.000000000 +0100 @@ -128,7 +128,7 @@ #include <asm/ioctls.h> -@@ -205,6 +206,8 @@ asmlinkage long sys_ioctl(unsigned int f +@@ -205,6 +206,8 @@ SYSCALL_DEFINE3(ioctl, unsigned int, fd, if (!filp) goto out; @@ -147,7 +147,7 @@ int vfs_statfs(struct dentry *dentry, struct kstatfs *buf) { -@@ -1027,6 +1028,7 @@ long do_sys_open(int dfd, const char __u +@@ -1044,6 +1045,7 @@ long do_sys_open(int dfd, const char __u fsnotify_open(f->f_path.dentry); fd_install(fd, f); } @@ -155,7 +155,7 @@ } putname(tmp); } -@@ -1116,6 +1118,7 @@ asmlinkage long sys_close(unsigned int f +@@ -1133,6 +1135,7 @@ SYSCALL_DEFINE1(close, unsigned int, fd) filp = fdt->fd[fd]; if (!filp) goto out_unlock; @@ -173,7 +173,7 @@ #include "read_write.h" #include <asm/uaccess.h> -@@ -130,6 +131,9 @@ asmlinkage off_t sys_lseek(unsigned int +@@ -130,6 +131,9 @@ SYSCALL_DEFINE3(lseek, unsigned int, fd, if (res != (loff_t)retval) retval = -EOVERFLOW; /* LFS: should only happen on 32 bit platforms */ } @@ -183,7 +183,7 @@ fput_light(file, fput_needed); bad: return retval; -@@ -157,6 +161,8 @@ asmlinkage long sys_llseek(unsigned int +@@ -157,6 +161,8 @@ SYSCALL_DEFINE5(llseek, unsigned int, fd offset = vfs_llseek(file, ((loff_t) offset_high << 32) | offset_low, origin); @@ -192,7 +192,7 @@ retval = (int)offset; if (offset >= 0) { retval = -EFAULT; -@@ -344,6 +350,7 @@ asmlinkage ssize_t sys_read(unsigned int +@@ -344,6 +350,7 @@ SYSCALL_DEFINE3(read, unsigned int, fd, if (file) { loff_t pos = file_pos_read(file); ret = vfs_read(file, buf, count, &pos); @@ -200,7 +200,7 @@ file_pos_write(file, pos); fput_light(file, fput_needed); } -@@ -361,6 +368,7 @@ asmlinkage ssize_t sys_write(unsigned in +@@ -362,6 +369,7 @@ SYSCALL_DEFINE3(write, unsigned int, fd, if (file) { loff_t pos = file_pos_read(file); ret = vfs_write(file, buf, count, &pos); @@ -208,7 +208,7 @@ file_pos_write(file, pos); fput_light(file, fput_needed); } -@@ -381,8 +389,11 @@ asmlinkage ssize_t sys_pread64(unsigned +@@ -382,8 +390,11 @@ SYSCALL_DEFINE(pread64)(unsigned int fd, file = fget_light(fd, &fput_needed); if (file) { ret = -ESPIPE; @@ -221,7 +221,7 @@ fput_light(file, fput_needed); } -@@ -402,8 +413,10 @@ asmlinkage ssize_t sys_pwrite64(unsigned +@@ -411,8 +422,10 @@ SYSCALL_DEFINE(pwrite64)(unsigned int fd file = fget_light(fd, &fput_needed); if (file) { ret = -ESPIPE; @@ -233,7 +233,7 @@ fput_light(file, fput_needed); } -@@ -648,6 +661,7 @@ sys_readv(unsigned long fd, const struct +@@ -665,6 +678,7 @@ SYSCALL_DEFINE3(readv, unsigned long, fd if (file) { loff_t pos = file_pos_read(file); ret = vfs_readv(file, vec, vlen, &pos); @@ -241,7 +241,7 @@ file_pos_write(file, pos); fput_light(file, fput_needed); } -@@ -669,6 +683,7 @@ sys_writev(unsigned long fd, const struc +@@ -686,6 +700,7 @@ SYSCALL_DEFINE3(writev, unsigned long, f if (file) { loff_t pos = file_pos_read(file); ret = vfs_writev(file, vec, vlen, &pos); @@ -267,7 +267,7 @@ mask = DEFAULT_POLLMASK; if (f_op && f_op->poll) mask = (*f_op->poll)(file, retval ? NULL : wait); -@@ -560,6 +562,7 @@ static inline unsigned int do_pollfd(str +@@ -561,6 +563,7 @@ static inline unsigned int do_pollfd(str file = fget_light(fd, &fput_needed); mask = POLLNVAL; if (file != NULL) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.trace/lttng-instrumentation-scheduler.patch new/patches.trace/lttng-instrumentation-scheduler.patch --- old/patches.trace/lttng-instrumentation-scheduler.patch 2009-01-13 11:01:19.000000000 +0100 +++ new/patches.trace/lttng-instrumentation-scheduler.patch 2009-01-26 19:33:24.000000000 +0100 @@ -124,7 +124,7 @@ exit_sem(tsk); exit_files(tsk); exit_fs(tsk); -@@ -1678,6 +1684,8 @@ static long do_wait(enum pid_type type, +@@ -1680,6 +1686,8 @@ static long do_wait(enum pid_type type, struct task_struct *tsk; int retval; @@ -190,7 +190,7 @@ #include <linux/perfmon_kern.h> #include <asm/tlb.h> -@@ -1919,6 +1920,7 @@ unsigned long wait_task_inactive(struct +@@ -1914,6 +1915,7 @@ unsigned long wait_task_inactive(struct * just go back and repeat. */ rq = task_rq_lock(p, &flags); @@ -198,7 +198,7 @@ running = task_running(rq, p); on_rq = p->se.on_rq; ncsw = 0; -@@ -2311,9 +2313,7 @@ out_activate: +@@ -2306,9 +2308,7 @@ out_activate: success = 1; out_running: @@ -209,7 +209,7 @@ check_preempt_curr(rq, p); p->state = TASK_RUNNING; -@@ -2446,9 +2446,7 @@ void wake_up_new_task(struct task_struct +@@ -2441,9 +2441,7 @@ void wake_up_new_task(struct task_struct p->sched_class->task_new(rq, p); inc_nr_running(rq); } @@ -220,7 +220,7 @@ check_preempt_curr(rq, p); #ifdef CONFIG_SMP if (p->sched_class->task_wake_up) -@@ -2621,11 +2619,7 @@ context_switch(struct rq *rq, struct tas +@@ -2616,11 +2614,7 @@ context_switch(struct rq *rq, struct tas struct mm_struct *mm, *oldmm; prepare_task_switch(rq, prev, next); @@ -233,7 +233,7 @@ mm = next->mm; oldmm = prev->active_mm; /* -@@ -2865,6 +2859,7 @@ static void sched_migrate_task(struct ta +@@ -2860,6 +2854,7 @@ static void sched_migrate_task(struct ta || unlikely(!cpu_active(dest_cpu))) goto out; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.trace/lttng-instrumentation-socket.patch new/patches.trace/lttng-instrumentation-socket.patch --- old/patches.trace/lttng-instrumentation-socket.patch 2009-01-13 11:01:19.000000000 +0100 +++ new/patches.trace/lttng-instrumentation-socket.patch 2009-01-24 01:45:08.000000000 +0100 @@ -94,7 +94,7 @@ return ret; } -@@ -1244,6 +1248,7 @@ asmlinkage long sys_socket(int family, i +@@ -1244,6 +1248,7 @@ SYSCALL_DEFINE3(socket, int, family, int if (retval < 0) goto out_release; @@ -102,7 +102,7 @@ out: /* It may be already another descriptor 8) Not kernel problem. */ return retval; -@@ -2130,6 +2135,8 @@ asmlinkage long sys_socketcall(int call, +@@ -2131,6 +2136,8 @@ SYSCALL_DEFINE2(socketcall, int, call, u a0 = a[0]; a1 = a[1]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.trace/lttng-instrumentation-timer.patch new/patches.trace/lttng-instrumentation-timer.patch --- old/patches.trace/lttng-instrumentation-timer.patch 2009-01-13 11:01:19.000000000 +0100 +++ new/patches.trace/lttng-instrumentation-timer.patch 2009-01-26 19:33:24.000000000 +0100 @@ -108,7 +108,7 @@ u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES; -@@ -288,6 +290,7 @@ static void internal_add_timer(struct tv +@@ -357,6 +359,7 @@ static void internal_add_timer(struct tv i = (expires >> (TVR_BITS + 3 * TVN_BITS)) & TVN_MASK; vec = base->tv5.vec + i; } @@ -116,7 +116,7 @@ /* * Timers are FIFO: */ -@@ -1066,6 +1069,7 @@ void do_timer(unsigned long ticks) +@@ -1135,6 +1138,7 @@ void do_timer(unsigned long ticks) { jiffies_64 += ticks; update_times(ticks); @@ -124,7 +124,7 @@ } #ifdef __ARCH_WANT_SYS_ALARM -@@ -1147,7 +1151,9 @@ asmlinkage long sys_getegid(void) +@@ -1216,7 +1220,9 @@ SYSCALL_DEFINE0(getegid) static void process_timeout(unsigned long __data) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.trace/s390-syscall-get-nr.diff new/patches.trace/s390-syscall-get-nr.diff --- old/patches.trace/s390-syscall-get-nr.diff 2009-01-13 11:01:19.000000000 +0100 +++ new/patches.trace/s390-syscall-get-nr.diff 2009-01-24 01:45:08.000000000 +0100 @@ -252,7 +252,7 @@ --- a/arch/s390/kernel/signal.c +++ b/arch/s390/kernel/signal.c -@@ -160,7 +160,7 @@ static int restore_sigregs(struct pt_reg +@@ -157,7 +157,7 @@ static int restore_sigregs(struct pt_reg current->thread.fp_regs.fpc &= FPC_VALID_MASK; restore_fp_regs(¤t->thread.fp_regs); @@ -261,7 +261,7 @@ return 0; } -@@ -445,7 +445,7 @@ void do_signal(struct pt_regs *regs) +@@ -442,7 +442,7 @@ void do_signal(struct pt_regs *regs) oldset = ¤t->blocked; /* Are we from a system call? */ @@ -270,7 +270,7 @@ continue_addr = regs->psw.addr; restart_addr = continue_addr - regs->ilc; retval = regs->gprs[2]; -@@ -462,7 +462,7 @@ void do_signal(struct pt_regs *regs) +@@ -459,7 +459,7 @@ void do_signal(struct pt_regs *regs) case -ERESTART_RESTARTBLOCK: regs->gprs[2] = -EINTR; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.trace/s390-utrace-enablement.patch new/patches.trace/s390-utrace-enablement.patch --- old/patches.trace/s390-utrace-enablement.patch 2009-01-13 11:01:19.000000000 +0100 +++ new/patches.trace/s390-utrace-enablement.patch 2009-01-24 01:45:08.000000000 +0100 @@ -129,7 +129,7 @@ #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig -@@ -75,6 +75,7 @@ config S390 +@@ -76,6 +76,7 @@ config S390 select HAVE_KPROBES select HAVE_KRETPROBES select HAVE_KVM if 64BIT @@ -465,15 +465,15 @@ /* --- a/arch/s390/kernel/signal.c +++ b/arch/s390/kernel/signal.c -@@ -24,6 +24,7 @@ - #include <linux/tty.h> +@@ -25,6 +25,7 @@ #include <linux/personality.h> #include <linux/binfmts.h> + #include <linux/syscalls.h> +#include <linux/tracehook.h> #include <asm/ucontext.h> #include <asm/uaccess.h> #include <asm/lowcore.h> -@@ -507,6 +508,12 @@ void do_signal(struct pt_regs *regs) +@@ -504,6 +505,12 @@ void do_signal(struct pt_regs *regs) */ if (current->thread.per_info.single_step) set_thread_flag(TIF_SINGLE_STEP); @@ -486,7 +486,7 @@ } return; } -@@ -526,3 +533,9 @@ void do_signal(struct pt_regs *regs) +@@ -523,3 +530,9 @@ void do_signal(struct pt_regs *regs) set_thread_flag(TIF_RESTART_SVC); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.trace/tracepoints.patch new/patches.trace/tracepoints.patch --- old/patches.trace/tracepoints.patch 2009-01-13 11:01:19.000000000 +0100 +++ new/patches.trace/tracepoints.patch 2009-01-24 01:45:08.000000000 +0100 @@ -488,7 +488,7 @@ dynamic_printk_setup(sechdrs, verboseindex); err = module_finalize(hdr, sechdrs, mod); if (err < 0) -@@ -2844,3 +2862,50 @@ void module_update_markers(void) +@@ -2842,3 +2860,50 @@ void module_update_markers(void) mutex_unlock(&module_mutex); } #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.trace/utrace-core new/patches.trace/utrace-core --- old/patches.trace/utrace-core 2009-01-13 11:01:19.000000000 +0100 +++ new/patches.trace/utrace-core 2009-01-26 19:33:24.000000000 +0100 @@ -641,7 +641,7 @@ fdt = files_fdtable(p->files); --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1202,6 +1202,11 @@ struct task_struct { +@@ -1201,6 +1201,11 @@ struct task_struct { #endif seccomp_t seccomp; ++++++ patches.xen.tar.bz2 ++++++ ++++ 128276 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:21:14.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:21:14.000000000 +0100 @@ -40,7 +40,9 @@ patches.kernel.org/patch-2.6.27.7-8 patches.kernel.org/patch-2.6.27.8-9 patches.kernel.org/patch-2.6.27.9-10 - patches.kernel.org/patch-2.6.27.11-rc1 + patches.kernel.org/patch-2.6.27.10-11 + patches.kernel.org/patch-2.6.27.11-12 + patches.kernel.org/patch-2.6.27.12-13 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -61,6 +63,8 @@ ######################################################## # kABI consistency patches ######################################################## + patches.kabi/abi-fix-add-s_syncing-back-to-struct-super_block.patch + patches.kabi/abi-fix-add-wb_sync_hold-enum-writeback_sync_modes.patch ######################################################## # @@ -71,11 +75,11 @@ # Note that every patch in the patches.rpmify directory # will be included in the vanilla package. ######################################################## - patches.kernel.org/md-raid-metadata-PAGE_SIZE.patch - patches.kernel.org/firmware-path - patches.kernel.org/no-include-asm + patches.rpmify/firmware-path + patches.rpmify/no-include-asm patches.suse/genksyms-reference.diff patches.suse/genksyms-override.diff + patches.suse/genksyms-add-override-flag.diff patches.rpmify/rpm-kernel-config patches.rpmify/buildhost @@ -94,6 +98,12 @@ patches.suse/reiser4-exports patches.suse/kvm-as-kmp patches.suse/export-release_open_intent + patches.kabi/export-iwl_rx_allocate + + ######################################################## + # Bug workarounds for binutils + ######################################################## + patches.suse/s390-System.map.diff ######################################################## # Scheduler / Core @@ -105,6 +115,8 @@ patches.suse/self-ptrace.patch -RT patches.suse/rwlocks-enable-interrupts patches.suse/coredump_filter-add-elfhdr-default.patch + patches.fixes/round-jiffies-up + patches.kabi/sched-kabi-compat-hack.patch ######################################################## # Architecture-specific patches. These used to be all @@ -122,6 +134,8 @@ patches.fixes/nr-irqs-file patches.arch/mm-avoid-bad-page-on-lru patches.arch/ia64-page-migration + patches.arch/ia64-page-migration.fix + patches.fixes/taskstats-alignment ######################################################## # i386 @@ -147,9 +161,16 @@ patches.arch/x86-disable-broadcomm-boot-interrupt-generation.patch patches.arch/x86-disable-AMD-ATI-boot-interrupt-generation.patch patches.arch/x86-introduce-config-option-for-pci-reroute-quirks.patch + patches.arch/x86-call-boot-IRQ-quirks-at-end-of-device-init-and-during-resume.patch patches.arch/x86-self-ptrace.patch patches.arch/x86-tracehook patches.arch/x86-hpet-pre-read + patches.arch/x86_64-hpet-64bit-timer.patch + patches.fixes/remove_kernel_physical_mapping_init_from_init + patches.suse/x86-mark_rodata_rw.patch ++npiggin patches.suse/x86-mark_rodata_rw-2.patch + patches.suse/usb-move-ehci-reg-def.patch + patches.suse/x86-usb-debug-port-early-console-v4.patch ######################################################## # x86_64/i386 biarch - x2APIC next generation x86 CPU support @@ -236,6 +257,11 @@ patches.fixes/uv-xpc-get_sn_info.diff patches.fixes/uv-xpc_get_part_rsvd_page.diff patches.drivers/sgi-xp-no-uv + patches.fixes/xpc-write-barrier + patches.fixes/xpc-fix-NULL-deref + patches.fixes/uv_zalias_support + patches.fixes/sn-irq-affinity + patches.fixes/xpc-pass-physical # VMware TSC workaround patches (bnc#441338) patches.arch/x86-vmware-tsc-01-add-TSC_RELIABLE @@ -255,6 +281,8 @@ ######################################################## # powerpc/generic ######################################################## + patches.suse/of_platform_driver.module-owner.patch + patches.suse/led_classdev.sysfs-name.patch patches.suse/radeon-monitor-jsxx-quirk.patch patches.suse/8250-sysrq-ctrl_o.patch patches.arch/ppc-pseries_remove_lmb-PAGE_SHIFTT.patch @@ -301,7 +329,6 @@ patches.arch/ppc-cell-gdb-watchpoints.patch patches.arch/ppc-valid-hugepage-size-hugetlb_get_unmapped_area.patch patches.arch/ppc-pseries-cpu-migrate.patch - patches.arch/ppc-cmm_no_kdump.patch patches.arch/ppc-spufs-01-use-inc_nlink.patch patches.arch/ppc-spufs-03-sputrace-Only-enable-logging-on-open.patch @@ -390,6 +417,14 @@ # patches.fixes/scsi-enhance-error-codes patch as the s390 # patch is dependent on the error-codes patch. + patches.arch/s390-08-01-cio-fix-mp-mode.diff + patches.arch/s390-08-02-zfcp-gpn-align-fix.diff + patches.arch/s390-08-03-iucv-cpu-hotremove.diff + patches.arch/s390-08-04-compat-sigaltstack.diff + patches.arch/s390-08-05-af_iucv-msgpeek-fix.patch + patches.arch/s390-08-06-personality.patch + patches.arch/s390-08-07-compat_wrappers.patch + patches.arch/s390-symmetrix-ioctl.patch patches.arch/s390-personality-mask.patch patches.arch/s390-zfcp-synchronize-scsi-register @@ -408,7 +443,6 @@ patches.fixes/slab-alloc_slabmgmt-fix.patch patches.suse/mm-do-not-disable-memory-hotplug-when-hibernation-is-enabled.patch patches.fixes/s390-lru_add_drain_all.patch - patches.fixes/mm-lockless-pagecache-barrier.patch patches.fixes/loop-barriers patches.fixes/loop-barriers2 @@ -419,7 +453,10 @@ patches.suse/file-capabilities-add-file_caps-switch.diff patches.suse/file-capabilities-disable-by-default.diff patches.fixes/block-sanitize-invalid-partition-table-entries - patches.fixes/fs-symlink-write_begin-allocation-context-fix.patch + + patches.suse/mnt-want-write-speedup.patch + patches.suse/mnt_clone_write.patch + patches.suse/unlock_page-speedup.patch ######################################################## # CPU scheduler @@ -429,7 +466,6 @@ patches.fixes/bug-437171_3_rework_wakeup_preemption.patch patches.fixes/bug-437171_4_sched_reinstate_vruntime_wakeup.patch - ######################################################## # nfsacl protocol (agruen) ######################################################## @@ -443,6 +479,7 @@ patches.suse/kbd-ignore-gfx.patch patches.fixes/ds1682-build-fix patches.suse/rlimit-memlock-64k.patch + patches.fixes/sched-fix-__load_balance_iterator-for-cfs-with-on.patch ######################################################## # @@ -507,7 +544,8 @@ patches.arch/acpi_processor_cleanups.patch patches.suse/acpi_osi_sle11_ident.patch - patches.fixes/acpi_irq_quirk_pci_irq_derive.patch + patches.fixes/acpi_video_handle_reversed_brightness_info.patch + patches.fixes/acpi_video_always_update_sys.patch ######################################################## # CPUFREQ @@ -520,6 +558,11 @@ +trenn patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch +trenn patches.drivers/cpufreq_add_idle_microaccounting_6.patch + patches.fixes/cpufreq_export_latency.patch + patches.fixes/cpufreq_ondemand_adjust_sampling_rate_limit.patch + patches.fixes/x86_cpufreq_powernow-k8_acpi_latency_values.patch + patches.fixes/cpufreq_ondemand_performance_optimise_default_settings.patch + ######################################################## # AGP, graphics related stuff ######################################################## @@ -554,6 +597,7 @@ ######################################################## # cifs patches ######################################################## + patches.fixes/cifs-fix-oops-on-ipv6-mount ######################################################## # ext2/ext3 @@ -761,12 +805,14 @@ patches.suse/xfs-dmapi-src patches.suse/xfs-dmapi-enable patches.suse/xfs-dmapi-xfs-enable + patches.fixes/xfs-dmapi-fixes patches.suse/xfs-nfsd-dmapi-aware patches.suse/xfs-account-for-allocated-blocks-when-expanding-directories patches.suse/xfs-handle-memory-allocation-failures-during-log-initialisation patches.suse/xfs-check-for-valid-transaction-headers-in-recovery patches.suse/xfs-wait-for-all-IO-on-truncate-to-zero patches.fixes/xfs-barrier-fix.patch + patches.fixes/xfs-redirty-ENOSPC.patch ######################################################## # novfs @@ -815,15 +861,10 @@ patches.drivers/e1000e_add_82574L.patch patches.drivers/e1000e_add_ICH9_BM.patch patches.drivers/e1000e_add_LOM_devices.patch + patches.drivers/e1000e_add_ECC + patches.drivers/e1000-fix-shared-emc.patch - # debug 425480 patches.suse/e1000e_Export_set_memory_ro-rw - patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory - patches.suse/e1000e_allow_bad_checksum - patches.suse/e1000e_call_dump_eeprom - patches.suse/e1000e_ioremap_sanity_check - - patches.drivers/e1000e_add_ECC patches.fixes/igb_ethtool.patch @@ -842,8 +883,9 @@ patches.drivers/r8169-add-hw-start-helpers-for-the-8168-and-the-8101 patches.drivers/r8169-additional-8101-and-8102-support - patches.drivers/ixgbe-fcoe-bugfixes + patches.fixes/disable-lro-per-default + patches.drivers/sgi-ioc4-request-submodules # This one is more related to x2APIC patches, but adjusted by SGI to cleanly @@ -851,8 +893,6 @@ patches.arch/x86_uv_early_detect.patch patches.arch/x86_sgi_uv_early_detect_oem.patch patches.fixes/uv-redundant-creation-of-proc-dir - patches.fixes/uv-remove-erroneous-BAU-init - # Add support for Montevina hardware; series mainlined 2.6.26 @@ -866,6 +906,9 @@ patches.drivers/ehca-fix-possible-nullpointer-access-v2.patch + patches.drivers/disable-catas_reset-by-default-to-avoid-problems-with-eeh.patch + patches.fixes/hpilo-open-close-fix + ######################################################## # Storage ######################################################## @@ -928,12 +971,17 @@ patches.drivers/block-call-sync-on-cleanup patches.drivers/block-add-timeout-on-dequeue patches.drivers/block-del-timer-after-dequeue + patches.fixes/block-use-round_jiffies_up patches.fixes/blk-leave-sync-timer-running patches.drivers/block-internal-dequeue-shouldnt-start-timer patches.fixes/block-integrity-update patches.fixes/blk-dont-invoke-request_fn-on-stopped-queue patches.fixes/blk-move-unplug_work-init patches.fixes/blk-get-extra-reference-before-unmap + patches.fixes/block-fix-blk_start_queueing + patches.fixes/block-suppress-buffer-IO-errors + patches.fixes/block-optimizations-in-blk_rq_timed_out_timer + patches.fixes/block-add-comment-in-blk_rq_timed_out patches.drivers/cciss-driver-panic-on-volume-delete @@ -967,6 +1015,46 @@ patches.drivers/open-fcoe-rc1-update patches.drivers/open-fcoe-fnic-patches + # bnc #459142 + patches.drivers/fcoe-logoff-of-the-fabric-when.diff + patches.drivers/fcoe-remove-warn_on-in-fc_set.diff + patches.drivers/fcoe-user_mfs-is-never-used.diff + patches.drivers/fcoe-check-return-for-fc_set_m.diff + patches.drivers/libfc-use-an-operations-struct.diff + patches.drivers/fcoe-fix-frame-length-validati.diff + patches.drivers/libfc-make-sure-we-access-the.diff + patches.drivers/libfc-make-fc_disc-inline-with.diff + patches.drivers/libfc-make-rscn-parsing-more-r.diff + patches.drivers/libfc-improve-fc_lport-c-locki.diff + patches.drivers/libfc-improve-fc_rport-c-locki.diff + patches.drivers/libfc-add-fc_disc-c-locking-co.diff + patches.drivers/libfc-ensure-correct-device_pu.diff + patches.drivers/fcoe-improved-load-balancing-i.diff + patches.drivers/libfc-updated-comment-for-orde.diff + patches.drivers/fcoe-change-fcoe_sw-sg_tablesi.diff + patches.drivers/libfc-updated-libfc-fcoe-modul.diff + patches.drivers/libfc-set-the-release-function.diff + + # bnc #468051 + patches.drivers/fcoe-fix-incorrect-use-of-struct-module.diff + + # bnc #468053 + patches.drivers/libfc_locking.diff + + # bnc #468054 + patches.drivers/libfc_rport.diff + + # bnc #465596 + patches.drivers/libfc-handle-rrq-exch-timeout.diff + patches.drivers/libfc-pass-lport-in-exch_mgr_r.diff + patches.drivers/libfc-when-rport-goes-away-re.diff + + #bnc #469536 + patches.drivers/libfc-fix-read-IO-data-integrity + + patches.drivers/ixgbe-dcb-setstate.patch + patches.drivers/ixgbe_DCB_compile_err.patch + patches.drivers/lpfc-8.2.8-update patches.drivers/lpfc-8.2.8.1-update patches.drivers/lpfc-8.2.8.3-update @@ -975,12 +1063,16 @@ patches.drivers/lpfc-8.2.8.9-update patches.drivers/lpfc-8.2.8.10-update patches.drivers/lpfc-8.2.8.11-update + patches.drivers/lpfc-8.2.8.12-update patches.drivers/qla2xxx-8.02.01-k8-update patches.drivers/qla2xxx-8.02.01-k9-update patches.drivers/qla2xxx-8.02.01.02.11.0-k9-update patches.fixes/qla2xxx-disable-automatic-queue-tracking + patches.fixes/qla2xxx-check-fc-rport-validity patches.drivers/mpt-fusion-4.00.43.00-update patches.drivers/mpt-fusion-4.16.00.00-update + patches.drivers/mpt-return-all-sense-data + patches.drivers/mptsas-discover-all-devices patches.drivers/qla4xxx-sles11-update patches.drivers/qla4xxx-5.01.00-k8_sles11-03-update patches.drivers/qla4xxx-5.01.00-k8_sles11-04-update @@ -1008,8 +1100,6 @@ patches.drivers/ibmvfc-async-events-oops patches.drivers/ibmvfc-add_sync.patch - patches.drivers/ibmvfc-host_init_delay.patch - patches.drivers/ibmvfc-improve_sync_events.patch patches.drivers/ibmvfc-abort-response.patch # Remaining SCSI patches (garloff) @@ -1019,16 +1109,21 @@ patches.fixes/scsi-ibmvscsi-show-config.patch patches.fixes/scsi-ibmvscsi-can_queue_fix.patch + patches.fixes/scsi-ibmvscsi-vio_leak.patch + patches.fixes/scsi-ibmvscsi-module_alias.patch + # bnc#362850 patches.fixes/sd_liberal_28_sense_invalid.diff patches.drivers/intel-ibex-peak-device-ids.patch patches.drivers/intel-ibex-peak-device-support.patch + patches.drivers/pata_via.c-support-vx855-and-future-chips-whose-ide-controller-use-0x0571.patch ######################################################## # DRM/Video ######################################################## patches.drivers/via-unichrome-drm-bugfixes.patch + patches.drivers/add-via-chrome9-drm-support.patch ######################################################## # Network @@ -1039,6 +1134,7 @@ patches.suse/nameif-track-rename.patch patches.drivers/atl2-add-atl2-network-driver.patch patches.fixes/tg3-fix-default-wol.patch + patches.drivers/tg3_libphy_workaround patches.drivers/cxgb3-private-iscsi-ip-addresses patches.drivers/cxgb3-get_drvinfo-deadlock.patch @@ -1053,16 +1149,23 @@ patches.drivers/cxgb3-Add-1G-fiber-support patches.drivers/cxgb3-update-driver-version patches.drivers/cxgb3-eeprom-read-fixes.patch + patches.drivers/cxgb3-ser.patch patches.fixes/hso_killswitch.patch + patches.fixes/sctp_do_not_use_stale_copy_of_sk + ######################################################## # Wireless Networking ######################################################## patches.suse/wireless-no-aes-select patches.fixes/ipw2200-send-noassoc.patch + patches.fixes/ipw2200-workaround-firmware-restarts-when-scanning.patch patches.fixes/ath5k-ignore-calibration-return-value.patch - + patches.fixes/iwl3945-fix-rfkill.patch + patches.fixes/iwlagn-fix-rfkill.patch + patches.fixes/iwlwifi-fix-rs_get_rate-oops.patch + patches.fixes/mac80211-add-direct-probe.patch ######################################################## # iSCSI @@ -1093,11 +1196,16 @@ # make debugging easier patches.drivers/sysfs-crash-debugging.patch patches.drivers/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch + patches.drivers/driver-core-fix-dynamic_debug-cmd-line-parameter.patch + patches.drivers/driver-core-fix-using-ret-variable-in-unregister_dynamic_debug_module.patch + patches.drivers/driver-core-add-newlines-to-debugging-enabled-disabled-messages.patch # this must be after the previous *-dynamic-debug-messages.patch patches.suse/module-ref-dynamic-alloc patches.suse/mem_cgroup_stat-dynamic-alloc + patches.fixes/sysfs-fix-problems-with-binary-files.patch + ######################################################## # USB ######################################################## @@ -1114,8 +1222,10 @@ patches.suse/bootsplash patches.drivers/elousb.patch patches.fixes/input-add-acer-aspire-5710-to-nomux.patch + patches.fixes/input-add-nomux-dell-vostro-1510.patch patches.fixes/hid-rdesc-quirk-for-sony-vaio-VGX-TP1E.patch patches.drivers/input-usbtouchscreen-hw-calibration.patch + patches.fixes/revert-bgcolor-line-feed-93f78da4.patch ########################################################## # Sound @@ -1155,18 +1265,28 @@ patches.drivers/alsa-hda-stac-yet-more-fixes patches.drivers/alsa-hda-dell-92hd73xx-models patches.drivers/alsa-hda-sony-vaio-vgn-sr19xn-quirk - patches.drivers/alsa-hda-hp-6730b-quirk patches.drivers/alsa-hda-92hd73x-desktop-fixes patches.drivers/alsa-hda-hp-dv7-quirk - patches.drivers/alsa-hda-ad1986a-laptop-eapd-model-back patches.drivers/alsa-hda-hp2230s-quirk patches.drivers/alsa-hda-ad1882-id-typo-fix patches.drivers/alsa-hda-sigmatel-add-missing-terminators + patches.drivers/alsa-hda-seek-for-codec-id + patches.drivers/alsa-hda-gateway-fix + patches.drivers/alsa-hda-gateway-fix2 + patches.drivers/alsa-hda-stac925x-init-fix + patches.drivers/alsa-hda-hp-dv5-quirk + patches.drivers/alsa-hda-hp-dv5-mic-fix + patches.drivers/alsa-hda-idt92hd83-fix-typo + patches.drivers/alsa-hda-add-volume-offset + patches.drivers/alsa-hda-stac-reduce-volume-scale + patches.drivers/alsa-hda-hp-dv4-quirk + patches.drivers/alsa-hda-gateway-t1616-quirk + patches.drivers/alsa-hda-intel-d945-ref-quirk patches.drivers/alsa-emu10k1-audigy-fixes patches.drivers/alsa-powermac-ibook-g4-mic-fix patches.drivers/alsa-ca0106-pm-support patches.drivers/alsa-ca0106-capture-no-44khz - patches.drivers/alsa-caiaq-midi-oops-fix + patches.drivers/alsa-virtuoso-no-eeprom-overwrite ######################################################## # Other driver fixes @@ -1218,6 +1338,8 @@ patches.fixes/dm-avoid-put-table-dm_any_congested patches.fixes/dm-unbind-drop-ref patches.fixes/dm-table-ref-count + patches.suse/dm-mpath-requeue-for-stopped-queue + patches.suse/dm-mpath-check-info-before-access ######################################################## # md @@ -1226,6 +1348,7 @@ patches.fixes/md-Don-t-try-to-set-an-array-to-read-auto-if-it-i.patch patches.suse/md-notify-when-stopped patches.fixes/md-disable-recovery-on-faulty-degraded-array + patches.suse/md-raid-metadata-PAGE_SIZE.patch ########################################################## @@ -1487,6 +1610,7 @@ patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch patches.xen/ipv6-no-autoconf + patches.xen/gso-size-check.patch patches.xen/pci-reassign-resources patches.xen/sfc-driverlink patches.xen/sfc-resource-driver @@ -1518,6 +1642,8 @@ patches.xen/748-x86-ioapic-cleanup.patch patches.xen/761-highpte.patch patches.xen/762-xencons-hvc.patch + patches.xen/764-netback-foreign-pages.patch + patches.xen/769-evtchn-CPU-offline.patch # changes outside arch/{i386,x86_64}/xen patches.xen/xen3-fixup-kconfig @@ -1542,6 +1668,8 @@ patches.xen/xen3-patch-2.6.27.5-6 patches.xen/xen3-patch-2.6.27.7-8 patches.xen/xen3-patch-2.6.27.8-9 + patches.xen/xen3-patch-2.6.27.9-10 + patches.xen/xen3-patch-2.6.27.11-12 patches.xen/xen3-seccomp-disable-tsc-option patches.xen/xen3-rwlocks-enable-interrupts patches.xen/xen3-x2APIC_PATCH_20_of_41_cff73a6ffaed726780b001937d2a42efde553922 @@ -1551,8 +1679,10 @@ patches.xen/xen3-x86_sgi_cpus4096-05-update-send_IPI_mask.patch patches.xen/xen3-uv_setup_irq.diff patches.xen/xen3-x86-vmware-tsc-03-detect-from-hypervisor + patches.xen/xen3-x86-fix-kmap-contig.patch +andrea patches.xen/xen3-silent-stack-overflow patches.xen/xen3-e1000e_Export_set_memory_ro-rw +- patches.xen/xen3-e1000e_ioremap_sanity_check patches.xen/xen3-x86_sgi_uv_early_detect_oem.patch patches.xen/xen3-panic-on-io-nmi.diff patches.xen/xen3-intel-ibex-peak-device-ids.patch @@ -1584,6 +1714,7 @@ patches.xen/xen-configurable-guest-devices patches.xen/xen-netback-nr-irqs patches.xen/xen-netback-notify-multi + patches.xen/xen-S3-MSI patches.xen/xen-x86-panic-no-reboot patches.xen/xen-x86-dcr-fallback patches.xen/xen-x86-consistent-nmi @@ -1598,3 +1729,4 @@ patches.xen/xen-x86_64-pgd-pin patches.xen/xen-x86_64-pgd-alloc-order patches.xen/xen-x86_64-dump-user-pgt + patches.xen/xen-x86-mark_rodata_rw.patch ++++++ supported.conf ++++++ --- /var/tmp/diff_new_pack.C29603/_old 2009-02-03 23:21:16.000000000 +0100 +++ /var/tmp/diff_new_pack.C29603/_new 2009-02-03 23:21:16.000000000 +0100 @@ -8,6 +8,7 @@ # Modules that a base module uses implicitly are also base modules, # but at least they need to be marked as supported here. ++external kernel/arch/ia64/kernel/cpe_migrate # SGI kernel/arch/ia64/kernel/err_inject +external kernel/arch/powerpc/platforms/cell/cbe-cpufreq +external kernel/arch/powerpc/platforms/cell/cbe_cpufreq_pmi @@ -746,7 +747,7 @@ kernel/drivers/md/dm-log kernel/drivers/md/dm-region_hash kernel/drivers/md/dm-round-robin # Round-robin path selector - kernel/drivers/md/dm-leastpending # Least pending path selector + kernel/drivers/md/dm-least-pending # Least pending path selector kernel/drivers/md/dm-queue-length # Queue-lenght oriented dynamic load balancer kernel/drivers/md/dm-service-time # Service-time oriented dynamic load balancer kernel/drivers/md/dm-snapshot # device-mapper snapshot target ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org