5 Jan
2012
5 Jan
'12
16:01
Hello community, here is the log from the commit of package kernel-source for openSUSE:12.1:Update:Test checked in at 2012-01-05 17:01:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/kernel-source (Old) and /work/SRC/openSUSE:12.1:Update:Test/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source", Maintainer is "kernel-maintainers@forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/kernel-source/kernel-debug.changes 2012-01-05 17:01:40.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.kernel-source.new/kernel-debug.changes 2012-01-05 17:01:46.000000000 +0100 @@ -1,0 +2,698 @@ +Wed Jan 4 10:36:49 CET 2012 - jslaby@suse.cz + +- Linux 3.1.7. +- commit 587be3b + +------------------------------------------------------------------- +Mon Jan 2 13:42:24 CET 2012 - dsterba@suse.cz + +- btrfs: use correct device for maps (bnc#672923). +- Delete + patches.suse/0001-vfs-allow-proc-pid-maps-to-return-a-custom-device.patch. +- Delete + patches.suse/0002-btrfs-Introduce-btrfs_get_maps_dev.patch. +- commit 7e6bd95 + +------------------------------------------------------------------- +Fri Dec 30 15:20:59 CET 2011 - bpoirier@suse.de + +- net: Add a flow_cache_flush_deferred function (bnc#737624). +- commit 69bd36b + +------------------------------------------------------------------- +Mon Dec 26 21:39:14 CET 2011 - jslaby@suse.cz + +- Linux 3.1.6. +- Revert "clocksource: Avoid selecting mult values that might + overflow when adjusted". +- Revert "inet: add a redirect generation id in inetpeer". +- Delete + patches.fixes/hfs-fix-hfs_find_init-sb-ext_tree-null-ptr-oops.patch. +- Delete + patches.fixes/mm-Ensure-that-pfn_valid-is-called-once-per-pagebloc.patch. +- commit 2f8a8c2 + +------------------------------------------------------------------- +Tue Dec 20 19:14:35 CET 2011 - dsterba@suse.cz + +- Btrfs: fix wrong i_size when truncating a file to a larger size + (FATE#306586). +- Btrfs: fix wrong disk space information of the files + (FATE#306586). +- Btrfs: fix inaccurate available space on raid0 profile + (FATE#306586). +- btrfs: keep orphans for subvolume deletion (FATE#306586). +- Btrfs: fix ctime update of on-disk inode (FATE#306586). +- Btrfs: add a cond_resched() into the worker loop (FATE#306586). +- BTRFS: Establish i_ops before calling d_instantiate + (FATE#306586). +- Btrfs: deal with NULL srv_rsv in the delalloc inode reservation + code (FATE#306586). +- Btrfs: fix num_workers_starting bug and other bugs in async + thread (FATE#306586). +- Btrfs: deal with enospc from dirtying inodes properly + (FATE#306586). +- Btrfs: fix how we do delalloc reservations and how we free + reservations on error (FATE#306586). +- Btrfs: fix leaked space in truncate (FATE#306586). +- Btrfs: don't panic if orphan item already exists (FATE#306586). +- Btrfs: only set cache_generation if we setup the block group + (FATE#306586). +- Btrfs: unplug every once and a while (FATE#306586). +- btrfs: lock and disable irq during space alloc (FATE#306586 + bnc#730103). +- Refresh + patches.suse/btrfs-8014-add-new-ioctl-to-determine-size-of-compressed-.patch. +- Delete + patches.suse/btrfs-0901-fix-num_workers_starting-bug-and-other-bugs-in.patch. +- Delete + patches.suse/btrfs-0902-deal-with-enospc-from-dirtying-inodes-properly.patch. +- Delete + patches.suse/btrfs-0903-fix-how-we-do-delalloc-reservations-and-how-we.patch. +- Delete + patches.suse/btrfs-0904-fix-leaked-space-in-truncate.patch. +- Delete + patches.suse/btrfs-0905-only-set-cache_generation-if-we-setup-the-bloc.patch. +- Delete + patches.suse/btrfs-0906-don-t-panic-if-orphan-item-already-exists.patch. +- Delete + patches.suse/btrfs-8027-fix-ctime-update-of-on-disk-inode.patch. +- Delete + patches.suse/btrfs-8028-fix-wrong-disk-space-information-of-the-files.patch. +- Delete + patches.suse/btrfs-8029-fix-wrong-i_size-when-truncating-a-file-to-a-l.patch. +- Delete + patches.suse/btrfs-8030-fix-inaccurate-available-space-on-raid0-profil.patch. +- commit e3967f3 + +------------------------------------------------------------------- +Sun Dec 18 07:38:42 CET 2011 - aj@suse.de + +- rpm/kernel-source.rpmlintrc: The hidden files are fine, silence rpmlint. +- commit a7813dd + +------------------------------------------------------------------- +Fri Dec 16 15:37:51 CET 2011 - aj@suse.de + +- rpm/kernel-binary.spec.in: Add provides and make most obsoletes versioned. + This silences rpmlint warnings. +- commit e3023c7 + +------------------------------------------------------------------- +Thu Dec 15 17:55:50 CET 2011 - dsterba@suse.cz + +- Btrfs: fix inaccurate available space on raid0 profile + (FATE#306586). +- Btrfs: fix wrong i_size when truncating a file to a larger size + (FATE#306586). +- Btrfs: fix wrong disk space information of the files + (FATE#306586). +- Btrfs: fix ctime update of on-disk inode (FATE#306586). +- Btrfs: fix possible deadlock when opening a seed device + (FATE#306586). +- Btrfs: update global block_rsv when creating a new block group + (FATE#306586). +- btrfs: workaround for cleaner deadlock (FATE#306586). +- Btrfs: don't panic if orphan item already exists (FATE#306586). +- Btrfs: only set cache_generation if we setup the block group + (FATE#306586). +- commit 5341000 + +------------------------------------------------------------------- +Thu Dec 15 17:47:54 CET 2011 - meissner@suse.de + +- updated +- commit 7433f07 + +------------------------------------------------------------------- +Wed Dec 14 17:28:21 CET 2011 - dsterba@suse.cz + +- btrfs: Introduce btrfs_get_maps_dev() (bnc#672923). +- vfs: allow /proc/pid/maps to return a custom device + (bnc#672923). +- Btrfs: make lzo the default compression scheme (FATE#306586). +- btrfs: add new ioctl to determine size of compressed file + (FATE#306586). +- Sector Size check during Mount (FATE#306586 bnc#724620). +- Btrfs: rewrite btrfs_trim_block_group() (FATE#306586). +- btrfs: allow cross-subvolume file clone (bnc#698540). +- Btrfs: fix leaked space in truncate (FATE#306586). +- Btrfs: fix how we do delalloc reservations and how we free + reservations on error (FATE#306586). +- Btrfs: deal with enospc from dirtying inodes properly + (FATE#306586). +- Btrfs: fix num_workers_starting bug and other bugs in async + thread (FATE#306586). +- Btrfs: add allocator tracepoints (FATE#306586). +- Btrfs: fix btrfs_end_bio to deal with write errors to a single + mirror (FATE#306586). +- Btrfs: drop spin lock when memory alloc fails (FATE#306586). +- Btrfs: check if the to-be-added device is writable + (FATE#306586). +- Btrfs: try cluster but don't advance in search list + (FATE#306586). +- Btrfs: try to allocate from cluster even at LOOP_NO_EMPTY_SIZE + (FATE#306586). +- Btrfs: fix meta data raid-repair merge problem (FATE#306586). +- Btrfs: skip allocation attempt from empty cluster (FATE#306586). +- Btrfs: skip block groups without enough space for a cluster + (FATE#306586). +- Btrfs: start search for new cluster at the beginning + (FATE#306586). +- Btrfs: reset cluster's max_size when creating bitmap + (FATE#306586). +- Btrfs: initialize new bitmaps' list (FATE#306586). +- Btrfs: fix oops when calling statfs on readonly device + (FATE#306586). +- Btrfs: Don't error on resizing FS to same size (FATE#306586). +- Btrfs: fix deadlock on metadata reservation when evicting a + inode (FATE#306586). +- btrfs scrub: handle -ENOMEM from init_ipath() (FATE#306586). +- Btrfs: remove free-space-cache.c WARN during log replay + (FATE#306586). +- Btrfs: sectorsize align offsets in fiemap (FATE#306586). +- Btrfs: clear pages dirty for io and set them extent mapped + (FATE#306586). +- Btrfs: wait on caching if we're loading the free space cache + (FATE#306586). +- Btrfs: prefix resize related printks with btrfs: (FATE#306586). +- btrfs: fix stat blocks accounting (FATE#306586). +- Btrfs: avoid unnecessary bitmap search for cluster setup + (FATE#306586). +- Btrfs: fix to search one more bitmap for cluster setup + (FATE#306586). +- btrfs: mirror_num should be int, not u64 (FATE#306586). +- btrfs: Fix up 32/64-bit compatibility for new ioctls + (FATE#306586). +- Btrfs: fix barrier flushes (FATE#306586). +- Btrfs: fix tree corruption after multi-thread snapshots and + inode_cache flush (FATE#306586). +- btrfs: rename the option to nospace_cache (FATE#306586). +- Btrfs: handle bio_add_page failure gracefully in scrub + (FATE#306586). +- Btrfs: fix deadlock caused by the race between relocation + (FATE#306586). +- Btrfs: only map pages if we know we need them when reading + the space cache (FATE#306586). +- Btrfs: fix orphan backref nodes (FATE#306586). ++++ 506 more lines (skipped) ++++ between /work/SRC/openSUSE:12.1:Update:Test/kernel-source/kernel-debug.changes ++++ and /work/SRC/openSUSE:12.1:Update:Test/.kernel-source.new/kernel-debug.changes kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change New: ---- try-disable-staging-driver ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-debug # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define srcversion 3.1 -%define patchversion 3.1.0 +%define patchversion 3.1.7 %define variant %{nil} +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -35,7 +34,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -55,13 +54,15 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 3.1.0 -Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel +Version: 3.1.7 +Release: 0 Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel @@ -97,18 +98,21 @@ BuildRequires: dwarfextract %endif %endif +%ifarch %arm +BuildRequires: u-boot-tools +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae <= %version +Obsoletes: kernel-xenpae < %version %endif %endif #!BuildIgnore: xen %endif -Provides: %name-nongpl -Obsoletes: %name-nongpl +Provides: %name-nongpl = %version +Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -131,7 +135,7 @@ Obsoletes: kernel-kdump %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -173,6 +177,7 @@ Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h +Source69: try-disable-staging-driver Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -214,30 +219,49 @@ # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor +Obsoletes: iwlwifi-kmp-%build_flavor < %version +Provides: iwlwifi-kmp-%build_flavor = %version +Obsoletes: ipw3945-kmp-%build_flavor < %version +Provides: ipw3945-kmp-%build_flavor = %version # sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor +Obsoletes: uvcvideo-kmp-%build_flavor < %version +Provides: uvcvideo-kmp-%build_flavor = %version # 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +Obsoletes: atl2-kmp-%build_flavor < %version +Provides: atl2-kmp-%build_flavor = %version +Obsoletes: at76_usb-kmp-%build_flavor < %version +Provides: at76_usb-kmp-%build_flavor = %version +Obsoletes: btusb-kmp-%build_flavor < %version +Provides: btusb-kmp-%build_flavor = %version +Obsoletes: et131x-kmp-%build_flavor < %version +Provides: et131x-kmp-%build_flavor = %version +Obsoletes: ivtv-kmp-%build_flavor < %version +Provides: ivtv-kmp-%build_flavor = %version +Obsoletes: pcc-acpi-kmp-%build_flavor < %version +Provides: pcc-acpi-kmp-%build_flavor = %version +Obsoletes: wlan-ng-kmp-%build_flavor < %version +Provides: wlan-ng-kmp-%build_flavor = %version # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor < %version +Provides: brocade-bfa-kmp-%build_flavor = %version +Obsoletes: enic-kmp-%build_flavor < %version +Provides: enic-kmp-%build_flavor = %version +Obsoletes: fnic-kmp-%build_flavor < %version +Provides: fnic-kmp-%build_flavor = %version +Obsoletes: iwlagn-2-6-27-kmp-%build_flavor < %version +Provides: iwlagn-2-6-27-kmp-%build_flavor = %version +Obsoletes: kvm-kmp-%build_flavor < %version +Provides: kvm-kmp-%build_flavor = %version +Obsoletes: msi-wmi-kmp-%build_flavor < %version +Provides: msi-wmi-kmp-%build_flavor = %version +Obsoletes: perfmon-kmp-%build_flavor < %version +Provides: perfmon-kmp-%build_flavor = %version # sle11 -Obsoletes: ocfs2-kmp-%build_flavor +Obsoletes: ocfs2-kmp-%build_flavor < %version +Provides: ocfs2-kmp-%build_flavor = %version # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +Provides: quickcam-kmp-%build_flavor = 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -372,11 +396,25 @@ # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 -%else - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + MAKE_ARGS="$MAKE_ARGS D=2" %endif +while true; do + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + | tee buildlog + if test "${PIPESTATUS[0]}" -eq 0; then + break + fi + # In the linux-next and vanilla branches, we try harder to build a + # package. + if test 0%vanilla_only -gt 0 && + %_sourcedir/try-disable-staging-driver buildlog; then + echo "Retrying make" + else + exit 1 + fi +done + %install # get rid of /usr/lib/rpm/brp-strip-debug @@ -486,6 +524,13 @@ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor image=vmlinux %endif +%ifarch %arm + add_vmlinux --compressed + # quickly compile uImage so we have something to boot from + make %{?_smp_mflags} uImage $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + image=uImage + cp -p arch/arm/boot/$image %buildroot/boot/uImage-%kernelrelease-%build_flavor +%endif # end of build_kdump %endif @@ -673,8 +718,7 @@ # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files -for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \ - %buildroot/lib/modules/*/{build,source}; do +for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done @@ -734,19 +778,20 @@ %if %split_base %files -f kernel-main.files +%defattr(-, root, root) %else %files -f kernel-base.files -%endif %defattr(-, root, root) +%endif %package base Summary: A Debug Version of the Kernel - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -779,7 +824,6 @@ %package extra Summary: A Debug Version of the Kernel - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -821,7 +865,6 @@ %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -837,7 +880,6 @@ %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -873,7 +915,6 @@ %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-default # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define srcversion 3.1 -%define patchversion 3.1.0 +%define patchversion 3.1.7 %define variant %{nil} +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -35,7 +34,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -55,13 +54,15 @@ Name: kernel-default Summary: The Standard Kernel -Version: 3.1.0 -Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel +Version: 3.1.7 +Release: 0 Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel @@ -97,18 +98,21 @@ BuildRequires: dwarfextract %endif %endif +%ifarch %arm +BuildRequires: u-boot-tools +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae <= %version +Obsoletes: kernel-xenpae < %version %endif %endif #!BuildIgnore: xen %endif -Provides: %name-nongpl -Obsoletes: %name-nongpl +Provides: %name-nongpl = %version +Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -147,7 +151,7 @@ Obsoletes: smp kernel-smp %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -189,6 +193,7 @@ Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h +Source69: try-disable-staging-driver Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -230,30 +235,49 @@ # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor +Obsoletes: iwlwifi-kmp-%build_flavor < %version +Provides: iwlwifi-kmp-%build_flavor = %version +Obsoletes: ipw3945-kmp-%build_flavor < %version +Provides: ipw3945-kmp-%build_flavor = %version # sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor +Obsoletes: uvcvideo-kmp-%build_flavor < %version +Provides: uvcvideo-kmp-%build_flavor = %version # 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +Obsoletes: atl2-kmp-%build_flavor < %version +Provides: atl2-kmp-%build_flavor = %version +Obsoletes: at76_usb-kmp-%build_flavor < %version +Provides: at76_usb-kmp-%build_flavor = %version +Obsoletes: btusb-kmp-%build_flavor < %version +Provides: btusb-kmp-%build_flavor = %version +Obsoletes: et131x-kmp-%build_flavor < %version +Provides: et131x-kmp-%build_flavor = %version +Obsoletes: ivtv-kmp-%build_flavor < %version +Provides: ivtv-kmp-%build_flavor = %version +Obsoletes: pcc-acpi-kmp-%build_flavor < %version +Provides: pcc-acpi-kmp-%build_flavor = %version +Obsoletes: wlan-ng-kmp-%build_flavor < %version +Provides: wlan-ng-kmp-%build_flavor = %version # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor < %version +Provides: brocade-bfa-kmp-%build_flavor = %version +Obsoletes: enic-kmp-%build_flavor < %version +Provides: enic-kmp-%build_flavor = %version +Obsoletes: fnic-kmp-%build_flavor < %version +Provides: fnic-kmp-%build_flavor = %version +Obsoletes: iwlagn-2-6-27-kmp-%build_flavor < %version +Provides: iwlagn-2-6-27-kmp-%build_flavor = %version +Obsoletes: kvm-kmp-%build_flavor < %version +Provides: kvm-kmp-%build_flavor = %version +Obsoletes: msi-wmi-kmp-%build_flavor < %version +Provides: msi-wmi-kmp-%build_flavor = %version +Obsoletes: perfmon-kmp-%build_flavor < %version +Provides: perfmon-kmp-%build_flavor = %version # sle11 -Obsoletes: ocfs2-kmp-%build_flavor +Obsoletes: ocfs2-kmp-%build_flavor < %version +Provides: ocfs2-kmp-%build_flavor = %version # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +Provides: quickcam-kmp-%build_flavor = 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -387,11 +411,25 @@ # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 -%else - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + MAKE_ARGS="$MAKE_ARGS D=2" %endif +while true; do + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + | tee buildlog + if test "${PIPESTATUS[0]}" -eq 0; then + break + fi + # In the linux-next and vanilla branches, we try harder to build a + # package. + if test 0%vanilla_only -gt 0 && + %_sourcedir/try-disable-staging-driver buildlog; then + echo "Retrying make" + else + exit 1 + fi +done + %install # get rid of /usr/lib/rpm/brp-strip-debug @@ -501,6 +539,13 @@ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor image=vmlinux %endif +%ifarch %arm + add_vmlinux --compressed + # quickly compile uImage so we have something to boot from + make %{?_smp_mflags} uImage $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + image=uImage + cp -p arch/arm/boot/$image %buildroot/boot/uImage-%kernelrelease-%build_flavor +%endif # end of build_kdump %endif @@ -688,8 +733,7 @@ # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files -for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \ - %buildroot/lib/modules/*/{build,source}; do +for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done @@ -749,19 +793,20 @@ %if %split_base %files -f kernel-main.files +%defattr(-, root, root) %else %files -f kernel-base.files -%endif %defattr(-, root, root) +%endif %package base Summary: The Standard Kernel - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -793,7 +838,6 @@ %package extra Summary: The Standard Kernel - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -834,7 +878,6 @@ %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -850,7 +893,6 @@ %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -886,7 +928,6 @@ %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-desktop # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define srcversion 3.1 -%define patchversion 3.1.0 +%define patchversion 3.1.7 %define variant %{nil} +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -35,7 +34,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -55,13 +54,15 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop -Version: 3.1.0 -Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel +Version: 3.1.7 +Release: 0 Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel @@ -97,18 +98,21 @@ BuildRequires: dwarfextract %endif %endif +%ifarch %arm +BuildRequires: u-boot-tools +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae <= %version +Obsoletes: kernel-xenpae < %version %endif %endif #!BuildIgnore: xen %endif -Provides: %name-nongpl -Obsoletes: %name-nongpl +Provides: %name-nongpl = %version +Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -127,8 +131,7 @@ %endif Provides: kernel = %version-%source_rel - -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -170,6 +173,7 @@ Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h +Source69: try-disable-staging-driver Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -211,30 +215,49 @@ # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor +Obsoletes: iwlwifi-kmp-%build_flavor < %version +Provides: iwlwifi-kmp-%build_flavor = %version +Obsoletes: ipw3945-kmp-%build_flavor < %version +Provides: ipw3945-kmp-%build_flavor = %version # sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor +Obsoletes: uvcvideo-kmp-%build_flavor < %version +Provides: uvcvideo-kmp-%build_flavor = %version # 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +Obsoletes: atl2-kmp-%build_flavor < %version +Provides: atl2-kmp-%build_flavor = %version +Obsoletes: at76_usb-kmp-%build_flavor < %version +Provides: at76_usb-kmp-%build_flavor = %version +Obsoletes: btusb-kmp-%build_flavor < %version +Provides: btusb-kmp-%build_flavor = %version +Obsoletes: et131x-kmp-%build_flavor < %version +Provides: et131x-kmp-%build_flavor = %version +Obsoletes: ivtv-kmp-%build_flavor < %version +Provides: ivtv-kmp-%build_flavor = %version +Obsoletes: pcc-acpi-kmp-%build_flavor < %version +Provides: pcc-acpi-kmp-%build_flavor = %version +Obsoletes: wlan-ng-kmp-%build_flavor < %version +Provides: wlan-ng-kmp-%build_flavor = %version # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor < %version +Provides: brocade-bfa-kmp-%build_flavor = %version +Obsoletes: enic-kmp-%build_flavor < %version +Provides: enic-kmp-%build_flavor = %version +Obsoletes: fnic-kmp-%build_flavor < %version +Provides: fnic-kmp-%build_flavor = %version +Obsoletes: iwlagn-2-6-27-kmp-%build_flavor < %version +Provides: iwlagn-2-6-27-kmp-%build_flavor = %version +Obsoletes: kvm-kmp-%build_flavor < %version +Provides: kvm-kmp-%build_flavor = %version +Obsoletes: msi-wmi-kmp-%build_flavor < %version +Provides: msi-wmi-kmp-%build_flavor = %version +Obsoletes: perfmon-kmp-%build_flavor < %version +Provides: perfmon-kmp-%build_flavor = %version # sle11 -Obsoletes: ocfs2-kmp-%build_flavor +Obsoletes: ocfs2-kmp-%build_flavor < %version +Provides: ocfs2-kmp-%build_flavor = %version # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +Provides: quickcam-kmp-%build_flavor = 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -258,7 +281,6 @@ that support it, regardless of the amount of main memory. %endif - %source_timestamp %prep if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then @@ -381,11 +403,25 @@ # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 -%else - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + MAKE_ARGS="$MAKE_ARGS D=2" %endif +while true; do + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + | tee buildlog + if test "${PIPESTATUS[0]}" -eq 0; then + break + fi + # In the linux-next and vanilla branches, we try harder to build a + # package. + if test 0%vanilla_only -gt 0 && + %_sourcedir/try-disable-staging-driver buildlog; then + echo "Retrying make" + else + exit 1 + fi +done + %install # get rid of /usr/lib/rpm/brp-strip-debug @@ -495,6 +531,13 @@ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor image=vmlinux %endif +%ifarch %arm + add_vmlinux --compressed + # quickly compile uImage so we have something to boot from + make %{?_smp_mflags} uImage $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + image=uImage + cp -p arch/arm/boot/$image %buildroot/boot/uImage-%kernelrelease-%build_flavor +%endif # end of build_kdump %endif @@ -682,8 +725,7 @@ # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files -for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \ - %buildroot/lib/modules/*/{build,source}; do +for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done @@ -743,19 +785,20 @@ %if %split_base %files -f kernel-main.files +%defattr(-, root, root) %else %files -f kernel-base.files -%endif %defattr(-, root, root) +%endif %package base Summary: Kernel optimized for the desktop - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -782,7 +825,6 @@ This package contains only the base modules, required in all installs. - %source_timestamp %preun base -f preun-base.sh @@ -800,7 +842,6 @@ %package extra Summary: Kernel optimized for the desktop - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -834,7 +875,6 @@ This package contains additional modules not supported by Novell. - %source_timestamp %preun extra -f preun-extra.sh @@ -854,7 +894,6 @@ %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -870,7 +909,6 @@ %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -906,7 +944,6 @@ %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-docs # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -%define patchversion 3.1.0 +%define patchversion 3.1.7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.1.0 +License: GPL-2.0 +Group: Documentation/Man +Version: 3.1.7 Release: 0 -BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel +BuildRequires: docbook-toys +BuildRequires: docbook-utils +BuildRequires: ghostscript_any BuildRequires: kernel-source%variant +BuildRequires: libjpeg-devel +BuildRequires: texlive +BuildRequires: transfig +BuildRequires: xmlto +BuildRequires: xorg-x11-devel Url: http://www.kernel.org/ -License: GPL v2 or later -Group: Documentation/Man Provides: %name = %version-%source_rel BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-ec2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define srcversion 3.1 -%define patchversion 3.1.0 +%define patchversion 3.1.7 %define variant %{nil} +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -35,7 +34,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -55,13 +54,15 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel -Version: 3.1.0 -Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel +Version: 3.1.7 +Release: 0 Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel @@ -97,18 +98,21 @@ BuildRequires: dwarfextract %endif %endif +%ifarch %arm +BuildRequires: u-boot-tools +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae <= %version +Obsoletes: kernel-xenpae < %version %endif %endif #!BuildIgnore: xen %endif -Provides: %name-nongpl -Obsoletes: %name-nongpl +Provides: %name-nongpl = %version +Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -127,8 +131,7 @@ %endif Provides: kernel = %version-%source_rel - -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -170,6 +173,7 @@ Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h +Source69: try-disable-staging-driver Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -211,30 +215,49 @@ # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor +Obsoletes: iwlwifi-kmp-%build_flavor < %version +Provides: iwlwifi-kmp-%build_flavor = %version +Obsoletes: ipw3945-kmp-%build_flavor < %version +Provides: ipw3945-kmp-%build_flavor = %version # sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor +Obsoletes: uvcvideo-kmp-%build_flavor < %version +Provides: uvcvideo-kmp-%build_flavor = %version # 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +Obsoletes: atl2-kmp-%build_flavor < %version +Provides: atl2-kmp-%build_flavor = %version +Obsoletes: at76_usb-kmp-%build_flavor < %version +Provides: at76_usb-kmp-%build_flavor = %version +Obsoletes: btusb-kmp-%build_flavor < %version +Provides: btusb-kmp-%build_flavor = %version +Obsoletes: et131x-kmp-%build_flavor < %version +Provides: et131x-kmp-%build_flavor = %version +Obsoletes: ivtv-kmp-%build_flavor < %version +Provides: ivtv-kmp-%build_flavor = %version +Obsoletes: pcc-acpi-kmp-%build_flavor < %version +Provides: pcc-acpi-kmp-%build_flavor = %version +Obsoletes: wlan-ng-kmp-%build_flavor < %version +Provides: wlan-ng-kmp-%build_flavor = %version # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor < %version +Provides: brocade-bfa-kmp-%build_flavor = %version +Obsoletes: enic-kmp-%build_flavor < %version +Provides: enic-kmp-%build_flavor = %version +Obsoletes: fnic-kmp-%build_flavor < %version +Provides: fnic-kmp-%build_flavor = %version +Obsoletes: iwlagn-2-6-27-kmp-%build_flavor < %version +Provides: iwlagn-2-6-27-kmp-%build_flavor = %version +Obsoletes: kvm-kmp-%build_flavor < %version +Provides: kvm-kmp-%build_flavor = %version +Obsoletes: msi-wmi-kmp-%build_flavor < %version +Provides: msi-wmi-kmp-%build_flavor = %version +Obsoletes: perfmon-kmp-%build_flavor < %version +Provides: perfmon-kmp-%build_flavor = %version # sle11 -Obsoletes: ocfs2-kmp-%build_flavor +Obsoletes: ocfs2-kmp-%build_flavor < %version +Provides: ocfs2-kmp-%build_flavor = %version # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +Provides: quickcam-kmp-%build_flavor = 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -371,11 +394,25 @@ # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 -%else - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + MAKE_ARGS="$MAKE_ARGS D=2" %endif +while true; do + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + | tee buildlog + if test "${PIPESTATUS[0]}" -eq 0; then + break + fi + # In the linux-next and vanilla branches, we try harder to build a + # package. + if test 0%vanilla_only -gt 0 && + %_sourcedir/try-disable-staging-driver buildlog; then + echo "Retrying make" + else + exit 1 + fi +done + %install # get rid of /usr/lib/rpm/brp-strip-debug @@ -485,6 +522,13 @@ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor image=vmlinux %endif +%ifarch %arm + add_vmlinux --compressed + # quickly compile uImage so we have something to boot from + make %{?_smp_mflags} uImage $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + image=uImage + cp -p arch/arm/boot/$image %buildroot/boot/uImage-%kernelrelease-%build_flavor +%endif # end of build_kdump %endif @@ -672,8 +716,7 @@ # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files -for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \ - %buildroot/lib/modules/*/{build,source}; do +for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done @@ -733,19 +776,20 @@ %if %split_base %files -f kernel-main.files +%defattr(-, root, root) %else %files -f kernel-base.files -%endif %defattr(-, root, root) +%endif %package base Summary: The Amazon EC2 Xen Kernel - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -780,7 +824,6 @@ %package extra Summary: The Amazon EC2 Xen Kernel - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -824,7 +867,6 @@ %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -840,7 +882,6 @@ %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -876,7 +917,6 @@ %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-pae # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define srcversion 3.1 -%define patchversion 3.1.0 +%define patchversion 3.1.7 %define variant %{nil} +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -35,7 +34,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -55,13 +54,15 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 3.1.0 -Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel +Version: 3.1.7 +Release: 0 Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel @@ -97,18 +98,21 @@ BuildRequires: dwarfextract %endif %endif +%ifarch %arm +BuildRequires: u-boot-tools +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae <= %version +Obsoletes: kernel-xenpae < %version %endif %endif #!BuildIgnore: xen %endif -Provides: %name-nongpl -Obsoletes: %name-nongpl +Provides: %name-nongpl = %version +Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -131,7 +135,7 @@ Obsoletes: kernel-bigsmp %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -173,6 +177,7 @@ Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h +Source69: try-disable-staging-driver Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -214,30 +219,49 @@ # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor +Obsoletes: iwlwifi-kmp-%build_flavor < %version +Provides: iwlwifi-kmp-%build_flavor = %version +Obsoletes: ipw3945-kmp-%build_flavor < %version +Provides: ipw3945-kmp-%build_flavor = %version # sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor +Obsoletes: uvcvideo-kmp-%build_flavor < %version +Provides: uvcvideo-kmp-%build_flavor = %version # 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +Obsoletes: atl2-kmp-%build_flavor < %version +Provides: atl2-kmp-%build_flavor = %version +Obsoletes: at76_usb-kmp-%build_flavor < %version +Provides: at76_usb-kmp-%build_flavor = %version +Obsoletes: btusb-kmp-%build_flavor < %version +Provides: btusb-kmp-%build_flavor = %version +Obsoletes: et131x-kmp-%build_flavor < %version +Provides: et131x-kmp-%build_flavor = %version +Obsoletes: ivtv-kmp-%build_flavor < %version +Provides: ivtv-kmp-%build_flavor = %version +Obsoletes: pcc-acpi-kmp-%build_flavor < %version +Provides: pcc-acpi-kmp-%build_flavor = %version +Obsoletes: wlan-ng-kmp-%build_flavor < %version +Provides: wlan-ng-kmp-%build_flavor = %version # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor < %version +Provides: brocade-bfa-kmp-%build_flavor = %version +Obsoletes: enic-kmp-%build_flavor < %version +Provides: enic-kmp-%build_flavor = %version +Obsoletes: fnic-kmp-%build_flavor < %version +Provides: fnic-kmp-%build_flavor = %version +Obsoletes: iwlagn-2-6-27-kmp-%build_flavor < %version +Provides: iwlagn-2-6-27-kmp-%build_flavor = %version +Obsoletes: kvm-kmp-%build_flavor < %version +Provides: kvm-kmp-%build_flavor = %version +Obsoletes: msi-wmi-kmp-%build_flavor < %version +Provides: msi-wmi-kmp-%build_flavor = %version +Obsoletes: perfmon-kmp-%build_flavor < %version +Provides: perfmon-kmp-%build_flavor = %version # sle11 -Obsoletes: ocfs2-kmp-%build_flavor +Obsoletes: ocfs2-kmp-%build_flavor < %version +Provides: ocfs2-kmp-%build_flavor = %version # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +Provides: quickcam-kmp-%build_flavor = 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -378,11 +402,25 @@ # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 -%else - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + MAKE_ARGS="$MAKE_ARGS D=2" %endif +while true; do + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + | tee buildlog + if test "${PIPESTATUS[0]}" -eq 0; then + break + fi + # In the linux-next and vanilla branches, we try harder to build a + # package. + if test 0%vanilla_only -gt 0 && + %_sourcedir/try-disable-staging-driver buildlog; then + echo "Retrying make" + else + exit 1 + fi +done + %install # get rid of /usr/lib/rpm/brp-strip-debug @@ -492,6 +530,13 @@ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor image=vmlinux %endif +%ifarch %arm + add_vmlinux --compressed + # quickly compile uImage so we have something to boot from + make %{?_smp_mflags} uImage $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + image=uImage + cp -p arch/arm/boot/$image %buildroot/boot/uImage-%kernelrelease-%build_flavor +%endif # end of build_kdump %endif @@ -679,8 +724,7 @@ # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files -for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \ - %buildroot/lib/modules/*/{build,source}; do +for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done @@ -740,19 +784,20 @@ %if %split_base %files -f kernel-main.files +%defattr(-, root, root) %else %files -f kernel-base.files -%endif %defattr(-, root, root) +%endif %package base Summary: Kernel with PAE Support - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -791,7 +836,6 @@ %package extra Summary: Kernel with PAE Support - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -839,7 +883,6 @@ %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -855,7 +898,6 @@ %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -891,7 +933,6 @@ %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-ppc64 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define srcversion 3.1 -%define patchversion 3.1.0 +%define patchversion 3.1.7 %define variant %{nil} +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -35,7 +34,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -55,13 +54,15 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems -Version: 3.1.0 -Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel +Version: 3.1.7 +Release: 0 Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel @@ -97,18 +98,21 @@ BuildRequires: dwarfextract %endif %endif +%ifarch %arm +BuildRequires: u-boot-tools +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae <= %version +Obsoletes: kernel-xenpae < %version %endif %endif #!BuildIgnore: xen %endif -Provides: %name-nongpl -Obsoletes: %name-nongpl +Provides: %name-nongpl = %version +Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -135,7 +139,7 @@ Obsoletes: kernel-kdump %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -177,6 +181,7 @@ Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h +Source69: try-disable-staging-driver Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -218,30 +223,49 @@ # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor +Obsoletes: iwlwifi-kmp-%build_flavor < %version +Provides: iwlwifi-kmp-%build_flavor = %version +Obsoletes: ipw3945-kmp-%build_flavor < %version +Provides: ipw3945-kmp-%build_flavor = %version # sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor +Obsoletes: uvcvideo-kmp-%build_flavor < %version +Provides: uvcvideo-kmp-%build_flavor = %version # 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +Obsoletes: atl2-kmp-%build_flavor < %version +Provides: atl2-kmp-%build_flavor = %version +Obsoletes: at76_usb-kmp-%build_flavor < %version +Provides: at76_usb-kmp-%build_flavor = %version +Obsoletes: btusb-kmp-%build_flavor < %version +Provides: btusb-kmp-%build_flavor = %version +Obsoletes: et131x-kmp-%build_flavor < %version +Provides: et131x-kmp-%build_flavor = %version +Obsoletes: ivtv-kmp-%build_flavor < %version +Provides: ivtv-kmp-%build_flavor = %version +Obsoletes: pcc-acpi-kmp-%build_flavor < %version +Provides: pcc-acpi-kmp-%build_flavor = %version +Obsoletes: wlan-ng-kmp-%build_flavor < %version +Provides: wlan-ng-kmp-%build_flavor = %version # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor < %version +Provides: brocade-bfa-kmp-%build_flavor = %version +Obsoletes: enic-kmp-%build_flavor < %version +Provides: enic-kmp-%build_flavor = %version +Obsoletes: fnic-kmp-%build_flavor < %version +Provides: fnic-kmp-%build_flavor = %version +Obsoletes: iwlagn-2-6-27-kmp-%build_flavor < %version +Provides: iwlagn-2-6-27-kmp-%build_flavor = %version +Obsoletes: kvm-kmp-%build_flavor < %version +Provides: kvm-kmp-%build_flavor = %version +Obsoletes: msi-wmi-kmp-%build_flavor < %version +Provides: msi-wmi-kmp-%build_flavor = %version +Obsoletes: perfmon-kmp-%build_flavor < %version +Provides: perfmon-kmp-%build_flavor = %version # sle11 -Obsoletes: ocfs2-kmp-%build_flavor +Obsoletes: ocfs2-kmp-%build_flavor < %version +Provides: ocfs2-kmp-%build_flavor = %version # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +Provides: quickcam-kmp-%build_flavor = 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -382,11 +406,25 @@ # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 -%else - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + MAKE_ARGS="$MAKE_ARGS D=2" %endif +while true; do + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + | tee buildlog + if test "${PIPESTATUS[0]}" -eq 0; then + break + fi + # In the linux-next and vanilla branches, we try harder to build a + # package. + if test 0%vanilla_only -gt 0 && + %_sourcedir/try-disable-staging-driver buildlog; then + echo "Retrying make" + else + exit 1 + fi +done + %install # get rid of /usr/lib/rpm/brp-strip-debug @@ -496,6 +534,13 @@ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor image=vmlinux %endif +%ifarch %arm + add_vmlinux --compressed + # quickly compile uImage so we have something to boot from + make %{?_smp_mflags} uImage $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + image=uImage + cp -p arch/arm/boot/$image %buildroot/boot/uImage-%kernelrelease-%build_flavor +%endif # end of build_kdump %endif @@ -683,8 +728,7 @@ # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files -for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \ - %buildroot/lib/modules/*/{build,source}; do +for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done @@ -744,19 +788,20 @@ %if %split_base %files -f kernel-main.files +%defattr(-, root, root) %else %files -f kernel-base.files -%endif %defattr(-, root, root) +%endif %package base Summary: Kernel for ppc64 Systems - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -795,7 +840,6 @@ %package extra Summary: Kernel for ppc64 Systems - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -843,7 +887,6 @@ %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -859,7 +902,6 @@ %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -895,7 +937,6 @@ %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-s390 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define srcversion 3.1 -%define patchversion 3.1.0 +%define patchversion 3.1.7 %define variant %{nil} +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -35,7 +34,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -55,13 +54,15 @@ Name: kernel-s390 Summary: The Standard Kernel -Version: 3.1.0 -Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel +Version: 3.1.7 +Release: 0 Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel @@ -97,18 +98,21 @@ BuildRequires: dwarfextract %endif %endif +%ifarch %arm +BuildRequires: u-boot-tools +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae <= %version +Obsoletes: kernel-xenpae < %version %endif %endif #!BuildIgnore: xen %endif -Provides: %name-nongpl -Obsoletes: %name-nongpl +Provides: %name-nongpl = %version +Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -131,7 +135,7 @@ Obsoletes: kernel-32bit %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -173,6 +177,7 @@ Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h +Source69: try-disable-staging-driver Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -214,30 +219,49 @@ # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor +Obsoletes: iwlwifi-kmp-%build_flavor < %version +Provides: iwlwifi-kmp-%build_flavor = %version +Obsoletes: ipw3945-kmp-%build_flavor < %version +Provides: ipw3945-kmp-%build_flavor = %version # sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor +Obsoletes: uvcvideo-kmp-%build_flavor < %version +Provides: uvcvideo-kmp-%build_flavor = %version # 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +Obsoletes: atl2-kmp-%build_flavor < %version +Provides: atl2-kmp-%build_flavor = %version +Obsoletes: at76_usb-kmp-%build_flavor < %version +Provides: at76_usb-kmp-%build_flavor = %version +Obsoletes: btusb-kmp-%build_flavor < %version +Provides: btusb-kmp-%build_flavor = %version +Obsoletes: et131x-kmp-%build_flavor < %version +Provides: et131x-kmp-%build_flavor = %version +Obsoletes: ivtv-kmp-%build_flavor < %version +Provides: ivtv-kmp-%build_flavor = %version +Obsoletes: pcc-acpi-kmp-%build_flavor < %version +Provides: pcc-acpi-kmp-%build_flavor = %version +Obsoletes: wlan-ng-kmp-%build_flavor < %version +Provides: wlan-ng-kmp-%build_flavor = %version # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor < %version +Provides: brocade-bfa-kmp-%build_flavor = %version +Obsoletes: enic-kmp-%build_flavor < %version +Provides: enic-kmp-%build_flavor = %version +Obsoletes: fnic-kmp-%build_flavor < %version +Provides: fnic-kmp-%build_flavor = %version +Obsoletes: iwlagn-2-6-27-kmp-%build_flavor < %version +Provides: iwlagn-2-6-27-kmp-%build_flavor = %version +Obsoletes: kvm-kmp-%build_flavor < %version +Provides: kvm-kmp-%build_flavor = %version +Obsoletes: msi-wmi-kmp-%build_flavor < %version +Provides: msi-wmi-kmp-%build_flavor = %version +Obsoletes: perfmon-kmp-%build_flavor < %version +Provides: perfmon-kmp-%build_flavor = %version # sle11 -Obsoletes: ocfs2-kmp-%build_flavor +Obsoletes: ocfs2-kmp-%build_flavor < %version +Provides: ocfs2-kmp-%build_flavor = %version # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +Provides: quickcam-kmp-%build_flavor = 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -371,11 +395,25 @@ # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 -%else - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + MAKE_ARGS="$MAKE_ARGS D=2" %endif +while true; do + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + | tee buildlog + if test "${PIPESTATUS[0]}" -eq 0; then + break + fi + # In the linux-next and vanilla branches, we try harder to build a + # package. + if test 0%vanilla_only -gt 0 && + %_sourcedir/try-disable-staging-driver buildlog; then + echo "Retrying make" + else + exit 1 + fi +done + %install # get rid of /usr/lib/rpm/brp-strip-debug @@ -485,6 +523,13 @@ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor image=vmlinux %endif +%ifarch %arm + add_vmlinux --compressed + # quickly compile uImage so we have something to boot from + make %{?_smp_mflags} uImage $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + image=uImage + cp -p arch/arm/boot/$image %buildroot/boot/uImage-%kernelrelease-%build_flavor +%endif # end of build_kdump %endif @@ -672,8 +717,7 @@ # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files -for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \ - %buildroot/lib/modules/*/{build,source}; do +for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done @@ -733,19 +777,20 @@ %if %split_base %files -f kernel-main.files +%defattr(-, root, root) %else %files -f kernel-base.files -%endif %defattr(-, root, root) +%endif %package base Summary: The Standard Kernel - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -777,7 +822,6 @@ %package extra Summary: The Standard Kernel - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -818,7 +862,6 @@ %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -834,7 +877,6 @@ %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -870,7 +912,6 @@ %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-source # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,12 +14,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild # icecream 0 + %define srcversion 3.1 -%define patchversion 3.1.0 +%define patchversion 3.1.7 %define variant %{nil} %define vanilla_only 0 @@ -29,19 +28,20 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.1.0 -Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: Development/Sources +Version: 3.1.7 +Release: 0 Url: http://www.kernel.org/ AutoReqProv: off -BuildRequires: coreutils sed +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: sed Requires(post): coreutils sed Provides: multiversion(kernel) Provides: linux Provides: %name = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -83,6 +83,7 @@ Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h +Source69: try-disable-staging-driver Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -105,7 +106,7 @@ # Source is only complete with devel files. Requires: kernel-devel = %version-%release -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver}) %define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac) @@ -119,7 +120,6 @@ %source_timestamp %package -n kernel-devel%variant Summary: Development files needed for building kernel modules -License: GPL v2 only Group: Development/Sources AutoReqProv: off Provides: multiversion(kernel) @@ -133,7 +133,6 @@ %source_timestamp %package vanilla Summary: Vanilla Linux kernel sources with minor build fixes. -License: GPL v2 only Group: Development/Sources AutoReqProv: off Provides: multiversion(kernel) @@ -233,7 +232,6 @@ %files -f nondevel.files %defattr(-, root, root) -%ghost /usr/src/linux%variant /usr/src/linux%variant-%kernelrelease/README.SUSE %files -n kernel-devel%variant -f devel.files ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-syms # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,23 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.1.0 -%if %using_buildservice +License: GPL-2.0 +Group: Development/Sources +Version: 3.1.7 Release: 0 +%if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) -Release: %kernel_source_release %endif -License: GPL v2 only -Group: Development/Sources Url: http://www.kernel.org/ AutoReqProv: off BuildRequires: coreutils ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-trace # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define srcversion 3.1 -%define patchversion 3.1.0 +%define patchversion 3.1.7 %define variant %{nil} +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -35,7 +34,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -55,13 +54,15 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.1.0 -Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel +Version: 3.1.7 +Release: 0 Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel @@ -97,18 +98,21 @@ BuildRequires: dwarfextract %endif %endif +%ifarch %arm +BuildRequires: u-boot-tools +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae <= %version +Obsoletes: kernel-xenpae < %version %endif %endif #!BuildIgnore: xen %endif -Provides: %name-nongpl -Obsoletes: %name-nongpl +Provides: %name-nongpl = %version +Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -139,7 +143,7 @@ Obsoletes: kernel-64bit %endif -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -181,6 +185,7 @@ Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h +Source69: try-disable-staging-driver Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -222,30 +227,49 @@ # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor +Obsoletes: iwlwifi-kmp-%build_flavor < %version +Provides: iwlwifi-kmp-%build_flavor = %version +Obsoletes: ipw3945-kmp-%build_flavor < %version +Provides: ipw3945-kmp-%build_flavor = %version # sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor +Obsoletes: uvcvideo-kmp-%build_flavor < %version +Provides: uvcvideo-kmp-%build_flavor = %version # 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +Obsoletes: atl2-kmp-%build_flavor < %version +Provides: atl2-kmp-%build_flavor = %version +Obsoletes: at76_usb-kmp-%build_flavor < %version +Provides: at76_usb-kmp-%build_flavor = %version +Obsoletes: btusb-kmp-%build_flavor < %version +Provides: btusb-kmp-%build_flavor = %version +Obsoletes: et131x-kmp-%build_flavor < %version +Provides: et131x-kmp-%build_flavor = %version +Obsoletes: ivtv-kmp-%build_flavor < %version +Provides: ivtv-kmp-%build_flavor = %version +Obsoletes: pcc-acpi-kmp-%build_flavor < %version +Provides: pcc-acpi-kmp-%build_flavor = %version +Obsoletes: wlan-ng-kmp-%build_flavor < %version +Provides: wlan-ng-kmp-%build_flavor = %version # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor < %version +Provides: brocade-bfa-kmp-%build_flavor = %version +Obsoletes: enic-kmp-%build_flavor < %version +Provides: enic-kmp-%build_flavor = %version +Obsoletes: fnic-kmp-%build_flavor < %version +Provides: fnic-kmp-%build_flavor = %version +Obsoletes: iwlagn-2-6-27-kmp-%build_flavor < %version +Provides: iwlagn-2-6-27-kmp-%build_flavor = %version +Obsoletes: kvm-kmp-%build_flavor < %version +Provides: kvm-kmp-%build_flavor = %version +Obsoletes: msi-wmi-kmp-%build_flavor < %version +Provides: msi-wmi-kmp-%build_flavor = %version +Obsoletes: perfmon-kmp-%build_flavor < %version +Provides: perfmon-kmp-%build_flavor = %version # sle11 -Obsoletes: ocfs2-kmp-%build_flavor +Obsoletes: ocfs2-kmp-%build_flavor < %version +Provides: ocfs2-kmp-%build_flavor = %version # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +Provides: quickcam-kmp-%build_flavor = 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -379,11 +403,25 @@ # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 -%else - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + MAKE_ARGS="$MAKE_ARGS D=2" %endif +while true; do + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + | tee buildlog + if test "${PIPESTATUS[0]}" -eq 0; then + break + fi + # In the linux-next and vanilla branches, we try harder to build a + # package. + if test 0%vanilla_only -gt 0 && + %_sourcedir/try-disable-staging-driver buildlog; then + echo "Retrying make" + else + exit 1 + fi +done + %install # get rid of /usr/lib/rpm/brp-strip-debug @@ -493,6 +531,13 @@ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor image=vmlinux %endif +%ifarch %arm + add_vmlinux --compressed + # quickly compile uImage so we have something to boot from + make %{?_smp_mflags} uImage $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + image=uImage + cp -p arch/arm/boot/$image %buildroot/boot/uImage-%kernelrelease-%build_flavor +%endif # end of build_kdump %endif @@ -680,8 +725,7 @@ # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files -for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \ - %buildroot/lib/modules/*/{build,source}; do +for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done @@ -741,19 +785,20 @@ %if %split_base %files -f kernel-main.files +%defattr(-, root, root) %else %files -f kernel-base.files -%endif %defattr(-, root, root) +%endif %package base Summary: The Standard Kernel with Tracing Features - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -785,7 +830,6 @@ %package extra Summary: The Standard Kernel with Tracing Features - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -826,7 +870,6 @@ %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -842,7 +885,6 @@ %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -878,7 +920,6 @@ %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo kernel-vanilla.spec: same change ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-xen # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define srcversion 3.1 -%define patchversion 3.1.0 +%define patchversion 3.1.7 %define variant %{nil} +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -35,7 +34,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) +%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -55,13 +54,15 @@ Name: kernel-xen Summary: The Xen Kernel -Version: 3.1.0 -Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel +Version: 3.1.7 +Release: 0 Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel @@ -97,18 +98,21 @@ BuildRequires: dwarfextract %endif %endif +%ifarch %arm +BuildRequires: u-boot-tools +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae <= %version +Obsoletes: kernel-xenpae < %version %endif %endif #!BuildIgnore: xen %endif -Provides: %name-nongpl -Obsoletes: %name-nongpl +Provides: %name-nongpl = %version +Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -127,8 +131,7 @@ %endif Provides: kernel = %version-%source_rel - -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -170,6 +173,7 @@ Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h +Source69: try-disable-staging-driver Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -211,30 +215,49 @@ # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor +Obsoletes: iwlwifi-kmp-%build_flavor < %version +Provides: iwlwifi-kmp-%build_flavor = %version +Obsoletes: ipw3945-kmp-%build_flavor < %version +Provides: ipw3945-kmp-%build_flavor = %version # sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor +Obsoletes: uvcvideo-kmp-%build_flavor < %version +Provides: uvcvideo-kmp-%build_flavor = %version # 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +Obsoletes: atl2-kmp-%build_flavor < %version +Provides: atl2-kmp-%build_flavor = %version +Obsoletes: at76_usb-kmp-%build_flavor < %version +Provides: at76_usb-kmp-%build_flavor = %version +Obsoletes: btusb-kmp-%build_flavor < %version +Provides: btusb-kmp-%build_flavor = %version +Obsoletes: et131x-kmp-%build_flavor < %version +Provides: et131x-kmp-%build_flavor = %version +Obsoletes: ivtv-kmp-%build_flavor < %version +Provides: ivtv-kmp-%build_flavor = %version +Obsoletes: pcc-acpi-kmp-%build_flavor < %version +Provides: pcc-acpi-kmp-%build_flavor = %version +Obsoletes: wlan-ng-kmp-%build_flavor < %version +Provides: wlan-ng-kmp-%build_flavor = %version # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor < %version +Provides: brocade-bfa-kmp-%build_flavor = %version +Obsoletes: enic-kmp-%build_flavor < %version +Provides: enic-kmp-%build_flavor = %version +Obsoletes: fnic-kmp-%build_flavor < %version +Provides: fnic-kmp-%build_flavor = %version +Obsoletes: iwlagn-2-6-27-kmp-%build_flavor < %version +Provides: iwlagn-2-6-27-kmp-%build_flavor = %version +Obsoletes: kvm-kmp-%build_flavor < %version +Provides: kvm-kmp-%build_flavor = %version +Obsoletes: msi-wmi-kmp-%build_flavor < %version +Provides: msi-wmi-kmp-%build_flavor = %version +Obsoletes: perfmon-kmp-%build_flavor < %version +Provides: perfmon-kmp-%build_flavor = %version # sle11 -Obsoletes: ocfs2-kmp-%build_flavor +Obsoletes: ocfs2-kmp-%build_flavor < %version +Provides: ocfs2-kmp-%build_flavor = %version # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +Provides: quickcam-kmp-%build_flavor = 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -371,11 +394,25 @@ # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 -%else - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + MAKE_ARGS="$MAKE_ARGS D=2" %endif +while true; do + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + | tee buildlog + if test "${PIPESTATUS[0]}" -eq 0; then + break + fi + # In the linux-next and vanilla branches, we try harder to build a + # package. + if test 0%vanilla_only -gt 0 && + %_sourcedir/try-disable-staging-driver buildlog; then + echo "Retrying make" + else + exit 1 + fi +done + %install # get rid of /usr/lib/rpm/brp-strip-debug @@ -485,6 +522,13 @@ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor image=vmlinux %endif +%ifarch %arm + add_vmlinux --compressed + # quickly compile uImage so we have something to boot from + make %{?_smp_mflags} uImage $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + image=uImage + cp -p arch/arm/boot/$image %buildroot/boot/uImage-%kernelrelease-%build_flavor +%endif # end of build_kdump %endif @@ -672,8 +716,7 @@ # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files -for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \ - %buildroot/lib/modules/*/{build,source}; do +for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done @@ -733,19 +776,20 @@ %if %split_base %files -f kernel-main.files +%defattr(-, root, root) %else %files -f kernel-base.files -%endif %defattr(-, root, root) +%endif %package base Summary: The Xen Kernel - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -780,7 +824,6 @@ %package extra Summary: The Xen Kernel - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -824,7 +867,6 @@ %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -840,7 +882,6 @@ %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -876,7 +917,6 @@ %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo ++++++ arch-symbols ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -25,7 +25,7 @@ if [ "$1" = "--list" ]; then # List all known architectures - echo i386 mips{,64} sparc{,64} ppc{,64} s390{,x} ia64 x86_64 alpha parisc arm + echo i386 mips{,64} sparc{,64} ppc{,64} s390{,x} ia64 x86_64 alpha parisc armv7l exit 0 fi ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:51.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:51.000000000 +0100 @@ -3,5 +3,4 @@ # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against -OBS_PROJECT=openSUSE:Factory -IBS_PROJECT=SUSE:Factory:Head +OBS_PROJECT=openSUSE:12.1 ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2011-09-28 16:41:36.000000000 +0200 +++ new/config/i386/debug 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc6 Kernel Configuration +# Linux/i386 3.1.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4537,7 +4537,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4669,6 +4669,7 @@ CONFIG_USB_STORAGE=m CONFIG_USB_STORAGE_DEBUG=y CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default --- old/config/i386/default 2011-09-28 16:41:36.000000000 +0200 +++ new/config/i386/default 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc6 Kernel Configuration +# Linux/i386 3.1.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4539,7 +4539,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4671,6 +4671,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop --- old/config/i386/desktop 2011-09-28 16:41:36.000000000 +0200 +++ new/config/i386/desktop 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc6 Kernel Configuration +# Linux/i386 3.1.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4384,7 +4384,7 @@ # CONFIG_HID_A4TECH=y CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=y CONFIG_HID_BELKIN=y CONFIG_HID_CHERRY=y @@ -4515,6 +4515,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=y CONFIG_USB_STORAGE_FREECOM=y CONFIG_USB_STORAGE_ISD200=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/ec2 new/config/i386/ec2 --- old/config/i386/ec2 2011-09-28 16:41:36.000000000 +0200 +++ new/config/i386/ec2 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc6 Kernel Configuration +# Linux/i386 3.1.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2011-09-28 16:41:36.000000000 +0200 +++ new/config/i386/pae 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc6 Kernel Configuration +# Linux/i386 3.1.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4383,7 +4383,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4515,6 +4515,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/trace new/config/i386/trace --- old/config/i386/trace 2011-09-28 16:41:36.000000000 +0200 +++ new/config/i386/trace 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc6 Kernel Configuration +# Linux/i386 3.1.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4383,7 +4383,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4515,6 +4515,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vanilla new/config/i386/vanilla --- old/config/i386/vanilla 2011-09-28 16:41:36.000000000 +0200 +++ new/config/i386/vanilla 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc5 Kernel Configuration +# Linux/i386 3.1.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4519,7 +4519,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4651,6 +4651,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2011-09-28 16:41:36.000000000 +0200 +++ new/config/i386/xen 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0-rc7 Kernel Configuration +# Linux/i386 3.1.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4204,7 +4204,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4336,6 +4336,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m @@ -4760,13 +4761,13 @@ # # PCI Backend Mode # -CONFIG_XEN_PCIDEV_BACKEND_VPCI=y -CONFIG_XEN_PCIDEV_BACKEND_PASSTHROUGH=y -CONFIG_XEN_PCIDEV_BACKEND_SLOT=y CONFIG_XEN_PCIDEV_BACKEND_DEFAULT_VPCI=y # CONFIG_XEN_PCIDEV_BACKEND_DEFAULT_PASSTHROUGH is not set # CONFIG_XEN_PCIDEV_BACKEND_DEFAULT_SLOT is not set CONFIG_XEN_PCIDEV_BACKEND_DEFAULT="vpci" +CONFIG_XEN_PCIDEV_BACKEND_VPCI=y +CONFIG_XEN_PCIDEV_BACKEND_PASSTHROUGH=y +CONFIG_XEN_PCIDEV_BACKEND_SLOT=y CONFIG_STAGING=y CONFIG_ET131X=m # CONFIG_ET131X_DEBUG is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2011-09-28 16:41:36.000000000 +0200 +++ new/config/ia64/debug 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/ia64 3.1.0-rc6 Kernel Configuration +# Linux/ia64 3.1.1 Kernel Configuration # CONFIG_SUSE_KERNEL=y # CONFIG_ENTERPRISE_SUPPORT is not set @@ -3832,7 +3832,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -3964,6 +3964,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2011-09-28 16:41:36.000000000 +0200 +++ new/config/ia64/default 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/ia64 3.1.0-rc6 Kernel Configuration +# Linux/ia64 3.1.1 Kernel Configuration # CONFIG_SUSE_KERNEL=y # CONFIG_ENTERPRISE_SUPPORT is not set @@ -3820,7 +3820,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -3952,6 +3952,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/trace new/config/ia64/trace --- old/config/ia64/trace 2011-09-28 16:41:36.000000000 +0200 +++ new/config/ia64/trace 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/ia64 3.1.0-rc6 Kernel Configuration +# Linux/ia64 3.1.1 Kernel Configuration # CONFIG_SUSE_KERNEL=y # CONFIG_ENTERPRISE_SUPPORT is not set @@ -3820,7 +3820,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -3952,6 +3952,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/vanilla new/config/ia64/vanilla --- old/config/ia64/vanilla 2011-09-28 16:41:36.000000000 +0200 +++ new/config/ia64/vanilla 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/ia64 3.1.0-rc5 Kernel Configuration +# Linux/ia64 3.1.1 Kernel Configuration # CONFIG_SUSE_KERNEL=y CONFIG_SPLIT_PACKAGE=y @@ -3808,7 +3808,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -3940,6 +3940,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default --- old/config/ppc/default 2011-09-28 16:41:36.000000000 +0200 +++ new/config/ppc/default 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.1.0-rc6 Kernel Configuration +# Linux/powerpc 3.1.1 Kernel Configuration # # CONFIG_PPC64 is not set @@ -3689,7 +3689,7 @@ # CONFIG_HID_A4TECH=y CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=y CONFIG_HID_BELKIN=y CONFIG_HID_CHERRY=y @@ -3825,6 +3825,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/ppc64 new/config/ppc/ppc64 --- old/config/ppc/ppc64 2011-09-28 16:41:36.000000000 +0200 +++ new/config/ppc/ppc64 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.1.0-rc6 Kernel Configuration +# Linux/powerpc 3.1.1 Kernel Configuration # CONFIG_PPC64=y @@ -3682,7 +3682,7 @@ # CONFIG_HID_A4TECH=y CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=y CONFIG_HID_BELKIN=y CONFIG_HID_CHERRY=y @@ -3817,6 +3817,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/vanilla new/config/ppc/vanilla --- old/config/ppc/vanilla 2011-09-28 16:41:36.000000000 +0200 +++ new/config/ppc/vanilla 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.1.0-rc5 Kernel Configuration +# Linux/powerpc 3.1.1 Kernel Configuration # # CONFIG_PPC64 is not set @@ -3677,7 +3677,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -3816,6 +3816,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/debug new/config/ppc64/debug --- old/config/ppc64/debug 2011-09-28 16:41:36.000000000 +0200 +++ new/config/ppc64/debug 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.1.0-rc6 Kernel Configuration +# Linux/powerpc 3.1.1 Kernel Configuration # CONFIG_PPC64=y @@ -3675,7 +3675,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -3811,6 +3811,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default --- old/config/ppc64/default 2011-09-28 16:41:36.000000000 +0200 +++ new/config/ppc64/default 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.1.0-rc6 Kernel Configuration +# Linux/powerpc 3.1.1 Kernel Configuration # CONFIG_PPC64=y @@ -3665,7 +3665,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -3801,6 +3801,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/ppc64 new/config/ppc64/ppc64 --- old/config/ppc64/ppc64 2011-09-28 16:41:36.000000000 +0200 +++ new/config/ppc64/ppc64 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.1.0-rc6 Kernel Configuration +# Linux/powerpc 3.1.1 Kernel Configuration # CONFIG_PPC64=y @@ -3740,7 +3740,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -3876,6 +3876,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/trace new/config/ppc64/trace --- old/config/ppc64/trace 2011-09-28 16:41:36.000000000 +0200 +++ new/config/ppc64/trace 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.1.0-rc6 Kernel Configuration +# Linux/powerpc 3.1.1 Kernel Configuration # CONFIG_PPC64=y @@ -3739,7 +3739,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -3875,6 +3875,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/vanilla new/config/ppc64/vanilla --- old/config/ppc64/vanilla 2011-09-28 16:41:36.000000000 +0200 +++ new/config/ppc64/vanilla 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 3.1.0-rc5 Kernel Configuration +# Linux/powerpc 3.1.1 Kernel Configuration # CONFIG_PPC64=y @@ -3650,7 +3650,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -3786,6 +3786,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m @@ -3962,6 +3963,7 @@ CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_MTHCA_DEBUG=y CONFIG_INFINIBAND_QIB=m +# CONFIG_INFINIBAND_EHCA is not set CONFIG_INFINIBAND_AMSO1100=m # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set CONFIG_INFINIBAND_CXGB3=m @@ -4957,4 +4959,3 @@ CONFIG_VIRTUALIZATION=y # CONFIG_KVM_BOOK3S_64 is not set # CONFIG_VHOST_NET is not set -# CONFIG_INFINIBAND_EHCA is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/s390 new/config/s390/s390 --- old/config/s390/s390 2011-09-28 16:41:36.000000000 +0200 +++ new/config/s390/s390 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 3.1.0-rc6 Kernel Configuration +# Linux/s390 3.1.1 Kernel Configuration # CONFIG_MMU=y CONFIG_ZONE_DMA=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/trace new/config/s390/trace --- old/config/s390/trace 2011-09-28 16:41:36.000000000 +0200 +++ new/config/s390/trace 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 3.1.0-rc6 Kernel Configuration +# Linux/s390 3.1.1 Kernel Configuration # CONFIG_MMU=y CONFIG_ZONE_DMA=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/vanilla new/config/s390/vanilla --- old/config/s390/vanilla 2011-09-28 16:41:36.000000000 +0200 +++ new/config/s390/vanilla 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 3.1.0-rc5 Kernel Configuration +# Linux/s390 3.1.1 Kernel Configuration # CONFIG_MMU=y CONFIG_ZONE_DMA=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/default new/config/s390x/default --- old/config/s390x/default 2011-09-28 16:41:36.000000000 +0200 +++ new/config/s390x/default 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 3.1.0-rc6 Kernel Configuration +# Linux/s390 3.1.1 Kernel Configuration # CONFIG_MMU=y CONFIG_ZONE_DMA=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/trace new/config/s390x/trace --- old/config/s390x/trace 2011-09-28 16:41:36.000000000 +0200 +++ new/config/s390x/trace 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 3.1.0-rc6 Kernel Configuration +# Linux/s390 3.1.1 Kernel Configuration # CONFIG_MMU=y CONFIG_ZONE_DMA=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/vanilla new/config/s390x/vanilla --- old/config/s390x/vanilla 2011-09-28 16:41:36.000000000 +0200 +++ new/config/s390x/vanilla 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 3.1.0-rc5 Kernel Configuration +# Linux/s390 3.1.1 Kernel Configuration # CONFIG_MMU=y CONFIG_ZONE_DMA=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2011-09-28 16:41:36.000000000 +0200 +++ new/config/x86_64/debug 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.0-rc6 Kernel Configuration +# Linux/x86_64 3.1.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4291,7 +4291,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4423,6 +4423,7 @@ CONFIG_USB_STORAGE=m CONFIG_USB_STORAGE_DEBUG=y CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2011-09-28 16:41:36.000000000 +0200 +++ new/config/x86_64/default 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.0-rc6 Kernel Configuration +# Linux/x86_64 3.1.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4301,7 +4301,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4433,6 +4433,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop --- old/config/x86_64/desktop 2011-09-28 16:41:36.000000000 +0200 +++ new/config/x86_64/desktop 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.0-rc6 Kernel Configuration +# Linux/x86_64 3.1.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4302,7 +4302,7 @@ # CONFIG_HID_A4TECH=y CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=y CONFIG_HID_BELKIN=y CONFIG_HID_CHERRY=y @@ -4433,6 +4433,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=y CONFIG_USB_STORAGE_FREECOM=y CONFIG_USB_STORAGE_ISD200=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/ec2 new/config/x86_64/ec2 --- old/config/x86_64/ec2 2011-09-28 16:41:36.000000000 +0200 +++ new/config/x86_64/ec2 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.0-rc6 Kernel Configuration +# Linux/x86_64 3.1.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/trace new/config/x86_64/trace --- old/config/x86_64/trace 2011-09-28 16:41:36.000000000 +0200 +++ new/config/x86_64/trace 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.0-rc6 Kernel Configuration +# Linux/x86_64 3.1.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4301,7 +4301,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4433,6 +4433,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/vanilla new/config/x86_64/vanilla --- old/config/x86_64/vanilla 2011-09-28 16:41:36.000000000 +0200 +++ new/config/x86_64/vanilla 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.0-rc5 Kernel Configuration +# Linux/x86_64 3.1.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4279,7 +4279,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4411,6 +4411,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2011-09-28 16:41:36.000000000 +0200 +++ new/config/x86_64/xen 2011-11-11 23:26:08.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.0-rc7 Kernel Configuration +# Linux/x86_64 3.1.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4142,7 +4142,7 @@ # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4274,6 +4274,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m @@ -4693,13 +4694,13 @@ # # PCI Backend Mode # -CONFIG_XEN_PCIDEV_BACKEND_VPCI=y -CONFIG_XEN_PCIDEV_BACKEND_PASSTHROUGH=y -CONFIG_XEN_PCIDEV_BACKEND_SLOT=y CONFIG_XEN_PCIDEV_BACKEND_DEFAULT_VPCI=y # CONFIG_XEN_PCIDEV_BACKEND_DEFAULT_PASSTHROUGH is not set # CONFIG_XEN_PCIDEV_BACKEND_DEFAULT_SLOT is not set CONFIG_XEN_PCIDEV_BACKEND_DEFAULT="vpci" +CONFIG_XEN_PCIDEV_BACKEND_VPCI=y +CONFIG_XEN_PCIDEV_BACKEND_PASSTHROUGH=y +CONFIG_XEN_PCIDEV_BACKEND_SLOT=y CONFIG_STAGING=y CONFIG_ET131X=m # CONFIG_ET131X_DEBUG is not set ++++++ kabi.tar.bz2 ++++++ ++++ 913567 lines of diff (skipped) ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:53.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:53.000000000 +0100 @@ -20,6 +20,7 @@ %define srcversion @SRCVERSION@ %define patchversion @PATCHVERSION@ %define variant @VARIANT@%{nil} +%define vanilla_only @VANILLA_ONLY@ %include %_sourcedir/kernel-spec-macros @@ -57,7 +58,7 @@ Summary: @SUMMARY@ Version: @RPMVERSION@ Release: @RELEASE@ -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -97,18 +98,21 @@ BuildRequires: dwarfextract %endif %endif +%ifarch %arm +BuildRequires: u-boot-tools +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" Provides: kernel-xenpae = %version -Obsoletes: kernel-xenpae <= %version +Obsoletes: kernel-xenpae < %version %endif %endif #!BuildIgnore: xen %endif -Provides: %name-nongpl -Obsoletes: %name-nongpl +Provides: %name-nongpl = %version +Obsoletes: %name-nongpl < %version %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions %define _binary_payload w9.bzdio @@ -137,30 +141,49 @@ # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp-%build_flavor -Obsoletes: ipw3945-kmp-%build_flavor +Obsoletes: iwlwifi-kmp-%build_flavor < %version +Provides: iwlwifi-kmp-%build_flavor = %version +Obsoletes: ipw3945-kmp-%build_flavor < %version +Provides: ipw3945-kmp-%build_flavor = %version # sles10 / 11.0 -Obsoletes: uvcvideo-kmp-%build_flavor +Obsoletes: uvcvideo-kmp-%build_flavor < %version +Provides: uvcvideo-kmp-%build_flavor = %version # 11.0 -Obsoletes: atl2-kmp-%build_flavor -Obsoletes: wlan-ng-kmp-%build_flavor -Obsoletes: et131x-kmp-%build_flavor -Obsoletes: ivtv-kmp-%build_flavor -Obsoletes: at76_usb-kmp-%build_flavor -Obsoletes: pcc-acpi-kmp-%build_flavor -Obsoletes: btusb-kmp-%build_flavor +Obsoletes: atl2-kmp-%build_flavor < %version +Provides: atl2-kmp-%build_flavor = %version +Obsoletes: at76_usb-kmp-%build_flavor < %version +Provides: at76_usb-kmp-%build_flavor = %version +Obsoletes: btusb-kmp-%build_flavor < %version +Provides: btusb-kmp-%build_flavor = %version +Obsoletes: et131x-kmp-%build_flavor < %version +Provides: et131x-kmp-%build_flavor = %version +Obsoletes: ivtv-kmp-%build_flavor < %version +Provides: ivtv-kmp-%build_flavor = %version +Obsoletes: pcc-acpi-kmp-%build_flavor < %version +Provides: pcc-acpi-kmp-%build_flavor = %version +Obsoletes: wlan-ng-kmp-%build_flavor < %version +Provides: wlan-ng-kmp-%build_flavor = %version # sle11-ga -Obsoletes: enic-kmp-%build_flavor -Obsoletes: fnic-kmp-%build_flavor -Obsoletes: brocade-bfa-kmp-%build_flavor -Obsoletes: kvm-kmp-%build_flavor -Obsoletes: perfmon-kmp-%build_flavor -Obsoletes: iwlagn-2-6-27-kmp-%build_flavor -Obsoletes: msi-wmi-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor < %version +Provides: brocade-bfa-kmp-%build_flavor = %version +Obsoletes: enic-kmp-%build_flavor < %version +Provides: enic-kmp-%build_flavor = %version +Obsoletes: fnic-kmp-%build_flavor < %version +Provides: fnic-kmp-%build_flavor = %version +Obsoletes: iwlagn-2-6-27-kmp-%build_flavor < %version +Provides: iwlagn-2-6-27-kmp-%build_flavor = %version +Obsoletes: kvm-kmp-%build_flavor < %version +Provides: kvm-kmp-%build_flavor = %version +Obsoletes: msi-wmi-kmp-%build_flavor < %version +Provides: msi-wmi-kmp-%build_flavor = %version +Obsoletes: perfmon-kmp-%build_flavor < %version +Provides: perfmon-kmp-%build_flavor = %version # sle11 -Obsoletes: ocfs2-kmp-%build_flavor +Obsoletes: ocfs2-kmp-%build_flavor < %version +Provides: ocfs2-kmp-%build_flavor = %version # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 +Provides: quickcam-kmp-%build_flavor = 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -294,11 +317,25 @@ # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) %if %CONFIG_KMSG_IDS == "y" chmod +x ../linux-%srcversion/scripts/kmsg-doc - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 -%else - make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + MAKE_ARGS="$MAKE_ARGS D=2" %endif +while true; do + make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \ + | tee buildlog + if test "${PIPESTATUS[0]}" -eq 0; then + break + fi + # In the linux-next and vanilla branches, we try harder to build a + # package. + if test 0%vanilla_only -gt 0 && + %_sourcedir/try-disable-staging-driver buildlog; then + echo "Retrying make" + else + exit 1 + fi +done + %install # get rid of /usr/lib/rpm/brp-strip-debug @@ -408,6 +445,13 @@ cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor image=vmlinux %endif +%ifarch %arm + add_vmlinux --compressed + # quickly compile uImage so we have something to boot from + make %{?_smp_mflags} uImage $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y + image=uImage + cp -p arch/arm/boot/$image %buildroot/boot/uImage-%kernelrelease-%build_flavor +%endif # end of build_kdump %endif @@ -595,8 +639,7 @@ # Collect the file lists. shopt -s nullglob > %my_builddir/kernel-devel.files -for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \ - %buildroot/lib/modules/*/{build,source}; do +for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} echo "$f" >> %my_builddir/kernel-devel.files done @@ -656,19 +699,20 @@ %if %split_base %files -f kernel-main.files +%defattr(-, root, root) %else %files -f kernel-base.files -%endif %defattr(-, root, root) +%endif %package base Summary: @SUMMARY@ - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -700,7 +744,6 @@ %package extra Summary: @SUMMARY@ - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -741,7 +784,6 @@ %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -757,7 +799,6 @@ %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -793,7 +834,6 @@ %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo ++++++ kernel-docs.spec.in ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:53.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:53.000000000 +0100 @@ -29,7 +29,7 @@ BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant Url: http://www.kernel.org/ -License: GPL v2 or later +License: GPL-2.0 Group: Documentation/Man Provides: %name = %version-%source_rel BuildArch: noarch ++++++ kernel-source.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:53.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:53.000000000 +0100 @@ -1,2 +1,10 @@ # These zero-length files are correct: -addFilter("zero-length /usr/src/linux-2\.6\..*obj/.*include/config.*h") +addFilter("zero-length /usr/src/linux-3\..*obj/.*include/config.*h") +# vdsos are special +addFilter("shared-lib-without-dependency-information /lib/modules/3\..*/vdso/.*") +addFilter("missing-PT_GNU_STACK-section /lib/modules/3\..*/vdso/") +# This is a stale symlink until the kernel-source package is installed: +addFilter("dangling-symlink /lib/modules/3\..*/source") +# These hidden files are fine: +addFilter ("hidden-file-or-dir /usr/src/linux-3\..*-obj/.*/.config") +addFilter ("hidden-file-or-dir /usr/src/linux-3\..*-obj/.*/.kernel-binary.spec.buildenv") ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:53.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:53.000000000 +0100 @@ -31,7 +31,7 @@ Summary: The Linux Kernel Sources Version: @RPMVERSION@ Release: @RELEASE@ -License: GPL v2 only +License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ AutoReqProv: off @@ -41,7 +41,7 @@ Provides: multiversion(kernel) Provides: linux Provides: %name = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 +Source0: @TARBALL_URL@linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -83,6 +83,7 @@ Source66: configtool.pl Source67: log.sh Source68: host-memcpy-hack.h +Source69: try-disable-staging-driver Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -119,7 +120,6 @@ %source_timestamp %package -n kernel-devel%variant Summary: Development files needed for building kernel modules -License: GPL v2 only Group: Development/Sources AutoReqProv: off Provides: multiversion(kernel) @@ -133,7 +133,6 @@ %source_timestamp %package vanilla Summary: Vanilla Linux kernel sources with minor build fixes. -License: GPL v2 only Group: Development/Sources AutoReqProv: off Provides: multiversion(kernel) @@ -233,7 +232,6 @@ %files -f nondevel.files %defattr(-, root, root) -%ghost /usr/src/linux%variant /usr/src/linux%variant-%kernelrelease/README.SUSE %files -n kernel-devel%variant -f devel.files ++++++ kernel-syms.spec.in ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:53.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:53.000000000 +0100 @@ -30,7 +30,7 @@ %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) Release: %kernel_source_release %endif -License: GPL v2 only +License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ AutoReqProv: off ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:53.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:53.000000000 +0100 @@ -65,12 +65,22 @@ my $scripts = join(",", grep { is_script($_) } ($sources =~ /\nSource\d+:\s*([^\s]*)/mg)); +my $tarball_url; +if ($srcversion =~ /^(\d+)(?:\.\d+)*(-rc\d+)?$/) { + $tarball_url = "http://www.kernel.org/pub/linux/kernel/v$1.x/"; + $tarball_url .= "testing/" if $2; +} else { + # kernel.org has no tarballs for linux-next or vanilla snapshots + $tarball_url = ""; +} + my %macros = ( VARIANT => $variant, VANILLA_ONLY => $vanilla_only, SRCVERSION => $srcversion, PATCHVERSION => $patchversion, RPMVERSION => $rpmversion, + TARBALL_URL => $tarball_url, RELEASE => $rpmrelease, SOURCES => $sources, NOSOURCE => $nosource, @@ -278,9 +288,13 @@ my %macros = @_; my $text = $templates{$template}; - for my $m (keys %macros) { - $text =~ s/\@$m\@/$macros{$m}/g; - } + my $prev_text; + do { + $prev_text = $text; + for my $m (keys %macros) { + $text =~ s/\@$m\@/$macros{$m}/g; + } + } while ($prev_text ne $text); print "$specfile\n"; xopen(my $fh, '>', "$dir/$specfile"); print $fh $text; ++++++ package-descriptions ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:53.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:53.000000000 +0100 @@ -121,3 +121,21 @@ The Linux Kernel designed to run on top of a virtual machine interface layer (VMI). + +=== kernel-imx51 === +Kernel for Freescale's iMX SoC + +The standard kernel for Freescale's i.MX51 SoC, as found in +devices like the Genesi EfikaMX family. + +=== kernel-omap2plus === +Kernel for Texas instrument's OMAP SoC + +The standard kernel for Texas instrument's OMAP SoC, as +found in devices like the PandaBoard and BeagleBoard. + +=== kernel-tegra === +Kernel for Nvidia's Tegra SoC + +The standard kernel for Nvidia's Tegra SoC, as found in +devices like the TrimSlice. ++++++ patches.arch.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/dell_latitude_e6xxx_e5xxx__fix_reboot.patch new/patches.arch/dell_latitude_e6xxx_e5xxx__fix_reboot.patch --- old/patches.arch/dell_latitude_e6xxx_e5xxx__fix_reboot.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/dell_latitude_e6xxx_e5xxx__fix_reboot.patch 2011-12-12 02:34:32.000000000 +0100 @@ -0,0 +1,67 @@ +From: Thomas Renninger+Subject: X86: Solve Dell Latitudes do not reboot on x86_64 more generally +References: none +Patch-Mainline: submitted + +There are quite some reports that those do not reboot: +https://bugs.launchpad.net/ubuntu/+source/linux/+bug/833705 +->E6520, E6220 +http://www.linux-club.de/viewtopic.php?f=29&t=114459&start=20 +->E5520 +and some more already are blacklisted + +This patch improves the blacklist for all E6xxx and E5xxx Latitudes. + +Strange is that on above Ubuntu bug it was mentioned that 32 bit +reboots just fine, which should use the same mechanism than 64 bit +by default (ACPI). + +While this should solve the problem on short term for quite some users, +hopefully a more generic way is found sooner or later... + + +Signed-off-by: Thomas Renninger + +--- + arch/x86/kernel/reboot.c | 20 ++++++-------------- + 1 file changed, 6 insertions(+), 14 deletions(-) + +Index: linux-3.1-master/arch/x86/kernel/reboot.c +=================================================================== +--- linux-3.1-master.orig/arch/x86/kernel/reboot.c ++++ linux-3.1-master/arch/x86/kernel/reboot.c +@@ -419,28 +419,20 @@ static struct dmi_system_id __initdata p + DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"), + }, + }, +- { /* Handle problems with rebooting on the Latitude E6320. */ ++ { + .callback = set_pci_reboot, +- .ident = "Dell Latitude E6320", ++ .ident = "Dell Latitude E5xxx", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), +- DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5"), + }, + }, +- { /* Handle problems with rebooting on the Latitude E5420. */ ++ { + .callback = set_pci_reboot, +- .ident = "Dell Latitude E5420", ++ .ident = "Dell Latitude E6xxx", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), +- DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5420"), +- }, +- }, +- { /* Handle problems with rebooting on the Latitude E6420. */ +- .callback = set_pci_reboot, +- .ident = "Dell Latitude E6420", +- .matches = { +- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), +- DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6420. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x2apic_opt_out.patch new/patches.arch/x2apic_opt_out.patch --- old/patches.arch/x2apic_opt_out.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/x2apic_opt_out.patch 2011-12-12 02:34:32.000000000 +0100 @@ -0,0 +1,301 @@ +From: Suresh Siddha +Subject: x86, x2apic: Enable the bios request for x2apic optout +References: none +Patch-Mainline: v3.2-rc1 +Git-commit: 41750d31fc9599fd81763e685a6b7b42d298c4f8 + + +Signed-off-by: Thomas Renninger + +On the platforms which are x2apic and interrupt-remapping +capable, Linux kernel is enabling x2apic even if the BIOS +doesn't. This is to take advantage of the features that x2apic +brings in. + +Some of the OEM platforms are running into issues because of +this, as their bios is not x2apic aware. For example, this was +resulting in interrupt migration issues on one of the platforms. +Also if the BIOS SMI handling uses APIC interface to send SMI's, +then the BIOS need to be aware of x2apic mode that OS has +enabled. + +On some of these platforms, BIOS doesn't have a HW mechanism to +turnoff the x2apic feature to prevent OS from enabling it. + +To resolve this mess, recent changes to the VT-d2 specification: + + http://download.intel.com/technology/computing/vptech/Intel(r)_VT_for_Direct_IO.pdf + +includes a mechanism that provides BIOS a way to request system +software to opt out of enabling x2apic mode. + +Look at the x2apic optout flag in the DMAR tables before +enabling the x2apic mode in the platform. Also print a warning +that we have disabled x2apic based on the BIOS request. + +Kernel boot parameter "intremap=no_x2apic_optout" can be used to +override the BIOS x2apic optout request. + +Signed-off-by: Youquan Song +Signed-off-by: Suresh Siddha +Cc: yinghai@kernel.org +Cc: joerg.roedel@amd.com +Cc: tony.luck@intel.com +Cc: dwmw2@infradead.org +Link: http://lkml.kernel.org/r/20110824001456.171766616@sbsiddha-desk.sc.intel.com +Signed-off-by: Ingo Molnar + +diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt +index 854ed5ca..1386556 100644 +--- a/Documentation/kernel-parameters.txt ++++ b/Documentation/kernel-parameters.txt +@@ -1014,10 +1014,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. + has the capability. With this option, super page will + not be supported. + intremap= [X86-64, Intel-IOMMU] +- Format: { on (default) | off | nosid } + on enable Interrupt Remapping (default) + off disable Interrupt Remapping + nosid disable Source ID checking ++ no_x2apic_optout ++ BIOS x2APIC opt-out request will be ignored + + inttest= [IA-64] + +diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c +index 52fa563..6b9874a 100644 +--- a/arch/x86/kernel/apic/apic.c ++++ b/arch/x86/kernel/apic/apic.c +@@ -1440,24 +1440,18 @@ int __init enable_IR(void) + #ifdef CONFIG_INTR_REMAP + if (!intr_remapping_supported()) { + pr_debug("intr-remapping not supported\n"); +- return 0; ++ return -1; + } + + if (!x2apic_preenabled && skip_ioapic_setup) { + pr_info("Skipped enabling intr-remap because of skipping " + "io-apic setup\n"); +- return 0; ++ return -1; + } + +- if (enable_intr_remapping(x2apic_supported())) +- return 0; +- +- pr_info("Enabled Interrupt-remapping\n"); +- +- return 1; +- ++ return enable_intr_remapping(); + #endif +- return 0; ++ return -1; + } + + void __init enable_IR_x2apic(void) +@@ -1481,11 +1475,11 @@ void __init enable_IR_x2apic(void) + mask_ioapic_entries(); + + if (dmar_table_init_ret) +- ret = 0; ++ ret = -1; + else + ret = enable_IR(); + +- if (!ret) { ++ if (ret < 0) { + /* IR is required if there is APIC ID > 255 even when running + * under KVM + */ +@@ -1499,6 +1493,9 @@ void __init enable_IR_x2apic(void) + x2apic_force_phys(); + } + ++ if (ret == IRQ_REMAP_XAPIC_MODE) ++ goto nox2apic; ++ + x2apic_enabled = 1; + + if (x2apic_supported() && !x2apic_mode) { +@@ -1508,19 +1505,21 @@ void __init enable_IR_x2apic(void) + } + + nox2apic: +- if (!ret) /* IR enabling failed */ ++ if (ret < 0) /* IR enabling failed */ + restore_ioapic_entries(); + legacy_pic->restore_mask(); + local_irq_restore(flags); + + out: +- if (x2apic_enabled) ++ if (x2apic_enabled || !x2apic_supported()) + return; + + if (x2apic_preenabled) + panic("x2apic: enabled by BIOS but kernel init failed."); +- else if (cpu_has_x2apic) +- pr_info("Not enabling x2apic, Intr-remapping init failed.\n"); ++ else if (ret == IRQ_REMAP_XAPIC_MODE) ++ pr_info("x2apic not enabled, IRQ remapping is in xapic mode\n"); ++ else if (ret < 0) ++ pr_info("x2apic not enabled, IRQ remapping init failed\n"); + } + + #ifdef CONFIG_X86_64 +diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c +index 6dcc7e2..c4a0235 100644 +--- a/drivers/iommu/dmar.c ++++ b/drivers/iommu/dmar.c +@@ -46,7 +46,7 @@ + */ + LIST_HEAD(dmar_drhd_units); + +-static struct acpi_table_header * __initdata dmar_tbl; ++struct acpi_table_header * __initdata dmar_tbl; + static acpi_size dmar_tbl_size; + + static void __init dmar_register_drhd_unit(struct dmar_drhd_unit *drhd) +diff --git a/drivers/iommu/intr_remapping.c b/drivers/iommu/intr_remapping.c +index 1a89d4a..51a2ce9 100644 +--- a/drivers/iommu/intr_remapping.c ++++ b/drivers/iommu/intr_remapping.c +@@ -21,6 +21,7 @@ int intr_remapping_enabled; + + static int disable_intremap; + static int disable_sourceid_checking; ++static int no_x2apic_optout; + + static __init int setup_nointremap(char *str) + { +@@ -34,12 +35,20 @@ static __init int setup_intremap(char *str) + if (!str) + return -EINVAL; + +- if (!strncmp(str, "on", 2)) +- disable_intremap = 0; +- else if (!strncmp(str, "off", 3)) +- disable_intremap = 1; +- else if (!strncmp(str, "nosid", 5)) +- disable_sourceid_checking = 1; ++ while (*str) { ++ if (!strncmp(str, "on", 2)) ++ disable_intremap = 0; ++ else if (!strncmp(str, "off", 3)) ++ disable_intremap = 1; ++ else if (!strncmp(str, "nosid", 5)) ++ disable_sourceid_checking = 1; ++ else if (!strncmp(str, "no_x2apic_optout", 16)) ++ no_x2apic_optout = 1; ++ ++ str += strcspn(str, ","); ++ while (*str == ',') ++ str++; ++ } + + return 0; + } +@@ -501,6 +510,15 @@ end: + spin_unlock_irqrestore(&iommu->register_lock, flags); + } + ++static int __init dmar_x2apic_optout(void) ++{ ++ struct acpi_table_dmar *dmar; ++ dmar = (struct acpi_table_dmar *)dmar_tbl; ++ if (!dmar || no_x2apic_optout) ++ return 0; ++ return dmar->flags & DMAR_X2APIC_OPT_OUT; ++} ++ + int __init intr_remapping_supported(void) + { + struct dmar_drhd_unit *drhd; +@@ -521,16 +539,25 @@ int __init intr_remapping_supported(void) + return 1; + } + +-int __init enable_intr_remapping(int eim) ++int __init enable_intr_remapping(void) + { + struct dmar_drhd_unit *drhd; + int setup = 0; ++ int eim = 0; + + if (parse_ioapics_under_ir() != 1) { + printk(KERN_INFO "Not enable interrupt remapping\n"); + return -1; + } + ++ if (x2apic_supported()) { ++ eim = !dmar_x2apic_optout(); ++ WARN(!eim, KERN_WARNING ++ "Your BIOS is broken and requested that x2apic be disabled\n" ++ "This will leave your machine vulnerable to irq-injection attacks\n" ++ "Use 'intremap=no_x2apic_optout' to override BIOS request\n"); ++ } ++ + for_each_drhd_unit(drhd) { + struct intel_iommu *iommu = drhd->iommu; + +@@ -606,8 +633,9 @@ int __init enable_intr_remapping(int eim) + goto error; + + intr_remapping_enabled = 1; ++ pr_info("Enabled IRQ remapping in %s mode\n", eim ? "x2apic" : "xapic"); + +- return 0; ++ return eim ? IRQ_REMAP_X2APIC_MODE : IRQ_REMAP_XAPIC_MODE; + + error: + /* +diff --git a/include/linux/dmar.h b/include/linux/dmar.h +index 7b776d7..2dc810e 100644 +--- a/include/linux/dmar.h ++++ b/include/linux/dmar.h +@@ -26,8 +26,13 @@ + #include + #include + ++/* DMAR Flags */ ++#define DMAR_INTR_REMAP 0x1 ++#define DMAR_X2APIC_OPT_OUT 0x2 ++ + struct intel_iommu; + #if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP) ++extern struct acpi_table_header *dmar_tbl; + struct dmar_drhd_unit { + struct list_head list; /* list of drhd units */ + struct acpi_dmar_header *hdr; /* ACPI header */ +@@ -110,7 +115,7 @@ struct irte { + #ifdef CONFIG_INTR_REMAP + extern int intr_remapping_enabled; + extern int intr_remapping_supported(void); +-extern int enable_intr_remapping(int); ++extern int enable_intr_remapping(void); + extern void disable_intr_remapping(void); + extern int reenable_intr_remapping(int); + +@@ -177,7 +182,7 @@ static inline int set_msi_sid(struct irte *irte, struct pci_dev *dev) + + #define intr_remapping_enabled (0) + +-static inline int enable_intr_remapping(int eim) ++static inline int enable_intr_remapping(void) + { + return -1; + } +@@ -192,6 +197,11 @@ static inline int reenable_intr_remapping(int eim) + } + #endif + ++enum { ++ IRQ_REMAP_XAPIC_MODE, ++ IRQ_REMAP_X2APIC_MODE, ++}; ++ + /* Can't use the common MSI interrupt functions + * since DMAR is not a pci device + */ ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-hda-0001-realtek-Fix-missing-volume-controls-with-ALC260 new/patches.drivers/alsa-hda-0001-realtek-Fix-missing-volume-controls-with-ALC260 --- old/patches.drivers/alsa-hda-0001-realtek-Fix-missing-volume-controls-with-ALC260 2011-11-02 15:45:22.000000000 +0100 +++ new/patches.drivers/alsa-hda-0001-realtek-Fix-missing-volume-controls-with-ALC260 2011-11-15 02:03:50.000000000 +0100 @@ -2,8 +2,7 @@ Date: Thu, 27 Oct 2011 16:33:27 +0200 Subject: [PATCH] ALSA: hda/realtek - Fix missing volume controls with ALC260 Git-commit: 527e4d73af16dfc35a770dfdc3874ef63c359ea6 -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git -Patch-mainline: to be in v3.2-rc1 +Patch-mainline: v3.2-rc1 References: bnc#726812 ALC260 has multiple mixer widgets connected to the shared DAC, but the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-hda-0002-Keep-EAPD-turned-on-for-old-Conexant-chips new/patches.drivers/alsa-hda-0002-Keep-EAPD-turned-on-for-old-Conexant-chips --- old/patches.drivers/alsa-hda-0002-Keep-EAPD-turned-on-for-old-Conexant-chips 2011-11-02 15:45:22.000000000 +0100 +++ new/patches.drivers/alsa-hda-0002-Keep-EAPD-turned-on-for-old-Conexant-chips 1970-01-01 01:00:00.000000000 +0100 @@ -1,122 +0,0 @@ -From: Takashi Iwai -Date: Fri, 14 Oct 2011 15:22:34 +0200 -Subject: [PATCH] ALSA: hda - Keep EAPD turned on for old Conexant chips -Git-commit: 254f296840b64b034a4c850d45dbde7c040f0819 -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git -Patch-mainline: Submitted -References: - -In the old Conexant chips (5045, 5047, 5051 and 5066), a single EAPD -may handle both headphone and speaker outputs while it's assigned only -to one of them. Turning off dynamically leads to the unexpected silent -output in such a configuration with the auto-mute function. - -Since it's difficult to know how the EAPD is handled in the actual h/w -implementation, better to keep EAPD on while running for such codecs. - -Cc: -Signed-off-by: Takashi Iwai - ---- - sound/pci/hda/patch_conexant.c | 43 ++++++++++++++++++++--------------------- - 1 file changed, 22 insertions(+), 21 deletions(-) - ---- a/sound/pci/hda/patch_conexant.c -+++ b/sound/pci/hda/patch_conexant.c -@@ -136,6 +136,7 @@ - unsigned int thinkpad:1; - unsigned int hp_laptop:1; - unsigned int asus:1; -+ unsigned int pin_eapd_ctrls:1; - - unsigned int adc_switching:1; - -@@ -3473,12 +3474,14 @@ - static void do_automute(struct hda_codec *codec, int num_pins, - hda_nid_t *pins, bool on) - { -+ struct conexant_spec *spec = codec->spec; - int i; - for (i = 0; i < num_pins; i++) - snd_hda_codec_write(codec, pins[i], 0, - AC_VERB_SET_PIN_WIDGET_CONTROL, - on ? PIN_OUT : 0); -- cx_auto_turn_eapd(codec, num_pins, pins, on); -+ if (spec->pin_eapd_ctrls) -+ cx_auto_turn_eapd(codec, num_pins, pins, on); - } - - static int detect_jacks(struct hda_codec *codec, int num_pins, hda_nid_t *pins) -@@ -3503,9 +3506,12 @@ - int on = 1; - - /* turn on HP EAPD when HP jacks are present */ -- if (spec->auto_mute) -- on = spec->hp_present; -- cx_auto_turn_eapd(codec, cfg->hp_outs, cfg->hp_pins, on); -+ if (spec->pin_eapd_ctrls) { -+ if (spec->auto_mute) -+ on = spec->hp_present; -+ cx_auto_turn_eapd(codec, cfg->hp_outs, cfg->hp_pins, on); -+ } -+ - /* mute speakers in auto-mode if HP or LO jacks are plugged */ - if (spec->auto_mute) - on = !(spec->hp_present || -@@ -3932,20 +3938,10 @@ - #define cx_auto_parse_beep(codec) - #endif - --static bool found_in_nid_list(hda_nid_t nid, const hda_nid_t *list, int nums) --{ -- int i; -- for (i = 0; i < nums; i++) -- if (list[i] == nid) -- return true; -- return false; --} -- --/* parse extra-EAPD that aren't assigned to any pins */ -+/* parse EAPDs */ - static void cx_auto_parse_eapd(struct hda_codec *codec) - { - struct conexant_spec *spec = codec->spec; -- struct auto_pin_cfg *cfg = &spec->autocfg; - hda_nid_t nid, end_nid; - - end_nid = codec->start_nid + codec->num_nodes; -@@ -3954,14 +3950,18 @@ - continue; - if (!(snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_EAPD)) - continue; -- if (found_in_nid_list(nid, cfg->line_out_pins, cfg->line_outs) || -- found_in_nid_list(nid, cfg->hp_pins, cfg->hp_outs) || -- found_in_nid_list(nid, cfg->speaker_pins, cfg->speaker_outs)) -- continue; - spec->eapds[spec->num_eapds++] = nid; - if (spec->num_eapds >= ARRAY_SIZE(spec->eapds)) - break; - } -+ -+ /* NOTE: below is a wild guess; if we have more than two EAPDs, -+ * it's a new chip, where EAPDs are supposed to be associated to -+ * pins, and we can control EAPD per pin. -+ * OTOH, if only one or two EAPDs are found, it's an old chip, -+ * thus it might control over all pins. -+ */ -+ spec->pin_eapd_ctrls = spec->num_eapds > 2; - } - - static int cx_auto_parse_auto_config(struct hda_codec *codec) -@@ -4067,8 +4067,9 @@ - } - } - cx_auto_update_speakers(codec); -- /* turn on/off extra EAPDs, too */ -- cx_auto_turn_eapd(codec, spec->num_eapds, spec->eapds, true); -+ /* turn on all EAPDs if no individual EAPD control is available */ -+ if (!spec->pin_eapd_ctrls) -+ cx_auto_turn_eapd(codec, spec->num_eapds, spec->eapds, true); - } - - static void cx_auto_init_input(struct hda_codec *codec) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-hda-0003-Fix-ADC-input-amp-handling-for-Cx20549 new/patches.drivers/alsa-hda-0003-Fix-ADC-input-amp-handling-for-Cx20549 --- old/patches.drivers/alsa-hda-0003-Fix-ADC-input-amp-handling-for-Cx20549 2011-11-02 15:45:22.000000000 +0100 +++ new/patches.drivers/alsa-hda-0003-Fix-ADC-input-amp-handling-for-Cx20549 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ -From: Takashi Iwai -Date: Fri, 14 Oct 2011 15:26:20 +0200 -Subject: [PATCH] ALSA: hda - Fix ADC input-amp handling for Cx20549 codec -Git-commit: 6b45214277bec2193ad3ccb8d7aa6100b5a0f1a9 -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git -Patch-mainline: Submitted -References: - -It seems that Conexant CX20549 chip handle only a single input-amp even -though the audio-input widget has multiple sources. This has been never -clear, and I implemented in the current way based on the debug information -I got at the early time -- the device reacts individual input-amp values -for different sources. This is true for another Conexant codec, but it's -not applied to CX20549 actually. - -This patch changes the auto-parser code to handle a single input-amp -per audio-in widget for CX20549. After applying this, you'll see only a -single "Capture" volume control instead of separate "Mic" or "Line" -captures when the device is set up to use a single ADC. - -We haven't tested 20551 and 20561 codecs yet. If these show the similar -behavior like 20549, they need to set spec->single_adc_amp=1, too. - -Cc: -Signed-off-by: Takashi Iwai - ---- - sound/pci/hda/patch_conexant.c | 30 ++++++++++++++++++++++++++++-- - 1 file changed, 28 insertions(+), 2 deletions(-) - ---- a/sound/pci/hda/patch_conexant.c -+++ b/sound/pci/hda/patch_conexant.c -@@ -137,6 +137,7 @@ - unsigned int hp_laptop:1; - unsigned int asus:1; - unsigned int pin_eapd_ctrls:1; -+ unsigned int single_adc_amp:1; - - unsigned int adc_switching:1; - -@@ -4256,6 +4257,8 @@ - int idx = get_input_connection(codec, adc_nid, nid); - if (idx < 0) - continue; -+ if (spec->single_adc_amp) -+ idx = 0; - return cx_auto_add_volume_idx(codec, label, pfx, - cidx, adc_nid, HDA_INPUT, idx); - } -@@ -4296,14 +4299,21 @@ - struct hda_input_mux *imux = &spec->private_imux; - const char *prev_label; - int input_conn[HDA_MAX_NUM_INPUTS]; -- int i, err, cidx; -+ int i, j, err, cidx; - int multi_connection; - -+ if (!imux->num_items) -+ return 0; -+ - multi_connection = 0; - for (i = 0; i < imux->num_items; i++) { - cidx = get_input_connection(codec, spec->imux_info[i].adc, - spec->imux_info[i].pin); -- input_conn[i] = (spec->imux_info[i].adc << 8) | cidx; -+ if (cidx < 0) -+ continue; -+ input_conn[i] = spec->imux_info[i].adc; -+ if (!spec->single_adc_amp) -+ input_conn[i] |= cidx << 8; - if (i > 0 && input_conn[i] != input_conn[0]) - multi_connection = 1; - } -@@ -4332,6 +4342,15 @@ - err = cx_auto_add_capture_volume(codec, nid, - "Capture", "", cidx); - } else { -+ bool dup_found = false; -+ for (j = 0; j < i; j++) { -+ if (input_conn[j] == input_conn[i]) { -+ dup_found = true; -+ break; -+ } -+ } -+ if (dup_found) -+ continue; - err = cx_auto_add_capture_volume(codec, nid, - label, " Capture", cidx); - } -@@ -4408,6 +4427,13 @@ - return -ENOMEM; - codec->spec = spec; - codec->pin_amp_workaround = 1; -+ -+ switch (codec->vendor_id) { -+ case 0x14f15045: -+ spec->single_adc_amp = 1; -+ break; -+ } -+ - err = cx_auto_search_adcs(codec); - if (err < 0) - return err; ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/batman-adv-Only-write-requested-number-of-byte-to-us.patch new/patches.fixes/batman-adv-Only-write-requested-number-of-byte-to-us.patch --- old/patches.fixes/batman-adv-Only-write-requested-number-of-byte-to-us.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/batman-adv-Only-write-requested-number-of-byte-to-us.patch 2011-12-30 15:20:59.000000000 +0100 @@ -0,0 +1,35 @@ +From: Sven Eckelmann +Date: Sat, 10 Dec 2011 15:28:36 +0100 +Subject: [PATCH 2/2] batman-adv: Only write requested number of byte to user + buffer +Git-commit: b5a1eeef04cc7859f34dec9b72ea1b28e4aba07c +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git +Patch-mainline: Queued in subsystem maintainer repo +References: bnc#736149 CVE-2011-4604 + +Don't write more than the requested number of bytes of an batman-adv icmp +packet to the userspace buffer. Otherwise unrelated userspace memory might get +overridden by the kernel. + +Signed-off-by: Sven Eckelmann +Signed-off-by: Marek Lindner +Acked-by: Benjamin Poirier +--- + net/batman-adv/icmp_socket.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/net/batman-adv/icmp_socket.c ++++ b/net/batman-adv/icmp_socket.c +@@ -136,10 +136,9 @@ static ssize_t bat_socket_read(struct fi + + spin_unlock_bh(&socket_client->lock); + +- error = copy_to_user(buf, &socket_packet->icmp_packet, +- socket_packet->icmp_len); ++ packet_len = min(count, socket_packet->icmp_len); ++ error = copy_to_user(buf, &socket_packet->icmp_packet, packet_len); + +- packet_len = socket_packet->icmp_len; + kfree(socket_packet); + + if (error) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/batman-adv-bat_socket_read-missing-checks.patch new/patches.fixes/batman-adv-bat_socket_read-missing-checks.patch --- old/patches.fixes/batman-adv-bat_socket_read-missing-checks.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/batman-adv-bat_socket_read-missing-checks.patch 2011-12-30 15:20:59.000000000 +0100 @@ -0,0 +1,33 @@ +From: Paul Kot +Date: Sat, 10 Dec 2011 15:28:34 +0100 +Subject: [PATCH 1/2] batman-adv: bat_socket_read missing checks +Git-commit: c00b6856fc642b234895cfabd15b289e76726430 +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git +Patch-mainline: Queued in subsystem maintainer repo +References: bnc#736149 CVE-2011-4604 + +Writing a icmp_packet_rr and then reading icmp_packet can lead to kernel +memory corruption, if __user *buf is just below TASK_SIZE. + +Signed-off-by: Paul Kot +[sven@narfation.org: made it checkpatch clean] +Signed-off-by: Sven Eckelmann +Signed-off-by: Marek Lindner +Acked-by: Benjamin Poirier +--- + net/batman-adv/icmp_socket.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/net/batman-adv/icmp_socket.c ++++ b/net/batman-adv/icmp_socket.c +@@ -136,8 +136,8 @@ static ssize_t bat_socket_read(struct fi + + spin_unlock_bh(&socket_client->lock); + +- error = __copy_to_user(buf, &socket_packet->icmp_packet, +- socket_packet->icmp_len); ++ error = copy_to_user(buf, &socket_packet->icmp_packet, ++ socket_packet->icmp_len); + + packet_len = socket_packet->icmp_len; + kfree(socket_packet); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/drm-radeon-kms-fix-i2c-masks.patch new/patches.fixes/drm-radeon-kms-fix-i2c-masks.patch --- old/patches.fixes/drm-radeon-kms-fix-i2c-masks.patch 2011-10-24 18:28:04.000000000 +0200 +++ new/patches.fixes/drm-radeon-kms-fix-i2c-masks.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -From: Jean Delvare -Subject: drm/radeon/kms: Fix I2C mask definitions -Patch-mainline: Not yet, should happen soon -References: bnc#712023 - -Commit 9b9fe724 accidentally used RADEON_GPIO_EN_* where -RADEON_GPIO_MASK_* was intended. This caused improper initialization -of I2C buses, mostly visible when setting i2c_algo_bit.bit_test=1. -Using the right constants fixes the problem. - -Signed-off-by: Jean Delvare -Reviewed-by: Alex Deucher -Cc: Jerome Glisse ---- - drivers/gpu/drm/radeon/radeon_combios.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/gpu/drm/radeon/radeon_combios.c -+++ b/drivers/gpu/drm/radeon/radeon_combios.c -@@ -620,8 +620,8 @@ static struct radeon_i2c_bus_rec combios - i2c.y_data_mask = 0x80; - } else { - /* default masks for ddc pads */ -- i2c.mask_clk_mask = RADEON_GPIO_EN_1; -- i2c.mask_data_mask = RADEON_GPIO_EN_0; -+ i2c.mask_clk_mask = RADEON_GPIO_MASK_1; -+ i2c.mask_data_mask = RADEON_GPIO_MASK_0; - i2c.a_clk_mask = RADEON_GPIO_A_1; - i2c.a_data_mask = RADEON_GPIO_A_0; - i2c.en_clk_mask = RADEON_GPIO_EN_1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/intel_idle_fix_mwait_leave_zero_kvm_issue.patch new/patches.fixes/intel_idle_fix_mwait_leave_zero_kvm_issue.patch --- old/patches.fixes/intel_idle_fix_mwait_leave_zero_kvm_issue.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/intel_idle_fix_mwait_leave_zero_kvm_issue.patch 2011-12-30 15:20:59.000000000 +0100 @@ -0,0 +1,33 @@ +From: Thomas Renninger +Subject: intel_idle: Fix kvm -cpu host Null pointer enter function issue +Reference: bnc#726296 +Patch-Mainline: not yet + +kvm -cpu host paramter exports the native cpuid, but not all features +intel_idle expects... + +Signed-off-by: Thomas Renninger + +--- + drivers/idle/intel_idle.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +Index: linux-3.1-12.1/drivers/idle/intel_idle.c +=================================================================== +--- linux-3.1-12.1.orig/drivers/idle/intel_idle.c ++++ linux-3.1-12.1/drivers/idle/intel_idle.c +@@ -321,9 +321,12 @@ static int intel_idle_probe(void) + + cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates); + ++ /* mwait substates can be zero in kvm case with -cpu host ++ exporting native cpuid, but not all cpuid features */ + if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) || +- !(ecx & CPUID5_ECX_INTERRUPT_BREAK)) +- return -ENODEV; ++ !(ecx & CPUID5_ECX_INTERRUPT_BREAK) || ++ !mwait_substates) ++ return -ENODEV; + + pr_debug(PREFIX "MWAIT substates: 0x%x\n", mwait_substates); + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/net-Add-a-flow_cache_flush_deferred-function.patch new/patches.fixes/net-Add-a-flow_cache_flush_deferred-function.patch --- old/patches.fixes/net-Add-a-flow_cache_flush_deferred-function.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/net-Add-a-flow_cache_flush_deferred-function.patch 2011-12-30 15:20:59.000000000 +0100 @@ -0,0 +1,106 @@ +From: Steffen Klassert +Date: Wed, 21 Dec 2011 16:48:08 -0500 +Subject: [PATCH] net: Add a flow_cache_flush_deferred function +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Patch-mainline: Queued in subsystem maintainer repository +Git-commit: c0ed1c14a72ca9ebacd51fb94a8aca488b0d361e +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git +References: bnc#737624 + +flow_cach_flush() might sleep but can be called from +atomic context via the xfrm garbage collector. So add +a flow_cache_flush_deferred() function and use this if +the xfrm garbage colector is invoked from within the +packet path. + +Signed-off-by: Steffen Klassert +Acked-by: Timo Teräs +Signed-off-by: David S. Miller +Acked-by: Benjamin Poirier +--- + include/net/flow.h | 1 + + net/core/flow.c | 12 ++++++++++++ + net/xfrm/xfrm_policy.c | 18 ++++++++++++++---- + 3 files changed, 27 insertions(+), 4 deletions(-) + +--- a/include/net/flow.h ++++ b/include/net/flow.h +@@ -207,6 +207,7 @@ extern struct flow_cache_object *flow_ca + u8 dir, flow_resolve_t resolver, void *ctx); + + extern void flow_cache_flush(void); ++extern void flow_cache_flush_deferred(void); + extern atomic_t flow_cache_genid; + + #endif +--- a/net/core/flow.c ++++ b/net/core/flow.c +@@ -358,6 +358,18 @@ void flow_cache_flush(void) + put_online_cpus(); + } + ++static void flow_cache_flush_task(struct work_struct *work) ++{ ++ flow_cache_flush(); ++} ++ ++static DECLARE_WORK(flow_cache_flush_work, flow_cache_flush_task); ++ ++void flow_cache_flush_deferred(void) ++{ ++ schedule_work(&flow_cache_flush_work); ++} ++ + static int __cpuinit flow_cache_cpu_prepare(struct flow_cache *fc, int cpu) + { + struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, cpu); +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -2276,8 +2276,6 @@ static void __xfrm_garbage_collect(struc + { + struct dst_entry *head, *next; + +- flow_cache_flush(); +- + spin_lock_bh(&xfrm_policy_sk_bundle_lock); + head = xfrm_policy_sk_bundles; + xfrm_policy_sk_bundles = NULL; +@@ -2290,6 +2288,18 @@ static void __xfrm_garbage_collect(struc + } + } + ++static void xfrm_garbage_collect(struct net *net) ++{ ++ flow_cache_flush(); ++ __xfrm_garbage_collect(net); ++} ++ ++static void xfrm_garbage_collect_deferred(struct net *net) ++{ ++ flow_cache_flush_deferred(); ++ __xfrm_garbage_collect(net); ++} ++ + static void xfrm_init_pmtu(struct dst_entry *dst) + { + do { +@@ -2420,7 +2430,7 @@ int xfrm_policy_register_afinfo(struct x + if (likely(dst_ops->neigh_lookup == NULL)) + dst_ops->neigh_lookup = xfrm_neigh_lookup; + if (likely(afinfo->garbage_collect == NULL)) +- afinfo->garbage_collect = __xfrm_garbage_collect; ++ afinfo->garbage_collect = xfrm_garbage_collect_deferred; + xfrm_policy_afinfo[afinfo->family] = afinfo; + } + write_unlock_bh(&xfrm_policy_afinfo_lock); +@@ -2514,7 +2524,7 @@ static int xfrm_dev_event(struct notifie + + switch (event) { + case NETDEV_DOWN: +- __xfrm_garbage_collect(dev_net(dev)); ++ xfrm_garbage_collect(dev_net(dev)); + } + return NOTIFY_DONE; + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/nfs-connect-timeout new/patches.fixes/nfs-connect-timeout --- old/patches.fixes/nfs-connect-timeout 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/nfs-connect-timeout 2011-12-30 15:20:59.000000000 +0100 @@ -0,0 +1,107 @@ +From a1aea8fc3977ffa9951c3d7f27dbb1905e5f560f Mon Sep 17 00:00:00 2001 +From: NeilBrown +Date: Mon, 7 Nov 2011 15:00:17 +1100 +Subject: [PATCH] sunrpc: wake up SOFTCONN tasks when a connection error + happens. +Patch-mainline: submitted +References: bnc#679059 + +A 'SOFTCONN' task should fail if there is an error or a major timeout +during connection. + +However errors are currently converted into a timeout (60seconds for +TCP) which is treated as a minor timeout and 3 of these are required +before failure. + +The result of this is that if you try to mount an NFSv4 filesystem +(which doesn't require rpcbind and the failure modes that provides) +from a server which you do not have a route to (an so get +NETUNREACHABLE), you have an unnecessary 3 minutes timeout. + +So when ENETUNREACH is reported for a connection - or other errors +which are fatal, wake up any SOFTCONN tasks with that error - rather +than letting them wait 60 seconds and then generate ETIMEDOUT. + +This causes the above mentioned mount attempt to fail instantly. + +Signed-off-by: NeilBrown +Acked-by: NeilBrown + +--- + include/linux/sunrpc/sched.h | 1 + + net/sunrpc/sched.c | 29 +++++++++++++++++++++++++++++ + net/sunrpc/xprtsock.c | 6 +++++- + 3 files changed, 35 insertions(+), 1 deletions(-) + +diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h +index e775689..b85451b 100644 +--- a/include/linux/sunrpc/sched.h ++++ b/include/linux/sunrpc/sched.h +@@ -236,6 +236,7 @@ void rpc_wake_up_queued_task(struct rpc_wait_queue *, + void rpc_wake_up(struct rpc_wait_queue *); + struct rpc_task *rpc_wake_up_next(struct rpc_wait_queue *); + void rpc_wake_up_status(struct rpc_wait_queue *, int); ++void rpc_wake_up_softconn_status(struct rpc_wait_queue *, int); + int rpc_queue_empty(struct rpc_wait_queue *); + void rpc_delay(struct rpc_task *, unsigned long); + void * rpc_malloc(struct rpc_task *, size_t); +diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c +index d12ffa5..d92000a 100644 +--- a/net/sunrpc/sched.c ++++ b/net/sunrpc/sched.c +@@ -543,6 +543,35 @@ void rpc_wake_up_status(struct rpc_wait_queue *queue, int status) + } + EXPORT_SYMBOL_GPL(rpc_wake_up_status); + ++/** ++ * rpc_wake_up_softconn_status - wake up all SOFTCONN rpc_tasks and set their ++ * status value. ++ * @queue: rpc_wait_queue on which the tasks are sleeping ++ * @status: status value to set ++ * ++ * Grabs queue->lock ++ */ ++void rpc_wake_up_softconn_status(struct rpc_wait_queue *queue, int status) ++{ ++ struct rpc_task *task, *next; ++ struct list_head *head; ++ ++ spin_lock_bh(&queue->lock); ++ head = &queue->tasks[queue->maxpriority]; ++ for (;;) { ++ list_for_each_entry_safe(task, next, head, u.tk_wait.list) ++ if (RPC_IS_SOFTCONN(task)) { ++ task->tk_status = status; ++ rpc_wake_up_task_queue_locked(queue, task); ++ } ++ if (head == &queue->tasks[0]) ++ break; ++ head--; ++ } ++ spin_unlock_bh(&queue->lock); ++} ++EXPORT_SYMBOL_GPL(rpc_wake_up_softconn_status); ++ + static void __rpc_queue_timer_fn(unsigned long ptr) + { + struct rpc_wait_queue *queue = (struct rpc_wait_queue *)ptr; +diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c +index d7f97ef..02c683b 100644 +--- a/net/sunrpc/xprtsock.c ++++ b/net/sunrpc/xprtsock.c +@@ -2158,7 +2158,11 @@ static void xs_tcp_setup_socket(struct work_struct *work) + case -ECONNREFUSED: + case -ECONNRESET: + case -ENETUNREACH: +- /* retry with existing socket, after a delay */ ++ /* Retry with existing socket after a delay, except ++ * for SOFTCONN tasks which fail. */ ++ xprt_clear_connecting(xprt); ++ rpc_wake_up_softconn_status(&xprt->pending, status); ++ return; + case 0: + case -EINPROGRESS: + case -EALREADY: +-- +1.7.7 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-dh-alua-always-update-tpgs-status new/patches.fixes/scsi-dh-alua-always-update-tpgs-status --- old/patches.fixes/scsi-dh-alua-always-update-tpgs-status 2011-10-24 18:28:04.000000000 +0200 +++ new/patches.fixes/scsi-dh-alua-always-update-tpgs-status 2011-12-30 15:20:59.000000000 +0100 @@ -1,7 +1,8 @@ From: Hannes Reinecke Date: Tue, 23 Aug 2011 11:09:48 +0200 Subject: scsi_dh_alua: always update TPGS status on activate -Patch-Mainline: submitted to linux-scsi +Patch-Mainline: v3.2-rc1 +Git-commit: 46ccf6b55bfa9fff7d0a9da761f186e98cf2f660 When activating a patch we should always update the TPGS state as it might have changed in between. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-dh-check-for-sdev-state-in-store_dh_state new/patches.fixes/scsi-dh-check-for-sdev-state-in-store_dh_state --- old/patches.fixes/scsi-dh-check-for-sdev-state-in-store_dh_state 2011-10-24 18:28:04.000000000 +0200 +++ new/patches.fixes/scsi-dh-check-for-sdev-state-in-store_dh_state 2011-12-30 15:20:59.000000000 +0100 @@ -2,7 +2,8 @@ Date: Tue, 23 Aug 2011 12:12:52 +0200 Subject: scsi_dh: Check for sdev state in store_dh_state() References: bnc#616080 -Patch-Mainline: Submitted to linux-scsi +Patch-Mainline: v3.2-rc1 +Git-commit: 6bc8d2a0c6bb3e52f0c66e6cde6799d1b90b42ba Avoid attaching a hardware handler to a device which is already scheduled for deletion. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-dh-queuedata-accessors new/patches.fixes/scsi-dh-queuedata-accessors --- old/patches.fixes/scsi-dh-queuedata-accessors 2011-10-24 18:28:04.000000000 +0200 +++ new/patches.fixes/scsi-dh-queuedata-accessors 2011-12-30 15:20:59.000000000 +0100 @@ -21,16 +21,16 @@ --- a/drivers/scsi/device_handler/scsi_dh.c +++ b/drivers/scsi/device_handler/scsi_dh.c -@@ -397,7 +397,7 @@ int scsi_dh_activate(struct request_queu - struct device *dev = NULL; +@@ -449,7 +449,7 @@ int scsi_dh_set_params(struct request_qu + struct scsi_device_handler *scsi_dh = NULL; spin_lock_irqsave(q->queue_lock, flags); - sdev = q->queuedata; + sdev = scsi_device_from_queue(q); if (sdev && sdev->scsi_dh_data) scsi_dh = sdev->scsi_dh_data->scsi_dh; - dev = get_device(&sdev->sdev_gendev); -@@ -468,7 +468,7 @@ int scsi_dh_handler_exist(const char *na + if (scsi_dh && scsi_dh->set_params && get_device(&sdev->sdev_gendev)) +@@ -476,7 +476,7 @@ int scsi_dh_handler_exist(const char *na EXPORT_SYMBOL_GPL(scsi_dh_handler_exist); /* @@ -39,7 +39,7 @@ * @sdev - sdev the handler should be attached to * @name - name of the handler to attach */ -@@ -484,7 +484,7 @@ int scsi_dh_attach(struct request_queue +@@ -492,7 +492,7 @@ int scsi_dh_attach(struct request_queue return -EINVAL; spin_lock_irqsave(q->queue_lock, flags); @@ -48,7 +48,7 @@ if (!sdev || !get_device(&sdev->sdev_gendev)) err = -ENODEV; spin_unlock_irqrestore(q->queue_lock, flags); -@@ -498,7 +498,7 @@ int scsi_dh_attach(struct request_queue +@@ -506,7 +506,7 @@ int scsi_dh_attach(struct request_queue EXPORT_SYMBOL_GPL(scsi_dh_attach); /* @@ -57,7 +57,7 @@ * @sdev - sdev the handler should be detached from * * This function will detach the device handler only -@@ -512,7 +512,7 @@ void scsi_dh_detach(struct request_queue +@@ -520,7 +520,7 @@ void scsi_dh_detach(struct request_queue struct scsi_device_handler *scsi_dh = NULL; spin_lock_irqsave(q->queue_lock, flags); @@ -68,7 +68,7 @@ spin_unlock_irqrestore(q->queue_lock, flags); --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c -@@ -1594,6 +1594,17 @@ out: +@@ -1614,6 +1614,17 @@ out: spin_lock_irq(q->queue_lock); } @@ -88,7 +88,7 @@ struct device *host_dev; --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h -@@ -300,6 +300,7 @@ extern void starget_for_each_device(stru +@@ -301,6 +301,7 @@ extern void starget_for_each_device(stru extern void __starget_for_each_device(struct scsi_target *, void *, void (*fn)(struct scsi_device *, void *)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-evaluate-tpgs-setting new/patches.fixes/scsi-evaluate-tpgs-setting --- old/patches.fixes/scsi-evaluate-tpgs-setting 2011-10-24 18:28:04.000000000 +0200 +++ new/patches.fixes/scsi-evaluate-tpgs-setting 2011-12-30 15:20:59.000000000 +0100 @@ -1,7 +1,8 @@ From: Hannes Reinecke Date: Tue, 23 Aug 2011 09:12:47 +0200 Subject: scsi_dh_alua: Evaluate TPGS setting from inquiry data -Patch-Mainline: Submitted to linux-scsi +Patch-Mainline: v3.2-rc1 +Git-commit: d7c48feb38a5cb6d863d69fd5ef6c309971ebe31 Instead of issuing a standard inquiry from within the alua device handler we can evaluate the TPGS setting from ++++++ patches.kabi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.kabi/jiffies_to_clock_t-kABI_guard.patch new/patches.kabi/jiffies_to_clock_t-kABI_guard.patch --- old/patches.kabi/jiffies_to_clock_t-kABI_guard.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.kabi/jiffies_to_clock_t-kABI_guard.patch 2012-01-02 12:28:47.000000000 +0100 @@ -0,0 +1,29 @@ +From: Jiri Slaby +Date: Wed, 13 Jul 2011 21:33:30 +0200 +Subject: kabi: fix jiffies_to_clock_t breakage +Patch-mainline: never + +Upstream commit ec9ee3fc9e54 (time: Change jiffies_to_clock_t() +argument type to unsigned long) changed jiffies_to_clock_t parameter +from long to ulong. It means nothing to the callsites. The register +is of the same length. + +Signed-off-by: Jiri Slaby +--- + include/linux/jiffies.h | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/include/linux/jiffies.h ++++ b/include/linux/jiffies.h +@@ -303,7 +303,11 @@ extern void jiffies_to_timespec(const un + extern unsigned long timeval_to_jiffies(const struct timeval *value); + extern void jiffies_to_timeval(const unsigned long jiffies, + struct timeval *value); ++#ifdef __GENKSYMS__ ++extern clock_t jiffies_to_clock_t(long x); ++#else + extern clock_t jiffies_to_clock_t(unsigned long x); ++#endif + extern unsigned long clock_t_to_jiffies(unsigned long x); + extern u64 jiffies_64_to_clock_t(u64 x); + extern u64 nsec_to_clock_t(u64 x); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.kabi/revert-USB-fix-ehci-alignment-error new/patches.kabi/revert-USB-fix-ehci-alignment-error --- old/patches.kabi/revert-USB-fix-ehci-alignment-error 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.kabi/revert-USB-fix-ehci-alignment-error 2012-01-02 12:28:47.000000000 +0100 @@ -0,0 +1,24 @@ +From 5434d8d4472cf192e2304099fb1071d30dab817e Mon Sep 17 00:00:00 2001 +From: Michal Marek +Date: Mon, 12 Dec 2011 13:13:10 +0100 +Subject: [PATCH] Revert "USB: fix ehci alignment error" +Patch-mainline: never + +This reverts commit ad758ade42246e5339491d6b902964cc4b7d40cd. Revert +this to keep the kabi stable for now. + +Signed-off-by: Michal Marek + +diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h +index c0ecc5a..0097136 100644 +--- a/include/linux/usb/hcd.h ++++ b/include/linux/usb/hcd.h +@@ -178,7 +178,7 @@ struct usb_hcd { + * this structure. + */ + unsigned long hcd_priv[0] +- __attribute__ ((aligned(sizeof(s64)))); ++ __attribute__ ((aligned(sizeof(unsigned long)))); + }; + + /* 2.4 does this a bit differently ... */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.kabi/revert-clocksource-Avoid-selecting-mult-values-that-.patch new/patches.kabi/revert-clocksource-Avoid-selecting-mult-values-that-.patch --- old/patches.kabi/revert-clocksource-Avoid-selecting-mult-values-that-.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.kabi/revert-clocksource-Avoid-selecting-mult-values-that-.patch 2012-01-02 12:28:47.000000000 +0100 @@ -0,0 +1,168 @@ +From a3f46156192c77b8b405616afba1ee774cfaa294 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +Date: Mon, 2 Jan 2012 12:16:36 +0100 +Subject: Revert "clocksource: Avoid selecting mult values that might overflow + when adjusted" +Git-commit: a3f46156192c77b8b405616afba1ee774cfaa294 +Patch-mainline: yes + +This reverts commit be80893d309e256fe05a1e55d440bd6188ba2748. + +It breaks kABI. + +Signed-off-by: Jiri Slaby +--- + include/linux/clocksource.h | 3 +- + kernel/time/clocksource.c | 58 +++++++----------------------------------- + kernel/time/timekeeping.c | 7 ----- + 3 files changed, 11 insertions(+), 57 deletions(-) + +diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h +index c86c940..139c4db 100644 +--- a/include/linux/clocksource.h ++++ b/include/linux/clocksource.h +@@ -156,7 +156,6 @@ extern u64 timecounter_cyc2time(struct timecounter *tc, + * @mult: cycle to nanosecond multiplier + * @shift: cycle to nanosecond divisor (power of two) + * @max_idle_ns: max idle time permitted by the clocksource (nsecs) +- * @maxadj maximum adjustment value to mult (~11%) + * @flags: flags describing special properties + * @archdata: arch-specific data + * @suspend: suspend function for the clocksource, if necessary +@@ -173,7 +172,7 @@ struct clocksource { + u32 mult; + u32 shift; + u64 max_idle_ns; +- u32 maxadj; ++ + #ifdef CONFIG_ARCH_CLOCKSOURCE_DATA + struct arch_clocksource_data archdata; + #endif +diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c +index 8f77da1..8b27006 100644 +--- a/kernel/time/clocksource.c ++++ b/kernel/time/clocksource.c +@@ -494,22 +494,6 @@ void clocksource_touch_watchdog(void) + } + + /** +- * clocksource_max_adjustment- Returns max adjustment amount +- * @cs: Pointer to clocksource +- * +- */ +-static u32 clocksource_max_adjustment(struct clocksource *cs) +-{ +- u64 ret; +- /* +- * We won't try to correct for more then 11% adjustments (110,000 ppm), +- */ +- ret = (u64)cs->mult * 11; +- do_div(ret,100); +- return (u32)ret; +-} +- +-/** + * clocksource_max_deferment - Returns max time the clocksource can be deferred + * @cs: Pointer to clocksource + * +@@ -521,28 +505,25 @@ static u64 clocksource_max_deferment(struct clocksource *cs) + /* + * Calculate the maximum number of cycles that we can pass to the + * cyc2ns function without overflowing a 64-bit signed result. The +- * maximum number of cycles is equal to ULLONG_MAX/(cs->mult+cs->maxadj) +- * which is equivalent to the below. +- * max_cycles < (2^63)/(cs->mult + cs->maxadj) +- * max_cycles < 2^(log2((2^63)/(cs->mult + cs->maxadj))) +- * max_cycles < 2^(log2(2^63) - log2(cs->mult + cs->maxadj)) +- * max_cycles < 2^(63 - log2(cs->mult + cs->maxadj)) +- * max_cycles < 1 << (63 - log2(cs->mult + cs->maxadj)) ++ * maximum number of cycles is equal to ULLONG_MAX/cs->mult which ++ * is equivalent to the below. ++ * max_cycles < (2^63)/cs->mult ++ * max_cycles < 2^(log2((2^63)/cs->mult)) ++ * max_cycles < 2^(log2(2^63) - log2(cs->mult)) ++ * max_cycles < 2^(63 - log2(cs->mult)) ++ * max_cycles < 1 << (63 - log2(cs->mult)) + * Please note that we add 1 to the result of the log2 to account for + * any rounding errors, ensure the above inequality is satisfied and + * no overflow will occur. + */ +- max_cycles = 1ULL << (63 - (ilog2(cs->mult + cs->maxadj) + 1)); ++ max_cycles = 1ULL << (63 - (ilog2(cs->mult) + 1)); + + /* + * The actual maximum number of cycles we can defer the clocksource is + * determined by the minimum of max_cycles and cs->mask. +- * Note: Here we subtract the maxadj to make sure we don't sleep for +- * too long if there's a large negative adjustment. + */ + max_cycles = min_t(u64, max_cycles, (u64) cs->mask); +- max_nsecs = clocksource_cyc2ns(max_cycles, cs->mult - cs->maxadj, +- cs->shift); ++ max_nsecs = clocksource_cyc2ns(max_cycles, cs->mult, cs->shift); + + /* + * To ensure that the clocksource does not wrap whilst we are idle, +@@ -661,6 +642,7 @@ static void clocksource_enqueue(struct clocksource *cs) + void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq) + { + u64 sec; ++ + /* + * Calc the maximum number of seconds which we can run before + * wrapping around. For clocksources which have a mask > 32bit +@@ -681,20 +663,6 @@ void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq) + + clocks_calc_mult_shift(&cs->mult, &cs->shift, freq, + NSEC_PER_SEC / scale, sec * scale); +- +- /* +- * for clocksources that have large mults, to avoid overflow. +- * Since mult may be adjusted by ntp, add an safety extra margin +- * +- */ +- cs->maxadj = clocksource_max_adjustment(cs); +- while ((cs->mult + cs->maxadj < cs->mult) +- || (cs->mult - cs->maxadj > cs->mult)) { +- cs->mult >>= 1; +- cs->shift--; +- cs->maxadj = clocksource_max_adjustment(cs); +- } +- + cs->max_idle_ns = clocksource_max_deferment(cs); + } + EXPORT_SYMBOL_GPL(__clocksource_updatefreq_scale); +@@ -735,12 +703,6 @@ EXPORT_SYMBOL_GPL(__clocksource_register_scale); + */ + int clocksource_register(struct clocksource *cs) + { +- /* calculate max adjustment for given mult/shift */ +- cs->maxadj = clocksource_max_adjustment(cs); +- WARN_ONCE(cs->mult + cs->maxadj < cs->mult, +- "Clocksource %s might overflow on 11%% adjustment\n", +- cs->name); +- + /* calculate max idle time permitted for this clocksource */ + cs->max_idle_ns = clocksource_max_deferment(cs); + +diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c +index 6f9798b..da4a778 100644 +--- a/kernel/time/timekeeping.c ++++ b/kernel/time/timekeeping.c +@@ -824,13 +824,6 @@ static void timekeeping_adjust(s64 offset) + } else + return; + +- WARN_ONCE(timekeeper.clock->maxadj && +- (timekeeper.mult + adj > timekeeper.clock->mult + +- timekeeper.clock->maxadj), +- "Adjusting %s more then 11%% (%ld vs %ld)\n", +- timekeeper.clock->name, (long)timekeeper.mult + adj, +- (long)timekeeper.clock->mult + +- timekeeper.clock->maxadj); + timekeeper.mult += adj; + timekeeper.xtime_interval += interval; + timekeeper.xtime_nsec -= offset; +-- +1.7.8 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.kabi/revert-inet-add-a-redirect-generation-id-in-inetpeer.patch new/patches.kabi/revert-inet-add-a-redirect-generation-id-in-inetpeer.patch --- old/patches.kabi/revert-inet-add-a-redirect-generation-id-in-inetpeer.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.kabi/revert-inet-add-a-redirect-generation-id-in-inetpeer.patch 2012-01-02 12:28:47.000000000 +0100 @@ -0,0 +1,82 @@ +From 9d0f1778415c926a2834eb01169eea7c96e5381a Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +Date: Mon, 2 Jan 2012 12:01:44 +0100 +Subject: Revert "inet: add a redirect generation id in inetpeer" +Git-commit: 9d0f1778415c926a2834eb01169eea7c96e5381a +Patch-mainline: yes + +This reverts commit 9c8da5125682191090bf32917a6bfba3d711492d. + +It breaks kABI. + +Signed-off-by: Jiri Slaby +--- + include/net/inetpeer.h | 1 - + net/ipv4/route.c | 10 +--------- + 2 files changed, 1 insertions(+), 10 deletions(-) + +diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h +index e9ff3fc..78c83e6 100644 +--- a/include/net/inetpeer.h ++++ b/include/net/inetpeer.h +@@ -35,7 +35,6 @@ struct inet_peer { + + u32 metrics[RTAX_MAX]; + u32 rate_tokens; /* rate limiting for ICMP */ +- int redirect_genid; + unsigned long rate_last; + unsigned long pmtu_expires; + u32 pmtu_orig; +diff --git a/net/ipv4/route.c b/net/ipv4/route.c +index 05ac666c..abfc641 100644 +--- a/net/ipv4/route.c ++++ b/net/ipv4/route.c +@@ -132,7 +132,6 @@ static int ip_rt_mtu_expires __read_mostly = 10 * 60 * HZ; + static int ip_rt_min_pmtu __read_mostly = 512 + 20 + 20; + static int ip_rt_min_advmss __read_mostly = 256; + static int rt_chain_length_max __read_mostly = 20; +-static int redirect_genid; + + /* + * Interface to generic destination cache. +@@ -843,7 +842,6 @@ static void rt_cache_invalidate(struct net *net) + + get_random_bytes(&shuffle, sizeof(shuffle)); + atomic_add(shuffle + 1U, &net->ipv4.rt_genid); +- redirect_genid++; + } + + /* +@@ -1396,10 +1394,8 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw, + + peer = rt->peer; + if (peer) { +- if (peer->redirect_learned.a4 != new_gw || +- peer->redirect_genid != redirect_genid) { ++ if (peer->redirect_learned.a4 != new_gw) { + peer->redirect_learned.a4 = new_gw; +- peer->redirect_genid = redirect_genid; + atomic_inc(&__rt_peer_genid); + } + check_peer_redir(&rt->dst, peer); +@@ -1704,8 +1700,6 @@ static void ipv4_validate_peer(struct rtable *rt) + if (peer) { + check_peer_pmtu(&rt->dst, peer); + +- if (peer->redirect_genid != redirect_genid) +- peer->redirect_learned.a4 = 0; + if (peer->redirect_learned.a4 && + peer->redirect_learned.a4 != rt->rt_gateway) + check_peer_redir(&rt->dst, peer); +@@ -1864,8 +1858,6 @@ static void rt_init_metrics(struct rtable *rt, const struct flowi4 *fl4, + dst_init_metrics(&rt->dst, peer->metrics, false); + + check_peer_pmtu(&rt->dst, peer); +- if (peer->redirect_genid != redirect_genid) +- peer->redirect_learned.a4 = 0; + if (peer->redirect_learned.a4 && + peer->redirect_learned.a4 != rt->rt_gateway) { + rt->rt_gateway = peer->redirect_learned.a4; +-- +1.7.8 + ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 21895 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ ++++ 26859 lines of diff (skipped) ++++++ patches.xen.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen-x86-no-lapic new/patches.xen/xen-x86-no-lapic --- old/patches.xen/xen-x86-no-lapic 2011-11-03 14:49:44.000000000 +0100 +++ new/patches.xen/xen-x86-no-lapic 2011-11-11 23:26:08.000000000 +0100 @@ -3,8 +3,18 @@ Patch-mainline: n/a References: bnc#191115 ---- head-2011-09-07.orig/arch/x86/include/asm/apic.h 2011-04-13 14:08:57.000000000 +0200 -+++ head-2011-09-07/arch/x86/include/asm/apic.h 2011-09-09 15:56:48.000000000 +0200 +--- + arch/x86/include/asm/apic.h | 20 ++++++++++++++++++++ + arch/x86/include/asm/apicdef.h | 16 ++++++++++++++++ + arch/x86/include/mach-xen/asm/fixmap.h | 3 +-- + arch/x86/include/mach-xen/asm/smp.h | 4 ++-- + arch/x86/kernel/acpi/boot.c | 12 +++++++----- + arch/x86/kernel/irq-xen.c | 10 ++++++++-- + drivers/xen/core/smpboot.c | 2 +- + 7 files changed, 55 insertions(+), 12 deletions(-) + +--- a/arch/x86/include/asm/apic.h ++++ b/arch/x86/include/asm/apic.h @@ -9,7 +9,9 @@ #include #include @@ -97,7 +107,7 @@ * section. So the order is important and enforced by the ordering @@ -503,6 +518,7 @@ static inline void default_wait_for_init - extern struct apic *generic_bigsmp_probe(void); + extern void generic_bigsmp_probe(void); +#endif /* CONFIG_XEN */ @@ -121,8 +131,8 @@ #endif /* CONFIG_X86_LOCAL_APIC */ #endif /* _ASM_X86_APIC_H */ ---- head-2011-09-07.orig/arch/x86/include/asm/apicdef.h 2011-05-19 06:06:34.000000000 +0200 -+++ head-2011-09-07/arch/x86/include/asm/apicdef.h 2011-05-23 11:41:00.000000000 +0200 +--- a/arch/x86/include/asm/apicdef.h ++++ b/arch/x86/include/asm/apicdef.h @@ -17,6 +17,8 @@ */ #define IO_APIC_SLOT_SIZE 1024 @@ -167,8 +177,8 @@ #ifdef CONFIG_X86_32 #define BAD_APICID 0xFFu #else ---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-09-08 16:54:08.000000000 +0200 -+++ head-2011-09-07/arch/x86/include/mach-xen/asm/fixmap.h 2011-09-09 15:56:55.000000000 +0200 +--- a/arch/x86/include/mach-xen/asm/fixmap.h ++++ b/arch/x86/include/mach-xen/asm/fixmap.h @@ -17,7 +17,6 @@ #ifndef __ASSEMBLY__ #include @@ -189,8 +199,8 @@ #ifdef CONFIG_X86_IO_APIC FIX_IO_APIC_BASE_0, FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1, ---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/smp.h 2011-04-13 17:01:31.000000000 +0200 -+++ head-2011-09-07/arch/x86/include/mach-xen/asm/smp.h 2011-03-03 16:50:42.000000000 +0100 +--- a/arch/x86/include/mach-xen/asm/smp.h ++++ b/arch/x86/include/mach-xen/asm/smp.h @@ -15,7 +15,7 @@ # include # endif @@ -209,8 +219,8 @@ #ifndef CONFIG_X86_64 static inline int logical_smp_processor_id(void) ---- head-2011-09-07.orig/arch/x86/kernel/acpi/boot.c 2011-04-13 14:08:57.000000000 +0200 -+++ head-2011-09-07/arch/x86/kernel/acpi/boot.c 2011-03-11 11:17:06.000000000 +0100 +--- a/arch/x86/kernel/acpi/boot.c ++++ b/arch/x86/kernel/acpi/boot.c @@ -74,14 +74,14 @@ int acpi_sci_override_gsi __initdata; int acpi_skip_timer_override __initdata; int acpi_use_timer_override __initdata; @@ -262,8 +272,8 @@ return 0; } ---- head-2011-09-07.orig/arch/x86/kernel/irq-xen.c 2011-07-01 15:19:34.000000000 +0200 -+++ head-2011-09-07/arch/x86/kernel/irq-xen.c 2011-04-13 17:01:22.000000000 +0200 +--- a/arch/x86/kernel/irq-xen.c ++++ b/arch/x86/kernel/irq-xen.c @@ -17,9 +17,9 @@ #include #include @@ -314,8 +324,8 @@ } ---- head-2011-09-07.orig/drivers/xen/core/smpboot.c 2011-02-02 15:10:16.000000000 +0100 -+++ head-2011-09-07/drivers/xen/core/smpboot.c 2011-03-03 16:50:49.000000000 +0100 +--- a/drivers/xen/core/smpboot.c ++++ b/drivers/xen/core/smpboot.c @@ -283,7 +283,7 @@ void __init smp_prepare_cpus(unsigned in * Here we can be sure that there is an IO-APIC in the system. Let's * go and set it up: ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:54.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:54.000000000 +0100 @@ -27,6 +27,13 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## + patches.kernel.org/patch-3.1.1 + patches.kernel.org/patch-3.1.1-2 + patches.kernel.org/patch-3.1.2-3 + patches.kernel.org/patch-3.1.3-4 + patches.kernel.org/patch-3.1.4-5 + patches.kernel.org/patch-3.1.5-6 + patches.kernel.org/patch-3.1.6-7 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -40,6 +47,10 @@ ######################################################## # kABI consistency patches ######################################################## + patches.kabi/jiffies_to_clock_t-kABI_guard.patch + patches.kabi/revert-USB-fix-ehci-alignment-error + patches.kabi/revert-inet-add-a-redirect-generation-id-in-inetpeer.patch + patches.kabi/revert-clocksource-Avoid-selecting-mult-values-that-.patch ######################################################## # @@ -222,6 +233,9 @@ patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch patches.arch/dell_optiplex_990_fix_reboot.patch + patches.arch/dell_latitude_e6xxx_e5xxx__fix_reboot.patch + + patches.arch/x2apic_opt_out.patch ######################################################## # CPUFREQ @@ -234,6 +248,7 @@ patches.fixes/intel_idle_lapic_param.patch patches.fixes/intel_idle_add_flush_tlb_param.patch + patches.fixes/intel_idle_fix_mwait_leave_zero_kvm_issue.patch ######################################################## # AGP, graphics related stuff @@ -254,6 +269,7 @@ +needs_update37 patches.fixes/nfsd-06-sunrpc-cache-retry-cache-lookups-that-return-ETIMEDO.patch patches.fixes/nfs-adaptive-readdir-plus + patches.fixes/nfs-connect-timeout ######################################################## # lockd + statd @@ -276,6 +292,201 @@ # btrfs ######################################################## + patches.suse/btrfs-0110-move-stuff-around-in-btrfs_inode-to-get-better.patch + patches.suse/btrfs-0111-kill-reserved_bytes-in-inode.patch + patches.suse/btrfs-0112-use-d_obtain_alias-when-mounting-subvol-subvol.patch + patches.suse/btrfs-0113-fix-how-we-mount-subvol-whatever.patch + patches.suse/btrfs-0114-use-bytes_may_use-for-all-ENOSPC-reservations.patch + patches.suse/btrfs-0115-skip-looking-for-delalloc-if-we-don-t-have-fil.patch + patches.suse/btrfs-0116-calculate-checksum-space-correctly.patch + patches.suse/btrfs-0117-kill-the-orphan-space-calculation-for-snapshot.patch + patches.suse/btrfs-0118-kill-the-durable-block-rsv-stuff.patch + patches.suse/btrfs-0119-fix-how-we-reserve-space-for-deleting-inodes.patch + patches.suse/btrfs-0120-ratelimit-the-generation-printk-for-the-free-s.patch + patches.suse/btrfs-0121-kill-unused-parts-of-block_rsv.patch + patches.suse/btrfs-0122-don-t-try-to-commit-in-btrfs_block_rsv_check.patch + patches.suse/btrfs-0123-optimize-how-we-account-for-space-in-truncate.patch + patches.suse/btrfs-0124-kill-btrfs_truncate_reserve_metadata.patch + patches.suse/btrfs-0125-only-reserve-space-in-fallocate-if-we-have-to-.patch + patches.suse/btrfs-0126-reduce-the-amount-of-space-needed-for-truncate.patch + patches.suse/btrfs-0127-allow-callers-to-specify-if-flushing-can-occur.patch + patches.suse/btrfs-0128-fix-call-to-btrfs_search_slot-in-free-space-ca.patch + patches.suse/btrfs-0129-fix-space-leak-when-we-fail-to-make-an-allocat.patch + patches.suse/btrfs-0130-don-t-increase-the-block_rsv-s-size-when-emerg.patch + patches.suse/btrfs-0131-set-truncate-block-rsv-s-size.patch + patches.suse/btrfs-0132-put-the-block-group-cache-after-we-commit-the-.patch + patches.suse/btrfs-0133-handle-enospc-accounting-for-free-space-inodes.patch + patches.suse/btrfs-0134-use-the-transactions-block_rsv-for-the-csum-ro.patch + patches.suse/btrfs-0135-don-t-get-the-block_rsv-in-btrfs_free_tree_blo.patch + patches.suse/btrfs-0136-stop-passing-a-trans-handle-all-around-the-res.patch + patches.suse/btrfs-0137-make-sure-to-unset-trans-block_rsv-before-runn.patch + patches.suse/btrfs-0138-delay-iput-when-deleting-a-block-group.patch + patches.suse/btrfs-0139-use-the-inode-s-mapping-mask-for-allocating-pa.patch + patches.suse/btrfs-0140-fix-orphan-cleanup-regression.patch + patches.suse/btrfs-0141-check-unused-against-how-much-space-we-actuall.patch + patches.suse/btrfs-0142-introduce-convert_extent_bit.patch + patches.suse/btrfs-0143-stop-using-write_one_page.patch + patches.suse/btrfs-0144-use-the-global-reserve-as-a-backup-for-deletin.patch + patches.suse/btrfs-0145-break-out-of-orphan-cleanup-if-we-can-t-make-p.patch + patches.suse/btrfs-0146-allow-us-to-overcommit-our-enospc-reservations.patch + patches.suse/btrfs-0147-only-inherit-btrfs-specific-flags-when-creatin.patch + patches.suse/btrfs-0148-introduce-mount-option-no_space_cache.patch + patches.suse/btrfs-0149-don-t-skip-writing-out-a-empty-block-groups-ca.patch + patches.suse/btrfs-0150-add-a-io_ctl-struct-and-helpers-for-dealing-wi.patch + patches.suse/btrfs-0151-check-the-return-value-of-filemap_write_and_wa.patch + patches.suse/btrfs-0152-take-overflow-into-account-in-reserving-space.patch + patches.suse/btrfs-0153-inline-checksums-into-the-disk-free-space-cach.patch + patches.suse/btrfs-0154-wait-for-ordered-extents-if-we-didn-t-reclaim-.patch + patches.suse/btrfs-0155-fix-the-amount-of-space-reserved-for-unlink.patch + patches.suse/btrfs-0156-fix-regression-in-re-setting-a-large-xattr.patch + patches.suse/btrfs-0157-don-t-check-bytes_pinned-to-determine-if-we-sh.patch + patches.suse/btrfs-0158-wait-for-ordered-extents-if-we-re-in-trouble-w.patch + patches.suse/btrfs-0159-allow-shrink_delalloc-flush-the-needed-reclaim.patch + patches.suse/btrfs-0160-release-trans-metadata-bytes-before-flushing-d.patch + patches.suse/btrfs-0161-reserve-some-space-for-an-orphan-item-when-unl.patch + patches.suse/btrfs-0162-seperate-out-btrfs_block_rsv_check-out-into-2-.patch + patches.suse/btrfs-0163-if-we-have-a-lot-of-pinned-space-commit-the-tr.patch + patches.suse/btrfs-0164-don-t-flush-the-cache-inode-before-writing-it.patch + patches.suse/btrfs-0165-check-file-extent-backref-offset-underflow.patch + patches.suse/btrfs-0166-fix-memory-leak-in-btrfs_defrag_file.patch + patches.suse/btrfs-0167-fix-defragmentation-regression.patch + patches.suse/btrfs-0168-use-i_size_read-in-btrfs_defrag_file.patch + patches.suse/btrfs-0169-fix-wrong-max_to_defrag-in-btrfs_defrag_file.patch + patches.suse/btrfs-0170-trivial-fix-a-potential-memory-leak-in-btrfs_p.patch + patches.suse/btrfs-0171-honor-extent-thresh-during-defragmentation.patch + patches.suse/btrfs-0172-return-EINVAL-if-start-total_bytes-in-fitrim-i.patch + patches.suse/btrfs-0173-fix-array-bound-checking.patch + patches.suse/btrfs-0174-remove-BUG_ON-in-compress_file_range.patch + patches.suse/btrfs-0175-fix-direct-io-vs-nodatacow.patch + patches.suse/btrfs-0176-do-not-set-EXTENT_DIRTY-along-with-EXTENT_DELA.patch + patches.suse/btrfs-0177-pass-the-correct-root-to-lookup_free_space_ino.patch + patches.suse/btrfs-0178-fix-return-value-of-btrfs_get_acl.patch + patches.suse/btrfs-0179-fix-race-between-multi-task-space-allocation-a.patch + patches.suse/btrfs-0180-fix-oops-on-failure-path.patch + patches.suse/btrfs-0181-fix-a-bug-when-opening-seed-devices.patch + patches.suse/btrfs-0182-close-all-bdevs-on-mount-failure.patch + patches.suse/btrfs-0183-do-not-allow-mounting-non-subvolumes-via-subvo.patch + patches.suse/btrfs-0184-ratelimit-WARN_ON-in-use_block_rsv.patch + patches.suse/btrfs-0185-don-t-wait-as-long-for-more-batches-during-SSD.patch + patches.suse/btrfs-0186-make-sure-btrfs_remove_free_space-doesn-t-leak.patch + patches.suse/btrfs-0187-fix-extent-pinning-bugs-in-the-tree-log.patch + patches.suse/btrfs-0188-make-sure-to-flush-queued-bios-if-write_cache_.patch + patches.suse/btrfs-0189-release-metadata-from-global-reserve-if-we-hav.patch + patches.suse/btrfs-0190-use-the-global-reserve-when-truncating-the-fre.patch + patches.suse/btrfs-0191-separate-superblock-items-out-of-fs_info.patch + patches.suse/btrfs-0192-add-a-log-of-past-tree-roots.patch + patches.suse/btrfs-0193-make-a-delayed_block_rsv-for-the-delayed-item-.patch + patches.suse/btrfs-0194-be-smarter-about-committing-the-transaction-in.patch + patches.suse/btrfs-0195-ClearPageError-during-writepage-and-clean_tree.patch + patches.suse/btrfs-0196-fix-delayed-insertion-reservation.patch + patches.suse/btrfs-0197-add-an-extra-wait-mode-to-read_extent_buffer_p.patch + patches.suse/btrfs-0198-add-READAHEAD-extent-buffer-flag.patch + patches.suse/btrfs-0199-state-information-for-readahead.patch + patches.suse/btrfs-0200-initial-readahead-code-and-prototypes.patch + patches.suse/btrfs-0201-hooks-for-readahead.patch + patches.suse/btrfs-0202-use-readahead-API-for-scrub.patch + patches.suse/btrfs-0203-added-helper-functions-to-iterate-backrefs.patch + patches.suse/btrfs-0204-scrub-added-unverified_errors.patch + patches.suse/btrfs-0205-scrub-print-paths-of-corrupted-files.patch + patches.suse/btrfs-0206-scrub-bugfix-mirror_num-off-by-one.patch + patches.suse/btrfs-0207-add-mirror_num-to-extent_read_full_page.patch + patches.suse/btrfs-0208-scrub-use-int-for-mirror_num-not-u64.patch + patches.suse/btrfs-0209-scrub-add-fixup-code-for-errors-on-nodatasum-f.patch + patches.suse/btrfs-0210-new-ioctls-to-do-logical-inode-and-inode-path-.patch + patches.suse/btrfs-0211-btrfs_multi_bio-replaced-with-btrfs_bio.patch + patches.suse/btrfs-0212-Do-not-use-bio-bi_bdev-after-submission.patch + patches.suse/btrfs-0213-Put-mirror_num-in-bi_bdev.patch + patches.suse/btrfs-0214-Moved-repair-code-from-inode.c-to-extent_io.c.patch + patches.suse/btrfs-0215-integrating-raid-repair-and-scrub-fixup-nodata.patch + patches.suse/btrfs-0216-fix-the-new-inspection-ioctls-for-32-bit-compa.patch + patches.suse/btrfs-0217-fix-extent_buffer-leak-in-the-metadata-IO-erro.patch + patches.suse/btrfs-0218-stop-the-readahead-threads-on-failed-mount.patch + patches.suse/btrfs-0219-stop-leaking-btrfs_bios-on-readahead.patch + patches.suse/btrfs-0221-fix-a-potential-btrfs_bio-leak-on-scrub-fixups.patch + patches.suse/btrfs-0222-fix-race-during-transaction-joins.patch + patches.suse/btrfs-0223-check-for-a-null-fs-root-when-writing-to-the-b.patch + patches.suse/btrfs-0224-fix-double-free-tree_root-in-btrfs_mount.patch + patches.suse/btrfs-0225-fix-oops-on-NULL-trans-handle-in-btrfs_truncat.patch + patches.suse/btrfs-0226-fix-our-reservations-for-updating-an-inode-whe.patch + patches.suse/btrfs-0227-fix-memory-leak-in-btrfs_parse_early_options.patch + patches.suse/btrfs-0228-fix-subvol_name-leak-on-error-in-btrfs_mount.patch + patches.suse/btrfs-0229-avoid-null-dereference-and-leaks-when-bailing-.patch + patches.suse/btrfs-0230-close-devices-on-all-error-paths-in-open_ctree.patch + patches.suse/btrfs-0231-rework-error-handling-in-btrfs_mount.patch + patches.suse/btrfs-0232-tweak-the-delayed-inode-reservations-again.patch + patches.suse/btrfs-0233-fix-nocow-when-deleting-the-item.patch + patches.suse/btrfs-0234-fix-no-reserved-space-for-writing-out-inode-ca.patch + patches.suse/btrfs-0235-fix-unreleased-path-in-btrfs_orphan_cleanup.patch + patches.suse/btrfs-0236-Abstract-similar-code-for-btrfs_block_rsv_add-.patch + patches.suse/btrfs-0237-fix-orphan-backref-nodes.patch + patches.suse/btrfs-0238-only-map-pages-if-we-know-we-need-them-when-re.patch + patches.suse/btrfs-0239-fix-deadlock-caused-by-the-race-between-reloca.patch + patches.suse/btrfs-0240-handle-bio_add_page-failure-gracefully-in-scru.patch + patches.suse/btrfs-0241-rename-the-option-to-nospace_cache.patch + patches.suse/btrfs-0242-fix-tree-corruption-after-multi-thread-snapsho.patch + patches.suse/btrfs-0243-fix-barrier-flushes.patch + patches.suse/btrfs-0244-Fix-up-32-64-bit-compatibility-for-new-ioctls.patch + patches.suse/btrfs-0245-mirror_num-should-be-int-not-u64.patch + patches.suse/btrfs-0246-fix-to-search-one-more-bitmap-for-cluster-setu.patch + patches.suse/btrfs-0247-avoid-unnecessary-bitmap-search-for-cluster-se.patch + patches.suse/btrfs-0248-fix-stat-blocks-accounting.patch + patches.suse/btrfs-0249-prefix-resize-related-printks-with-btrfs.patch + patches.suse/btrfs-0250-wait-on-caching-if-we-re-loading-the-free-spac.patch + patches.suse/btrfs-0251-clear-pages-dirty-for-io-and-set-them-extent-m.patch + patches.suse/btrfs-0252-sectorsize-align-offsets-in-fiemap.patch + patches.suse/btrfs-0253-remove-free-space-cache.c-WARN-during-log-repl.patch + patches.suse/btrfs-0254-scrub-handle-ENOMEM-from-init_ipath.patch + patches.suse/btrfs-0256-fix-deadlock-on-metadata-reservation-when-evic.patch + patches.suse/btrfs-0257-Don-t-error-on-resizing-FS-to-same-size.patch + patches.suse/btrfs-0258-fix-oops-when-calling-statfs-on-readonly-devic.patch + patches.suse/btrfs-0259-initialize-new-bitmaps-list.patch + patches.suse/btrfs-0260-reset-cluster-s-max_size-when-creating-bitmap.patch + patches.suse/btrfs-0261-start-search-for-new-cluster-at-the-beginning.patch + patches.suse/btrfs-0262-skip-block-groups-without-enough-space-for-a-c.patch + patches.suse/btrfs-0263-skip-allocation-attempt-from-empty-cluster.patch + patches.suse/btrfs-0264-fix-meta-data-raid-repair-merge-problem.patch + patches.suse/btrfs-0265-try-to-allocate-from-cluster-even-at-LOOP_NO_E.patch + patches.suse/btrfs-0266-try-cluster-but-don-t-advance-in-search-list.patch + patches.suse/btrfs-0267-check-if-the-to-be-added-device-is-writable.patch + patches.suse/btrfs-0268-drop-spin-lock-when-memory-alloc-fails.patch + patches.suse/btrfs-0269-fix-btrfs_end_bio-to-deal-with-write-errors-to.patch + patches.suse/btrfs-0270-fix-wrong-i_size-when-truncating-a-file-to-a-l.patch + patches.suse/btrfs-0271-fix-wrong-disk-space-information-of-the-files.patch + patches.suse/btrfs-0272-fix-inaccurate-available-space-on-raid0-profil.patch + patches.suse/btrfs-0273-keep-orphans-for-subvolume-deletion.patch + patches.suse/btrfs-0274-fix-ctime-update-of-on-disk-inode.patch + patches.suse/btrfs-0275-add-a-cond_resched-into-the-worker-loop.patch + patches.suse/btrfs-0276-Establish-i_ops-before-calling-d_instantiate.patch + patches.suse/btrfs-0277-deal-with-NULL-srv_rsv-in-the-delalloc-inode-r.patch + patches.suse/btrfs-0278-fix-num_workers_starting-bug-and-other-bugs-in.patch + patches.suse/btrfs-0279-deal-with-enospc-from-dirtying-inodes-properly.patch + patches.suse/btrfs-0280-fix-how-we-do-delalloc-reservations-and-how-we.patch + patches.suse/btrfs-0281-fix-leaked-space-in-truncate.patch + patches.suse/btrfs-0282-don-t-panic-if-orphan-item-already-exists.patch + patches.suse/btrfs-0283-only-set-cache_generation-if-we-setup-the-bloc.patch + patches.suse/btrfs-0284-unplug-every-once-and-a-while.patch + + # josef's tree + patches.suse/btrfs-0900-add-allocator-tracepoints.patch + + # suse patches (pending upstream approval) + patches.suse/btrfs-allow-cross-subvolume-file-clone.patch + + # patches collected from mailinglist + patches.suse/btrfs-8001-rewrite-btrfs_trim_block_group.patch + patches.suse/btrfs-8007-lock-and-disable-irq-during-space-alloc.patch + patches.suse/btrfs-8013-sector-size-check-during-mount.patch + patches.suse/btrfs-8014-add-new-ioctl-to-determine-size-of-compressed-.patch + patches.suse/btrfs-8015-make-lzo-the-default-compression-scheme.patch + patches.suse/btrfs-8024-workaround-for-cleaner-deadlock.patch + patches.suse/btrfs-8025-update-global-block_rsv-when-creating-a-new-bl.patch + patches.suse/btrfs-8026-fix-possible-deadlock-when-opening-a-seed-devi.patch + + # Workaround for bnc#672923. Will be removed once we come up + # with something that can go upstream. + # (ugly version preserving KABI) + patches.suse/btrfs-use-correct-device-for-maps.patch + ######################################################## # Reiserfs Patches ######################################################## @@ -372,7 +583,6 @@ ######################################################## # DRM/Video ######################################################## - patches.fixes/drm-radeon-kms-fix-i2c-masks.patch ######################################################## # video4linux @@ -383,11 +593,14 @@ ######################################################## patches.fixes/tulip-quad-NIC-ifdown patches.drivers/ehea-modinfo.patch + patches.fixes/net-Add-a-flow_cache_flush_deferred-function.patch ######################################################## # Wireless Networking ######################################################## patches.suse/b43-missing-firmware-info.patch + patches.fixes/batman-adv-bat_socket_read-missing-checks.patch + patches.fixes/batman-adv-Only-write-requested-number-of-byte-to-us.patch ######################################################## # ISDN @@ -438,8 +651,6 @@ # Sound ########################################################## patches.drivers/alsa-hda-0001-realtek-Fix-missing-volume-controls-with-ALC260 - patches.drivers/alsa-hda-0002-Keep-EAPD-turned-on-for-old-Conexant-chips - patches.drivers/alsa-hda-0003-Fix-ADC-input-amp-handling-for-Cx20549 ######################################################## # Char / serial @@ -573,7 +784,6 @@ patches.suse/staging-hv-staging-next-20111001-0055-staging-hv-remove-unnecessary-includes-in-netvsc.patch patches.suse/staging-hv-staging-next-20111001-0056-staging-hv-add-newline-to-log-messages-in-netvsc.patch patches.suse/staging-hv-staging-next-20111001-0057-staging-hv-convert-dev_-loglevel-to-netdev_-logle.patch - patches.suse/staging-hv-staging-next-20111001-0058-staging-hv-fix-a-kernel-warning-in-netvsc_linkstat.patch patches.suse/staging-hv-staging-next-20111001-0059-staging-hv-re-order-the-code-in-netvsc_probe.patch patches.suse/staging-hv-staging-next-20111001-0060-staging-hv-fix-counting-of-outstanding-sends-in-f.patch patches.suse/staging-hv-staging-next-20111001-0061-staging-hv-fix-counting-of-available-buffer-slots.patch @@ -582,7 +792,6 @@ patches.suse/staging-hv-staging-next-20111001-0064-staging-hv-fix-some-typos-in-netvsc.c.patch patches.suse/staging-hv-staging-next-20111001-0065-Staging-hv-Update-TODO-file.patch patches.suse/staging-hv-staging-next-20111001-0066-Staging-hv-vmbus-Show-the-modalias-in-sys-bus-vm.patch - patches.suse/staging-hv-staging-next-20111001-0129-Staging-hv-Add-support-for-2-TB-LUN-in-storage-dr.patch patches.suse/staging-hv-staging-next-20111001-0243-Staging-hv-vmbus-Rename-vmbus_child_device_create.patch patches.suse/staging-hv-staging-next-20111001-0244-Staging-hv-vmbus-Rename-vmbus_child_device_regist.patch patches.suse/staging-hv-staging-next-20111001-0245-Staging-hv-vmbus-Rename-vmbus_child_device_unregi.patch ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.dz3LfZ/_old 2012-01-05 17:01:54.000000000 +0100 +++ /var/tmp/diff_new_pack.dz3LfZ/_new 2012-01-05 17:01:54.000000000 +0100 @@ -1,3 +1,3 @@ -2011-11-03 15:45:45 +0100 -GIT Revision: 187dde0ccea287064d61786473334521ecf7d610 -GIT Branch: master +2012-01-04 14:55:49 +0100 +GIT Revision: 7c0c986672144f9c9fa88d286f8558643aac52ad +GIT Branch: openSUSE-12.1 ++++++ try-disable-staging-driver ++++++ #!/bin/bash ############################################################################# # Copyright (c) 2011 Novell, Inc. # All Rights Reserved. # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, contact Novell, Inc. # # To contact Novell about this file by physical or electronic mail, # you may find current contact information at www.novell.com ############################################################################# # If make fails, check if it happened due to a staging driver and disable it. # That way, staging does not spoil automatic package building and we also # do not need to worry about forgetting to reenable manually disabled drivers. if test -L source; then source="source" else source="." fi makefile="$source/drivers/staging/Makefile" skipped_options=staging-skipped-options logfile=$1 if test -z "$logfile"; then echo "Usage: $0 logfile" >&2 exit 1 fi if ! test -f "$logfile"; then echo "$logfile not found" >&2 exit 1 fi # safety precaution if test "0$(wc -l "$skipped_options" 2>/dev/null)" -gt 20; then echo "Possible loop detected in $0, exiting after 20 attempts" >&2 exit 1 fi # find out if the error happened in drivers/staging dir=$(sed -rn 's@.*/drivers/staging/([^/]*)/.*: error: .*@\1@p; T; q' "$logfile") if test -z "$dir"; then exit 1 else echo "Build failed due to drivers/staging/$dir" fi option=$(sed -n 's/obj-\$(\(.*\))[[:space:]]*+=[[:space:]]*'"$dir"'\//\1/p' "$makefile") if test -z "$option"; then echo "Cannot determine config option to skip drivers/staging/$dir" >&2 exit 1 fi # we need to be carefull not to loop endlessly if grep -qsFx "$option" "$skipped_options"; then echo "$option has already been disabled, but drivers/staging/$dir is still failing" >&2 exit 1 fi echo "Trying to disable $option" "$source/scripts/config" --disable "$option" if ! make silentoldconfig $MAKE_ARGS || grep "^$option" .config; then echo "Could not disable $option" >&2 exit 1 fi echo "$option" >>"$skipped_options" exit 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org