From cfc4bf67cd7d32abf8f8fdae878c55445b93b0e2f2715983c68a9a79af5bffba Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Wed, 25 Sep 2013 06:01:55 +0000 Subject: [PATCH] commit a75f0811a1fd493be9750989368aff128585ec07 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7625 --- config.conf | 34 +- config.sh | 2 +- config.tar.bz2 | 4 +- kernel-debug.changes | 416 ++--------------------- kernel-debug.spec | 145 ++++---- kernel-default.changes | 416 ++--------------------- kernel-default.spec | 157 ++++----- kernel-desktop.changes | 416 ++--------------------- kernel-desktop.spec | 139 ++++---- kernel-docs.changes | 416 ++--------------------- kernel-docs.spec | 10 +- kernel-pae.changes | 416 ++--------------------- kernel-pae.spec | 148 ++++---- kernel-source.changes | 416 ++--------------------- kernel-source.spec | 19 +- kernel-syms.changes | 416 ++--------------------- kernel-syms.spec | 24 +- kernel-trace.changes | 416 ++--------------------- kernel-trace.spec | 145 ++++---- kernel-vanilla.changes | 416 ++--------------------- kernel-vanilla.spec | 141 ++++---- linux-3.12-rc2.tar.bz2 | 3 + patches.apparmor.tar.bz2 | 4 +- patches.arch.tar.bz2 | 4 +- patches.drivers.tar.bz2 | 4 +- patches.fixes.tar.bz2 | 4 +- patches.kernel.org.tar.bz2 | 4 +- patches.rpmify.tar.bz2 | 4 +- patches.suse.tar.bz2 | 4 +- series.conf | 272 ++++++--------- series.confe | 667 +++++++++++++++++++++++++++++++++++++ source-timestamp | 6 +- 32 files changed, 1458 insertions(+), 4230 deletions(-) create mode 100644 linux-3.12-rc2.tar.bz2 create mode 100644 series.confe diff --git a/config.conf b/config.conf index 363c3d36..ad226881 100644 --- a/config.conf +++ b/config.conf @@ -12,20 +12,20 @@ +i386 i386/desktop +i386 i386/pae +i386 -syms i386/debug -+i386 i386/xen -+i386 -syms i386/ec2 +#+i386 i386/xen +#+i386 -syms i386/ec2 +i386 i386/vanilla +i386 -syms i386/trace -+ia64 ia64/default -+ia64 -syms ia64/debug -+ia64 ia64/vanilla -+ia64 -syms ia64/trace +#+ia64 ia64/default +#+ia64 -syms ia64/debug +#+ia64 ia64/vanilla +#+ia64 -syms ia64/trace +x86_64 x86_64/default +x86_64 x86_64/desktop -+x86_64 x86_64/xen -+x86_64 -syms x86_64/ec2 +#+x86_64 x86_64/xen +#+x86_64 -syms x86_64/ec2 +x86_64 -syms x86_64/debug +x86_64 x86_64/vanilla +x86_64 -syms x86_64/trace @@ -38,16 +38,16 @@ +ppc64 ppc64/vanilla # ARM architectures -+armv6hl armv6hl/default -+armv7hl armv7hl/default -+armv7hl armv7hl/lpae -+armv7hl armv7hl/cubox -+armv7hl armv7hl/exynos -+arm64 arm64/default +#+armv6hl armv6hl/default +#+armv7hl armv7hl/default +#+armv7hl armv7hl/lpae +#+armv7hl armv7hl/cubox +#+armv7hl armv7hl/exynos +#+arm64 arm64/default #+s390 s390/s390 #+s390 -syms s390/trace #+s390 s390/vanilla -+s390x s390x/default -+s390x -syms s390x/trace -+s390x s390x/vanilla +#+s390x s390x/default +#+s390x -syms s390x/trace +#+s390x s390x/vanilla diff --git a/config.sh b/config.sh index 30255969..7bd0ad98 100644 --- a/config.sh +++ b/config.sh @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=3.11 +SRCVERSION=3.12-rc2 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against diff --git a/config.tar.bz2 b/config.tar.bz2 index fe279f22..d5f76b74 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f67c99510bfcaa5c3eee21b8a68abbc45761122f7b05575e7edf000dcedc214a -size 312843 +oid sha256:1b49f80bfe58f929cb4c9f0438f5d3c0707f1b62ad66ae1a5749c17b91511b7a +size 175164 diff --git a/kernel-debug.changes b/kernel-debug.changes index 0baba158..fdc5d025 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,362 +1,51 @@ ------------------------------------------------------------------- -Wed Nov 6 14:54:28 CET 2013 - mhocko@suse.cz +Tue Sep 24 18:47:46 CEST 2013 - trenn@suse.de -- Fix a few incorrectly checked [io_]remap_pfn_range() calls - (bnc#849021, CVE-2013-4511). -- commit 2607707 +- Delete patches.arch/010-acpi_initrd_override_tables.patch. + This old one alone broke acpi initrd override -> delete it. +- commit a75f081 ------------------------------------------------------------------- -Wed Oct 30 19:04:18 CET 2013 - dsterba@suse.cz +Tue Sep 24 18:10:03 CEST 2013 - jeffm@suse.com -- Disable patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch - reference: bnc#848059 -- commit e6d4a27 +- lustre/lloop: don't change the logical size for the queue. +- commit 4a2006a ------------------------------------------------------------------- -Wed Oct 30 17:49:05 CET 2013 - tiwai@suse.de +Tue Sep 24 16:30:50 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops - (bnc#846531). -- commit 5b1b1d3 +- Update to 3.12-rc2. +- Eliminated 3 patches. +- commit d7d9943 ------------------------------------------------------------------- -Wed Oct 30 12:36:05 CET 2013 - tiwai@suse.de +Tue Sep 24 15:55:10 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add a fixup for ASUS N76VZ (bnc#846529). -- commit 8bd2042 - -------------------------------------------------------------------- -Mon Oct 28 10:31:59 CET 2013 - jbeulich@suse.com - -- Update EC2 config files. -- commit 81dd01f - -------------------------------------------------------------------- -Mon Oct 28 09:25:43 CET 2013 - jbeulich@suse.com - -- Refresh Xen patches (bnc#829682, bnc#842063). -- pcifront: Deal with toolstack missing 'XenbusStateClosing' - state. -- Update Xen patches to 3.11.6. -- commit 2339477 - -------------------------------------------------------------------- -Thu Oct 24 18:23:02 CEST 2013 - trenn@suse.de - -- cpufreq: ondemand: Change the calculation of target frequency - (bnc#846734). -- commit 0ba01b7 - -------------------------------------------------------------------- -Thu Oct 24 17:08:03 CEST 2013 - dsterba@suse.cz - -- Btrfs: fix negative qgroup tracking from owner accounting (bnc#821948) -- commit ef319f1 - -------------------------------------------------------------------- -Tue Oct 22 21:17:47 CEST 2013 - jeffm@suse.com - -- nouveau: Fix race with fence signaling (bnc#844177). -- commit 8d7989b - -------------------------------------------------------------------- -Fri Oct 18 22:19:21 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.6 (bnc#841645). -- Delete patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ. -- commit 9ca6827 - -------------------------------------------------------------------- -Mon Oct 14 18:45:32 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 (vanilla) -- commit 53efb9c - -------------------------------------------------------------------- -Mon Oct 14 18:21:41 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 -- commit 22f9877 - -------------------------------------------------------------------- -Mon Oct 14 17:34:08 CEST 2013 - jeffm@suse.com - -- btrfs: Fix creation of per-super sysfs directories when using multiple - subvolumes (bnc#845774). -- commit 0801062 - -------------------------------------------------------------------- -Mon Oct 14 10:57:07 CEST 2013 - oneukum@suse.de - -- sha256_ssse3: also test for BMI2 (bnc#842459). -- commit 626459d - -------------------------------------------------------------------- -Mon Oct 14 09:42:07 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.5. -- Delete - patches.suse/btrfs-0005-reset-ret-in-record_one_backref.patch. -- Delete - patches.suse/btrfs-0010-change-how-we-queue-blocks-for-backref-checkin.patch. -- Delete - patches.suse/btrfs-0022-skip-subvol-entries-when-checking-if-we-ve-cre.patch. -- Delete - patches.suse/btrfs-0033-remove-ourselves-from-the-cluster-list-under-l.patch. -- commit c00734a - -------------------------------------------------------------------- -Fri Oct 11 13:45:25 CEST 2013 - tiwai@suse.de - -- drm/i915: Undo the PIPEA quirk for i845 (bnc#845503). -- commit 61a06cb - -------------------------------------------------------------------- -Tue Oct 8 20:02:53 CEST 2013 - tiwai@suse.de - -- ALSA: hda - Add fixup for ASUS N56VZ (bnc#841645). -- commit a306dfb - -------------------------------------------------------------------- -Sat Oct 5 18:59:29 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.4. -- commit 40d7ca3 - -------------------------------------------------------------------- -Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Check module support only if the -extra package is requested -- commit add86bf - -------------------------------------------------------------------- -Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Remove unused options -- commit 3736315 - -------------------------------------------------------------------- -Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package - CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED -- commit 9e5b6fe - -------------------------------------------------------------------- -Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.3. -- Refresh patches.xen/xen3-patch-3.4. -- commit 485f0d1 - -------------------------------------------------------------------- -Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz - -- Always include the git commit in KOTD builds - This allows us not to set it explicitly in builds submitted to the - official distribution (bnc#821612, bnc#824171). -- commit a80e5ef - -------------------------------------------------------------------- -Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz - -- Btrfs: relocate csums properly with prealloc extents. -- commit cb5d5b5 - -------------------------------------------------------------------- -Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. - actually assign the divide result to hv_lapic_frequency -- commit 420e19b - -------------------------------------------------------------------- -Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 -- commit 221133c - -------------------------------------------------------------------- -Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are - versioned (bnc#821465). -- commit d802bf2 - -------------------------------------------------------------------- -Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) -- commit f5449e6 - -------------------------------------------------------------------- -Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes - for packages that were only seen in openSUSE releases up to 11.0. - (bnc#821465). -- commit 7e1f4b6 - -------------------------------------------------------------------- -Fri Sep 27 22:11:47 CEST 2013 - jeffm@suse.com - -- config: disable FB_UDL in favor of DRM_UDL (bnc#836782). -- commit 68c5865 - -------------------------------------------------------------------- -Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. -- commit 83e7e53 - -------------------------------------------------------------------- -Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de - -- X86: Hyper-V: Get the local APIC timer frequency from the - hypervisor. -- commit 4f400e1 - -------------------------------------------------------------------- -Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de - -- Input: add a driver to support Hyper-V synthetic keyboard - (fate#315887). -- Update config files. -- commit 7affb28 - -------------------------------------------------------------------- -Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors, rpm/mkspec: Add version information to obsolete - flavors (bnc#821465). -- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the - old-flavors file. -- commit 25c1b0d - -------------------------------------------------------------------- -Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors: Convert the old-packages.conf file to a flat - list. -- rpm/mkspec: Adjust. -- rpm/old-packages.conf: Delete. -- commit 4037e16 - -------------------------------------------------------------------- -Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz - -- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) -- commit 50c4c23 - -------------------------------------------------------------------- -Fri Sep 27 10:34:30 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.2. -- Refresh patches.xen/pci-guestdev. -- Refresh patches.xen/xen3-patch-2.6.27. -- Delete - patches.rpmify/powerpc-add-missing-include-to-book3s_xics-c. -- commit d1e8a21 - -------------------------------------------------------------------- -Fri Sep 27 10:29:30 CEST 2013 - jdelvare@suse.de - -- config/*/debug: Enable FSCACHE_DEBUG and CACHEFILES_DEBUG. -- commit 5068fbc - -------------------------------------------------------------------- -Thu Sep 26 17:32:40 CEST 2013 - rgoldwyn@suse.com - -- rpm/kernel-binary.spec.in: Remove Obsoletes ocfs2-kmp - This is done to enable install of ocfs2-kmp-* alongwith the - kernel until the patches are reviewed. -- commit 9d2b4ca - -------------------------------------------------------------------- -Thu Sep 26 16:10:40 CEST 2013 - jeffm@suse.com - -- config.conf: Re-enable s390x and ia64 configs -- commit adb564f - -------------------------------------------------------------------- -Thu Sep 26 16:10:27 CEST 2013 - jeffm@suse.com - -- patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation: - Updated Patch-mainline -- commit a1513a8 - -------------------------------------------------------------------- -Thu Sep 26 15:29:57 CEST 2013 - jdelvare@suse.de - -- Build gpio-ucb1400 as a module -- commit 68bb010 - -------------------------------------------------------------------- -Thu Sep 26 11:47:04 CEST 2013 - mmarek@suse.cz - -- Update README.BRANCH -- commit 4d432eb - -------------------------------------------------------------------- -Wed Sep 25 16:55:12 CEST 2013 - dsterba@suse.cz - -- Disable patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch -- commit e74b2a8 - -------------------------------------------------------------------- -Mon Sep 23 21:33:48 CEST 2013 - jeffm@suse.com - -- patches.suse/btrfs-add-per-super-attribute-publishing-to-sysfs: Fix issue where - the error case would still attempt to create sysfs dir. -- commit 129c02b +- Update to 3.12-rc1. +- Eliminated 42 patches. +- Xen is disabled. +- ARM is disabled. +- commit c58d853 ------------------------------------------------------------------- Fri Sep 20 21:16:16 CEST 2013 - jslaby@suse.cz - power_supply: Prevent suspend until power supply events are processed (bnc#841596). -- commit 11b28da +- commit 50dfbd0 ------------------------------------------------------------------- Wed Sep 18 14:41:04 CEST 2013 - duwe@suse.de - Increase NR_CPUS on ppc64 to 2048 (fate#315438) -- commit 8a38aef +- commit ddaa978 ------------------------------------------------------------------- Tue Sep 17 19:55:19 CEST 2013 - jslaby@suse.cz - Update config files. Fix ZSWAP on vanillas. -- commit da42424 - -------------------------------------------------------------------- -Tue Sep 17 18:05:34 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Fix for Xen detection with --vanilla - When we hit the limit code to handle $SKIP_XEN and there aren't - any Xen patches to apply anyway, we'll fail because LIMIT is unset. -- commit 1d7b879 - -------------------------------------------------------------------- -Tue Sep 17 17:44:49 CEST 2013 - jeffm@suse.com - -- scripts/tar-up.sh: Disable Xen patches when Xen configs are disabled - Similar to the change for scripts/sequence-patch.sh, this change - disables the Xen patches with +noxen in series.conf when creating - the kernel-source package. -- commit 3104a04 - -------------------------------------------------------------------- -Tue Sep 17 17:14:19 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Skip Xen patches when Xen configs are disabled. - When updating the base kernel version, the Xen patches must be updated - separately. This allows us to skip the Xen patches until they're resynced - just by disabling the configs. -- commit d9673e9 +- commit 5a7a093 ------------------------------------------------------------------- Tue Sep 17 16:31:27 CEST 2013 - jeffm@suse.com @@ -475,7 +164,7 @@ Tue Sep 3 17:25:07 CEST 2013 - jeffm@suse.com Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 280c88e +- commit 7032523 ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -605,7 +294,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 43e5ff5 +- commit 3fb567f ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -826,7 +515,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 51c5edf +- commit 62a3621 ------------------------------------------------------------------- Thu Jun 27 18:09:43 CEST 2013 - mszeredi@suse.cz @@ -854,7 +543,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit d8f6242 +- commit 0fcc327 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -1030,7 +719,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit af248e4 +- commit ba8f987 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1165,7 +854,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 882120e +- commit 97197ff ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1377,12 +1066,11 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de -- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 958fe54 +- commit 5457ebe ------------------------------------------------------------------- Fri Apr 5 14:13:15 CEST 2013 - jbeulich@suse.com @@ -1464,7 +1152,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit b9fe3d9 +- commit 801a982 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1656,7 +1344,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit 09220ef +- commit b1aa50e ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -5109,25 +4797,6 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com - Update to 3.1-rc7. - commit ee8cc90 -------------------------------------------------------------------- -Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz - -- rpm/split-modules: Print the full path for modules missing in supported.conf -- commit e55e4c6 - -------------------------------------------------------------------- -Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz - -- Add support for wildcards in supported.conf -- rpm/kernel-binary.spec.in: Generate Module.supported with all - lines from supported conf, unsupported modules are marked as "no" -- rpm/split-modules: Use the supported flag in modules, instead of - parsing the Module.supported file and report modules that have no - supported marking. -- rpm/check-supported-list: Delete, this is done by split-modules - now. -- commit edfdc2a - ------------------------------------------------------------------- Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de @@ -9263,26 +8932,6 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). -------------------------------------------------------------------- -Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: - Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). -- commit a48fbdf - -------------------------------------------------------------------- -Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz - -- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that - obsolete kernel-kdump. -- commit 0a4f75b - -------------------------------------------------------------------- -Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. -- commit 0e039b7 - ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -9667,13 +9316,6 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. -------------------------------------------------------------------- -Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. -- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. -- commit bf55479 - ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index 275b4dd0..b0961a2a 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.11 -%define patchversion 3.11.6 +%define srcversion 3.12-rc2 +%define patchversion 3.12.0-rc2 %define variant %{nil} %define vanilla_only 0 @@ -39,17 +39,17 @@ %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,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}) +%(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 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") -%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y") +%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") %ifarch %ix86 x86_64 %define install_vdso 1 @@ -59,12 +59,8 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 3.11.6 -%if 0%{?is_kotd} -Release: .g2607707 -%else -Release: 0 -%endif +Version: 3.12.rc2 +Release: .ga75f081 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -122,11 +118,19 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen +%ifarch %ix86 +%if %build_flavor != "ec2" +Provides: kernel-xenpae = %version +Obsoletes: kernel-xenpae < %version +%endif +%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl +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 @@ -145,11 +149,11 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel %ifarch ppc64 -Provides: kernel-kdump = 2.6.28 -Obsoletes: kernel-kdump <= 2.6.28 +Provides: kernel-kdump +Obsoletes: kernel-kdump %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -164,6 +168,7 @@ Source17: apply-patches Source21: config.conf Source23: supported.conf Source33: check-for-config-changes +Source34: check-supported-list Source35: group-source-files.pl Source37: README.SUSE Source38: README.KSYMS @@ -184,7 +189,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-flavors +Source62: old-packages.conf Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -209,7 +214,7 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ia64 ppc64 x86_64 +ExclusiveArch: %ix86 ppc64 x86_64 %define kmp_target_cpu %_target_cpu %ifarch %ix86 # Only i386/default supports i586, mark other flavors' packages as i686 @@ -243,51 +248,31 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. -# Usage: obsolete_kmp -# Note that KMPs embed the version of the kernel built against, that's why -# the _3 suffix for 2.6.x-based KMPs -%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ -Provides: %1-kmp = %2 \ -Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -%obsolete_kmp iwlwifi 1.3.27_3 -%obsolete_kmp ipw3945 1.2.2_3 -# sled10 / 11.0 -%obsolete_kmp uvcvideo r200_3 +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor +# sles10 / 11.0 +Obsoletes: uvcvideo-kmp-%build_flavor +# 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 # sle11-ga -%obsolete_kmp enic 0.0.1_3 -%obsolete_kmp fnic 1.0.0_3 -%obsolete_kmp brocade-bfa 1.1.0.2_3 -%obsolete_kmp kvm 78.2.6.30.1_3 -%obsolete_kmp perfmon 2_3 -%obsolete_kmp iwlagn-2-6-27 1.0_3 -%obsolete_kmp msi-wmi 1.0_3 +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 # sle11 -%obsolete_kmp ocfs2 1.6_4 +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -%obsolete_kmp quickcam 0.6.7 -# sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -319,27 +304,16 @@ fi mkdir -p %kernel_build_dir -# Generate a list of modules with their support status marking -%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \ -awk ' - /^\+(base|yes) / { - print $(NF); - next; - } - /^\+external / { - print $(NF) " external"; - next; - } - /^[-+]/ { - print $(NF) " no"; - next; - } - { - print $(NF); - } -' >%kernel_build_dir/Module.supported -%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \ - sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base +supported_conf() { + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ + sed 's,.*/,,; s,\.ko$,,' | sort -u +} + +# Generate the list of modules to be marked as supported +{ supported_conf base + supported_conf --default=0 external | sed 's/$/ external/' +} > %kernel_build_dir/Module.supported +supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion @@ -684,6 +658,14 @@ if [ %CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ + %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then +%if %supported_modules_check + exit 1 +%endif + echo "Consistency check error: please update supported.conf." + fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -736,12 +718,10 @@ if [ %CONFIG_MODULES = y ]; then %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ -b %kernel_build_dir/Module.base \ -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" - -e \ -%endif %if ! %supported_modules_check - -i + -i \ %endif + -s %kernel_build_dir/Module.supported %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -894,7 +874,6 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd - %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-default.changes b/kernel-default.changes index 0baba158..fdc5d025 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,362 +1,51 @@ ------------------------------------------------------------------- -Wed Nov 6 14:54:28 CET 2013 - mhocko@suse.cz +Tue Sep 24 18:47:46 CEST 2013 - trenn@suse.de -- Fix a few incorrectly checked [io_]remap_pfn_range() calls - (bnc#849021, CVE-2013-4511). -- commit 2607707 +- Delete patches.arch/010-acpi_initrd_override_tables.patch. + This old one alone broke acpi initrd override -> delete it. +- commit a75f081 ------------------------------------------------------------------- -Wed Oct 30 19:04:18 CET 2013 - dsterba@suse.cz +Tue Sep 24 18:10:03 CEST 2013 - jeffm@suse.com -- Disable patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch - reference: bnc#848059 -- commit e6d4a27 +- lustre/lloop: don't change the logical size for the queue. +- commit 4a2006a ------------------------------------------------------------------- -Wed Oct 30 17:49:05 CET 2013 - tiwai@suse.de +Tue Sep 24 16:30:50 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops - (bnc#846531). -- commit 5b1b1d3 +- Update to 3.12-rc2. +- Eliminated 3 patches. +- commit d7d9943 ------------------------------------------------------------------- -Wed Oct 30 12:36:05 CET 2013 - tiwai@suse.de +Tue Sep 24 15:55:10 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add a fixup for ASUS N76VZ (bnc#846529). -- commit 8bd2042 - -------------------------------------------------------------------- -Mon Oct 28 10:31:59 CET 2013 - jbeulich@suse.com - -- Update EC2 config files. -- commit 81dd01f - -------------------------------------------------------------------- -Mon Oct 28 09:25:43 CET 2013 - jbeulich@suse.com - -- Refresh Xen patches (bnc#829682, bnc#842063). -- pcifront: Deal with toolstack missing 'XenbusStateClosing' - state. -- Update Xen patches to 3.11.6. -- commit 2339477 - -------------------------------------------------------------------- -Thu Oct 24 18:23:02 CEST 2013 - trenn@suse.de - -- cpufreq: ondemand: Change the calculation of target frequency - (bnc#846734). -- commit 0ba01b7 - -------------------------------------------------------------------- -Thu Oct 24 17:08:03 CEST 2013 - dsterba@suse.cz - -- Btrfs: fix negative qgroup tracking from owner accounting (bnc#821948) -- commit ef319f1 - -------------------------------------------------------------------- -Tue Oct 22 21:17:47 CEST 2013 - jeffm@suse.com - -- nouveau: Fix race with fence signaling (bnc#844177). -- commit 8d7989b - -------------------------------------------------------------------- -Fri Oct 18 22:19:21 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.6 (bnc#841645). -- Delete patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ. -- commit 9ca6827 - -------------------------------------------------------------------- -Mon Oct 14 18:45:32 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 (vanilla) -- commit 53efb9c - -------------------------------------------------------------------- -Mon Oct 14 18:21:41 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 -- commit 22f9877 - -------------------------------------------------------------------- -Mon Oct 14 17:34:08 CEST 2013 - jeffm@suse.com - -- btrfs: Fix creation of per-super sysfs directories when using multiple - subvolumes (bnc#845774). -- commit 0801062 - -------------------------------------------------------------------- -Mon Oct 14 10:57:07 CEST 2013 - oneukum@suse.de - -- sha256_ssse3: also test for BMI2 (bnc#842459). -- commit 626459d - -------------------------------------------------------------------- -Mon Oct 14 09:42:07 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.5. -- Delete - patches.suse/btrfs-0005-reset-ret-in-record_one_backref.patch. -- Delete - patches.suse/btrfs-0010-change-how-we-queue-blocks-for-backref-checkin.patch. -- Delete - patches.suse/btrfs-0022-skip-subvol-entries-when-checking-if-we-ve-cre.patch. -- Delete - patches.suse/btrfs-0033-remove-ourselves-from-the-cluster-list-under-l.patch. -- commit c00734a - -------------------------------------------------------------------- -Fri Oct 11 13:45:25 CEST 2013 - tiwai@suse.de - -- drm/i915: Undo the PIPEA quirk for i845 (bnc#845503). -- commit 61a06cb - -------------------------------------------------------------------- -Tue Oct 8 20:02:53 CEST 2013 - tiwai@suse.de - -- ALSA: hda - Add fixup for ASUS N56VZ (bnc#841645). -- commit a306dfb - -------------------------------------------------------------------- -Sat Oct 5 18:59:29 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.4. -- commit 40d7ca3 - -------------------------------------------------------------------- -Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Check module support only if the -extra package is requested -- commit add86bf - -------------------------------------------------------------------- -Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Remove unused options -- commit 3736315 - -------------------------------------------------------------------- -Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package - CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED -- commit 9e5b6fe - -------------------------------------------------------------------- -Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.3. -- Refresh patches.xen/xen3-patch-3.4. -- commit 485f0d1 - -------------------------------------------------------------------- -Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz - -- Always include the git commit in KOTD builds - This allows us not to set it explicitly in builds submitted to the - official distribution (bnc#821612, bnc#824171). -- commit a80e5ef - -------------------------------------------------------------------- -Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz - -- Btrfs: relocate csums properly with prealloc extents. -- commit cb5d5b5 - -------------------------------------------------------------------- -Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. - actually assign the divide result to hv_lapic_frequency -- commit 420e19b - -------------------------------------------------------------------- -Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 -- commit 221133c - -------------------------------------------------------------------- -Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are - versioned (bnc#821465). -- commit d802bf2 - -------------------------------------------------------------------- -Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) -- commit f5449e6 - -------------------------------------------------------------------- -Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes - for packages that were only seen in openSUSE releases up to 11.0. - (bnc#821465). -- commit 7e1f4b6 - -------------------------------------------------------------------- -Fri Sep 27 22:11:47 CEST 2013 - jeffm@suse.com - -- config: disable FB_UDL in favor of DRM_UDL (bnc#836782). -- commit 68c5865 - -------------------------------------------------------------------- -Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. -- commit 83e7e53 - -------------------------------------------------------------------- -Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de - -- X86: Hyper-V: Get the local APIC timer frequency from the - hypervisor. -- commit 4f400e1 - -------------------------------------------------------------------- -Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de - -- Input: add a driver to support Hyper-V synthetic keyboard - (fate#315887). -- Update config files. -- commit 7affb28 - -------------------------------------------------------------------- -Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors, rpm/mkspec: Add version information to obsolete - flavors (bnc#821465). -- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the - old-flavors file. -- commit 25c1b0d - -------------------------------------------------------------------- -Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors: Convert the old-packages.conf file to a flat - list. -- rpm/mkspec: Adjust. -- rpm/old-packages.conf: Delete. -- commit 4037e16 - -------------------------------------------------------------------- -Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz - -- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) -- commit 50c4c23 - -------------------------------------------------------------------- -Fri Sep 27 10:34:30 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.2. -- Refresh patches.xen/pci-guestdev. -- Refresh patches.xen/xen3-patch-2.6.27. -- Delete - patches.rpmify/powerpc-add-missing-include-to-book3s_xics-c. -- commit d1e8a21 - -------------------------------------------------------------------- -Fri Sep 27 10:29:30 CEST 2013 - jdelvare@suse.de - -- config/*/debug: Enable FSCACHE_DEBUG and CACHEFILES_DEBUG. -- commit 5068fbc - -------------------------------------------------------------------- -Thu Sep 26 17:32:40 CEST 2013 - rgoldwyn@suse.com - -- rpm/kernel-binary.spec.in: Remove Obsoletes ocfs2-kmp - This is done to enable install of ocfs2-kmp-* alongwith the - kernel until the patches are reviewed. -- commit 9d2b4ca - -------------------------------------------------------------------- -Thu Sep 26 16:10:40 CEST 2013 - jeffm@suse.com - -- config.conf: Re-enable s390x and ia64 configs -- commit adb564f - -------------------------------------------------------------------- -Thu Sep 26 16:10:27 CEST 2013 - jeffm@suse.com - -- patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation: - Updated Patch-mainline -- commit a1513a8 - -------------------------------------------------------------------- -Thu Sep 26 15:29:57 CEST 2013 - jdelvare@suse.de - -- Build gpio-ucb1400 as a module -- commit 68bb010 - -------------------------------------------------------------------- -Thu Sep 26 11:47:04 CEST 2013 - mmarek@suse.cz - -- Update README.BRANCH -- commit 4d432eb - -------------------------------------------------------------------- -Wed Sep 25 16:55:12 CEST 2013 - dsterba@suse.cz - -- Disable patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch -- commit e74b2a8 - -------------------------------------------------------------------- -Mon Sep 23 21:33:48 CEST 2013 - jeffm@suse.com - -- patches.suse/btrfs-add-per-super-attribute-publishing-to-sysfs: Fix issue where - the error case would still attempt to create sysfs dir. -- commit 129c02b +- Update to 3.12-rc1. +- Eliminated 42 patches. +- Xen is disabled. +- ARM is disabled. +- commit c58d853 ------------------------------------------------------------------- Fri Sep 20 21:16:16 CEST 2013 - jslaby@suse.cz - power_supply: Prevent suspend until power supply events are processed (bnc#841596). -- commit 11b28da +- commit 50dfbd0 ------------------------------------------------------------------- Wed Sep 18 14:41:04 CEST 2013 - duwe@suse.de - Increase NR_CPUS on ppc64 to 2048 (fate#315438) -- commit 8a38aef +- commit ddaa978 ------------------------------------------------------------------- Tue Sep 17 19:55:19 CEST 2013 - jslaby@suse.cz - Update config files. Fix ZSWAP on vanillas. -- commit da42424 - -------------------------------------------------------------------- -Tue Sep 17 18:05:34 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Fix for Xen detection with --vanilla - When we hit the limit code to handle $SKIP_XEN and there aren't - any Xen patches to apply anyway, we'll fail because LIMIT is unset. -- commit 1d7b879 - -------------------------------------------------------------------- -Tue Sep 17 17:44:49 CEST 2013 - jeffm@suse.com - -- scripts/tar-up.sh: Disable Xen patches when Xen configs are disabled - Similar to the change for scripts/sequence-patch.sh, this change - disables the Xen patches with +noxen in series.conf when creating - the kernel-source package. -- commit 3104a04 - -------------------------------------------------------------------- -Tue Sep 17 17:14:19 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Skip Xen patches when Xen configs are disabled. - When updating the base kernel version, the Xen patches must be updated - separately. This allows us to skip the Xen patches until they're resynced - just by disabling the configs. -- commit d9673e9 +- commit 5a7a093 ------------------------------------------------------------------- Tue Sep 17 16:31:27 CEST 2013 - jeffm@suse.com @@ -475,7 +164,7 @@ Tue Sep 3 17:25:07 CEST 2013 - jeffm@suse.com Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 280c88e +- commit 7032523 ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -605,7 +294,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 43e5ff5 +- commit 3fb567f ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -826,7 +515,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 51c5edf +- commit 62a3621 ------------------------------------------------------------------- Thu Jun 27 18:09:43 CEST 2013 - mszeredi@suse.cz @@ -854,7 +543,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit d8f6242 +- commit 0fcc327 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -1030,7 +719,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit af248e4 +- commit ba8f987 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1165,7 +854,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 882120e +- commit 97197ff ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1377,12 +1066,11 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de -- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 958fe54 +- commit 5457ebe ------------------------------------------------------------------- Fri Apr 5 14:13:15 CEST 2013 - jbeulich@suse.com @@ -1464,7 +1152,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit b9fe3d9 +- commit 801a982 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1656,7 +1344,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit 09220ef +- commit b1aa50e ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -5109,25 +4797,6 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com - Update to 3.1-rc7. - commit ee8cc90 -------------------------------------------------------------------- -Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz - -- rpm/split-modules: Print the full path for modules missing in supported.conf -- commit e55e4c6 - -------------------------------------------------------------------- -Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz - -- Add support for wildcards in supported.conf -- rpm/kernel-binary.spec.in: Generate Module.supported with all - lines from supported conf, unsupported modules are marked as "no" -- rpm/split-modules: Use the supported flag in modules, instead of - parsing the Module.supported file and report modules that have no - supported marking. -- rpm/check-supported-list: Delete, this is done by split-modules - now. -- commit edfdc2a - ------------------------------------------------------------------- Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de @@ -9263,26 +8932,6 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). -------------------------------------------------------------------- -Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: - Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). -- commit a48fbdf - -------------------------------------------------------------------- -Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz - -- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that - obsolete kernel-kdump. -- commit 0a4f75b - -------------------------------------------------------------------- -Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. -- commit 0e039b7 - ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -9667,13 +9316,6 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. -------------------------------------------------------------------- -Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. -- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. -- commit bf55479 - ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index b210ebeb..c47c1e35 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.11 -%define patchversion 3.11.6 +%define srcversion 3.12-rc2 +%define patchversion 3.12.0-rc2 %define variant %{nil} %define vanilla_only 0 @@ -39,17 +39,17 @@ %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,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}) +%(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 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") -%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y") +%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") %ifarch %ix86 x86_64 %define install_vdso 1 @@ -59,12 +59,8 @@ Name: kernel-default Summary: The Standard Kernel -Version: 3.11.6 -%if 0%{?is_kotd} -Release: .g2607707 -%else -Release: 0 -%endif +Version: 3.12.rc2 +Release: .ga75f081 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -122,11 +118,19 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen +%ifarch %ix86 +%if %build_flavor != "ec2" +Provides: kernel-xenpae = %version +Obsoletes: kernel-xenpae < %version +%endif +%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl +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 @@ -145,23 +149,19 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel %ifarch %ix86 -Provides: kernel-smp = 2.6.17 -Obsoletes: kernel-smp <= 2.6.17 -%endif -%ifarch ia64 -Provides: kernel-sn2 = 2.6.6 -Obsoletes: kernel-sn2 <= 2.6.6 +Provides: smp kernel-smp +Obsoletes: smp kernel-smp %endif %ifarch ppc64 -Provides: kernel-kdump = 2.6.28 -Obsoletes: kernel-kdump <= 2.6.28 +Provides: kernel-kdump +Obsoletes: kernel-kdump %endif %ifarch x86_64 -Provides: kernel-smp = 2.6.17 -Obsoletes: kernel-smp <= 2.6.17 +Provides: smp kernel-smp +Obsoletes: smp kernel-smp %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -176,6 +176,7 @@ Source17: apply-patches Source21: config.conf Source23: supported.conf Source33: check-for-config-changes +Source34: check-supported-list Source35: group-source-files.pl Source37: README.SUSE Source38: README.KSYMS @@ -196,7 +197,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-flavors +Source62: old-packages.conf Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -221,7 +222,7 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ia64 ppc ppc64 s390x x86_64 +ExclusiveArch: %ix86 ppc ppc64 x86_64 %define kmp_target_cpu %_target_cpu %ifarch %ix86 # Only i386/default supports i586, mark other flavors' packages as i686 @@ -255,51 +256,31 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. -# Usage: obsolete_kmp -# Note that KMPs embed the version of the kernel built against, that's why -# the _3 suffix for 2.6.x-based KMPs -%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ -Provides: %1-kmp = %2 \ -Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -%obsolete_kmp iwlwifi 1.3.27_3 -%obsolete_kmp ipw3945 1.2.2_3 -# sled10 / 11.0 -%obsolete_kmp uvcvideo r200_3 +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor +# sles10 / 11.0 +Obsoletes: uvcvideo-kmp-%build_flavor +# 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 # sle11-ga -%obsolete_kmp enic 0.0.1_3 -%obsolete_kmp fnic 1.0.0_3 -%obsolete_kmp brocade-bfa 1.1.0.2_3 -%obsolete_kmp kvm 78.2.6.30.1_3 -%obsolete_kmp perfmon 2_3 -%obsolete_kmp iwlagn-2-6-27 1.0_3 -%obsolete_kmp msi-wmi 1.0_3 +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 # sle11 -%obsolete_kmp ocfs2 1.6_4 +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -%obsolete_kmp quickcam 0.6.7 -# sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -330,27 +311,16 @@ fi mkdir -p %kernel_build_dir -# Generate a list of modules with their support status marking -%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \ -awk ' - /^\+(base|yes) / { - print $(NF); - next; - } - /^\+external / { - print $(NF) " external"; - next; - } - /^[-+]/ { - print $(NF) " no"; - next; - } - { - print $(NF); - } -' >%kernel_build_dir/Module.supported -%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \ - sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base +supported_conf() { + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ + sed 's,.*/,,; s,\.ko$,,' | sort -u +} + +# Generate the list of modules to be marked as supported +{ supported_conf base + supported_conf --default=0 external | sed 's/$/ external/' +} > %kernel_build_dir/Module.supported +supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion @@ -695,6 +665,14 @@ if [ %CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ + %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then +%if %supported_modules_check + exit 1 +%endif + echo "Consistency check error: please update supported.conf." + fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -747,12 +725,10 @@ if [ %CONFIG_MODULES = y ]; then %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ -b %kernel_build_dir/Module.base \ -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" - -e \ -%endif %if ! %supported_modules_check - -i + -i \ %endif + -s %kernel_build_dir/Module.supported %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -905,7 +881,6 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd - %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-desktop.changes b/kernel-desktop.changes index 0baba158..fdc5d025 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,362 +1,51 @@ ------------------------------------------------------------------- -Wed Nov 6 14:54:28 CET 2013 - mhocko@suse.cz +Tue Sep 24 18:47:46 CEST 2013 - trenn@suse.de -- Fix a few incorrectly checked [io_]remap_pfn_range() calls - (bnc#849021, CVE-2013-4511). -- commit 2607707 +- Delete patches.arch/010-acpi_initrd_override_tables.patch. + This old one alone broke acpi initrd override -> delete it. +- commit a75f081 ------------------------------------------------------------------- -Wed Oct 30 19:04:18 CET 2013 - dsterba@suse.cz +Tue Sep 24 18:10:03 CEST 2013 - jeffm@suse.com -- Disable patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch - reference: bnc#848059 -- commit e6d4a27 +- lustre/lloop: don't change the logical size for the queue. +- commit 4a2006a ------------------------------------------------------------------- -Wed Oct 30 17:49:05 CET 2013 - tiwai@suse.de +Tue Sep 24 16:30:50 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops - (bnc#846531). -- commit 5b1b1d3 +- Update to 3.12-rc2. +- Eliminated 3 patches. +- commit d7d9943 ------------------------------------------------------------------- -Wed Oct 30 12:36:05 CET 2013 - tiwai@suse.de +Tue Sep 24 15:55:10 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add a fixup for ASUS N76VZ (bnc#846529). -- commit 8bd2042 - -------------------------------------------------------------------- -Mon Oct 28 10:31:59 CET 2013 - jbeulich@suse.com - -- Update EC2 config files. -- commit 81dd01f - -------------------------------------------------------------------- -Mon Oct 28 09:25:43 CET 2013 - jbeulich@suse.com - -- Refresh Xen patches (bnc#829682, bnc#842063). -- pcifront: Deal with toolstack missing 'XenbusStateClosing' - state. -- Update Xen patches to 3.11.6. -- commit 2339477 - -------------------------------------------------------------------- -Thu Oct 24 18:23:02 CEST 2013 - trenn@suse.de - -- cpufreq: ondemand: Change the calculation of target frequency - (bnc#846734). -- commit 0ba01b7 - -------------------------------------------------------------------- -Thu Oct 24 17:08:03 CEST 2013 - dsterba@suse.cz - -- Btrfs: fix negative qgroup tracking from owner accounting (bnc#821948) -- commit ef319f1 - -------------------------------------------------------------------- -Tue Oct 22 21:17:47 CEST 2013 - jeffm@suse.com - -- nouveau: Fix race with fence signaling (bnc#844177). -- commit 8d7989b - -------------------------------------------------------------------- -Fri Oct 18 22:19:21 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.6 (bnc#841645). -- Delete patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ. -- commit 9ca6827 - -------------------------------------------------------------------- -Mon Oct 14 18:45:32 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 (vanilla) -- commit 53efb9c - -------------------------------------------------------------------- -Mon Oct 14 18:21:41 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 -- commit 22f9877 - -------------------------------------------------------------------- -Mon Oct 14 17:34:08 CEST 2013 - jeffm@suse.com - -- btrfs: Fix creation of per-super sysfs directories when using multiple - subvolumes (bnc#845774). -- commit 0801062 - -------------------------------------------------------------------- -Mon Oct 14 10:57:07 CEST 2013 - oneukum@suse.de - -- sha256_ssse3: also test for BMI2 (bnc#842459). -- commit 626459d - -------------------------------------------------------------------- -Mon Oct 14 09:42:07 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.5. -- Delete - patches.suse/btrfs-0005-reset-ret-in-record_one_backref.patch. -- Delete - patches.suse/btrfs-0010-change-how-we-queue-blocks-for-backref-checkin.patch. -- Delete - patches.suse/btrfs-0022-skip-subvol-entries-when-checking-if-we-ve-cre.patch. -- Delete - patches.suse/btrfs-0033-remove-ourselves-from-the-cluster-list-under-l.patch. -- commit c00734a - -------------------------------------------------------------------- -Fri Oct 11 13:45:25 CEST 2013 - tiwai@suse.de - -- drm/i915: Undo the PIPEA quirk for i845 (bnc#845503). -- commit 61a06cb - -------------------------------------------------------------------- -Tue Oct 8 20:02:53 CEST 2013 - tiwai@suse.de - -- ALSA: hda - Add fixup for ASUS N56VZ (bnc#841645). -- commit a306dfb - -------------------------------------------------------------------- -Sat Oct 5 18:59:29 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.4. -- commit 40d7ca3 - -------------------------------------------------------------------- -Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Check module support only if the -extra package is requested -- commit add86bf - -------------------------------------------------------------------- -Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Remove unused options -- commit 3736315 - -------------------------------------------------------------------- -Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package - CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED -- commit 9e5b6fe - -------------------------------------------------------------------- -Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.3. -- Refresh patches.xen/xen3-patch-3.4. -- commit 485f0d1 - -------------------------------------------------------------------- -Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz - -- Always include the git commit in KOTD builds - This allows us not to set it explicitly in builds submitted to the - official distribution (bnc#821612, bnc#824171). -- commit a80e5ef - -------------------------------------------------------------------- -Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz - -- Btrfs: relocate csums properly with prealloc extents. -- commit cb5d5b5 - -------------------------------------------------------------------- -Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. - actually assign the divide result to hv_lapic_frequency -- commit 420e19b - -------------------------------------------------------------------- -Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 -- commit 221133c - -------------------------------------------------------------------- -Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are - versioned (bnc#821465). -- commit d802bf2 - -------------------------------------------------------------------- -Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) -- commit f5449e6 - -------------------------------------------------------------------- -Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes - for packages that were only seen in openSUSE releases up to 11.0. - (bnc#821465). -- commit 7e1f4b6 - -------------------------------------------------------------------- -Fri Sep 27 22:11:47 CEST 2013 - jeffm@suse.com - -- config: disable FB_UDL in favor of DRM_UDL (bnc#836782). -- commit 68c5865 - -------------------------------------------------------------------- -Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. -- commit 83e7e53 - -------------------------------------------------------------------- -Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de - -- X86: Hyper-V: Get the local APIC timer frequency from the - hypervisor. -- commit 4f400e1 - -------------------------------------------------------------------- -Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de - -- Input: add a driver to support Hyper-V synthetic keyboard - (fate#315887). -- Update config files. -- commit 7affb28 - -------------------------------------------------------------------- -Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors, rpm/mkspec: Add version information to obsolete - flavors (bnc#821465). -- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the - old-flavors file. -- commit 25c1b0d - -------------------------------------------------------------------- -Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors: Convert the old-packages.conf file to a flat - list. -- rpm/mkspec: Adjust. -- rpm/old-packages.conf: Delete. -- commit 4037e16 - -------------------------------------------------------------------- -Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz - -- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) -- commit 50c4c23 - -------------------------------------------------------------------- -Fri Sep 27 10:34:30 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.2. -- Refresh patches.xen/pci-guestdev. -- Refresh patches.xen/xen3-patch-2.6.27. -- Delete - patches.rpmify/powerpc-add-missing-include-to-book3s_xics-c. -- commit d1e8a21 - -------------------------------------------------------------------- -Fri Sep 27 10:29:30 CEST 2013 - jdelvare@suse.de - -- config/*/debug: Enable FSCACHE_DEBUG and CACHEFILES_DEBUG. -- commit 5068fbc - -------------------------------------------------------------------- -Thu Sep 26 17:32:40 CEST 2013 - rgoldwyn@suse.com - -- rpm/kernel-binary.spec.in: Remove Obsoletes ocfs2-kmp - This is done to enable install of ocfs2-kmp-* alongwith the - kernel until the patches are reviewed. -- commit 9d2b4ca - -------------------------------------------------------------------- -Thu Sep 26 16:10:40 CEST 2013 - jeffm@suse.com - -- config.conf: Re-enable s390x and ia64 configs -- commit adb564f - -------------------------------------------------------------------- -Thu Sep 26 16:10:27 CEST 2013 - jeffm@suse.com - -- patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation: - Updated Patch-mainline -- commit a1513a8 - -------------------------------------------------------------------- -Thu Sep 26 15:29:57 CEST 2013 - jdelvare@suse.de - -- Build gpio-ucb1400 as a module -- commit 68bb010 - -------------------------------------------------------------------- -Thu Sep 26 11:47:04 CEST 2013 - mmarek@suse.cz - -- Update README.BRANCH -- commit 4d432eb - -------------------------------------------------------------------- -Wed Sep 25 16:55:12 CEST 2013 - dsterba@suse.cz - -- Disable patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch -- commit e74b2a8 - -------------------------------------------------------------------- -Mon Sep 23 21:33:48 CEST 2013 - jeffm@suse.com - -- patches.suse/btrfs-add-per-super-attribute-publishing-to-sysfs: Fix issue where - the error case would still attempt to create sysfs dir. -- commit 129c02b +- Update to 3.12-rc1. +- Eliminated 42 patches. +- Xen is disabled. +- ARM is disabled. +- commit c58d853 ------------------------------------------------------------------- Fri Sep 20 21:16:16 CEST 2013 - jslaby@suse.cz - power_supply: Prevent suspend until power supply events are processed (bnc#841596). -- commit 11b28da +- commit 50dfbd0 ------------------------------------------------------------------- Wed Sep 18 14:41:04 CEST 2013 - duwe@suse.de - Increase NR_CPUS on ppc64 to 2048 (fate#315438) -- commit 8a38aef +- commit ddaa978 ------------------------------------------------------------------- Tue Sep 17 19:55:19 CEST 2013 - jslaby@suse.cz - Update config files. Fix ZSWAP on vanillas. -- commit da42424 - -------------------------------------------------------------------- -Tue Sep 17 18:05:34 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Fix for Xen detection with --vanilla - When we hit the limit code to handle $SKIP_XEN and there aren't - any Xen patches to apply anyway, we'll fail because LIMIT is unset. -- commit 1d7b879 - -------------------------------------------------------------------- -Tue Sep 17 17:44:49 CEST 2013 - jeffm@suse.com - -- scripts/tar-up.sh: Disable Xen patches when Xen configs are disabled - Similar to the change for scripts/sequence-patch.sh, this change - disables the Xen patches with +noxen in series.conf when creating - the kernel-source package. -- commit 3104a04 - -------------------------------------------------------------------- -Tue Sep 17 17:14:19 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Skip Xen patches when Xen configs are disabled. - When updating the base kernel version, the Xen patches must be updated - separately. This allows us to skip the Xen patches until they're resynced - just by disabling the configs. -- commit d9673e9 +- commit 5a7a093 ------------------------------------------------------------------- Tue Sep 17 16:31:27 CEST 2013 - jeffm@suse.com @@ -475,7 +164,7 @@ Tue Sep 3 17:25:07 CEST 2013 - jeffm@suse.com Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 280c88e +- commit 7032523 ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -605,7 +294,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 43e5ff5 +- commit 3fb567f ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -826,7 +515,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 51c5edf +- commit 62a3621 ------------------------------------------------------------------- Thu Jun 27 18:09:43 CEST 2013 - mszeredi@suse.cz @@ -854,7 +543,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit d8f6242 +- commit 0fcc327 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -1030,7 +719,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit af248e4 +- commit ba8f987 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1165,7 +854,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 882120e +- commit 97197ff ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1377,12 +1066,11 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de -- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 958fe54 +- commit 5457ebe ------------------------------------------------------------------- Fri Apr 5 14:13:15 CEST 2013 - jbeulich@suse.com @@ -1464,7 +1152,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit b9fe3d9 +- commit 801a982 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1656,7 +1344,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit 09220ef +- commit b1aa50e ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -5109,25 +4797,6 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com - Update to 3.1-rc7. - commit ee8cc90 -------------------------------------------------------------------- -Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz - -- rpm/split-modules: Print the full path for modules missing in supported.conf -- commit e55e4c6 - -------------------------------------------------------------------- -Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz - -- Add support for wildcards in supported.conf -- rpm/kernel-binary.spec.in: Generate Module.supported with all - lines from supported conf, unsupported modules are marked as "no" -- rpm/split-modules: Use the supported flag in modules, instead of - parsing the Module.supported file and report modules that have no - supported marking. -- rpm/check-supported-list: Delete, this is done by split-modules - now. -- commit edfdc2a - ------------------------------------------------------------------- Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de @@ -9263,26 +8932,6 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). -------------------------------------------------------------------- -Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: - Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). -- commit a48fbdf - -------------------------------------------------------------------- -Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz - -- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that - obsolete kernel-kdump. -- commit 0a4f75b - -------------------------------------------------------------------- -Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. -- commit 0e039b7 - ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -9667,13 +9316,6 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. -------------------------------------------------------------------- -Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. -- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. -- commit bf55479 - ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 458c5621..bac2e3af 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.11 -%define patchversion 3.11.6 +%define srcversion 3.12-rc2 +%define patchversion 3.12.0-rc2 %define variant %{nil} %define vanilla_only 0 @@ -39,17 +39,17 @@ %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,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}) +%(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 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") -%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y") +%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") %ifarch %ix86 x86_64 %define install_vdso 1 @@ -59,12 +59,8 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop -Version: 3.11.6 -%if 0%{?is_kotd} -Release: .g2607707 -%else -Release: 0 -%endif +Version: 3.12.rc2 +Release: .ga75f081 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -122,11 +118,19 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen +%ifarch %ix86 +%if %build_flavor != "ec2" +Provides: kernel-xenpae = %version +Obsoletes: kernel-xenpae < %version +%endif +%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl +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 @@ -146,7 +150,7 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -161,6 +165,7 @@ Source17: apply-patches Source21: config.conf Source23: supported.conf Source33: check-for-config-changes +Source34: check-supported-list Source35: group-source-files.pl Source37: README.SUSE Source38: README.KSYMS @@ -181,7 +186,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-flavors +Source62: old-packages.conf Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -240,51 +245,31 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. -# Usage: obsolete_kmp -# Note that KMPs embed the version of the kernel built against, that's why -# the _3 suffix for 2.6.x-based KMPs -%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ -Provides: %1-kmp = %2 \ -Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -%obsolete_kmp iwlwifi 1.3.27_3 -%obsolete_kmp ipw3945 1.2.2_3 -# sled10 / 11.0 -%obsolete_kmp uvcvideo r200_3 +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor +# sles10 / 11.0 +Obsoletes: uvcvideo-kmp-%build_flavor +# 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 # sle11-ga -%obsolete_kmp enic 0.0.1_3 -%obsolete_kmp fnic 1.0.0_3 -%obsolete_kmp brocade-bfa 1.1.0.2_3 -%obsolete_kmp kvm 78.2.6.30.1_3 -%obsolete_kmp perfmon 2_3 -%obsolete_kmp iwlagn-2-6-27 1.0_3 -%obsolete_kmp msi-wmi 1.0_3 +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 # sle11 -%obsolete_kmp ocfs2 1.6_4 +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -%obsolete_kmp quickcam 0.6.7 -# sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -328,27 +313,16 @@ fi mkdir -p %kernel_build_dir -# Generate a list of modules with their support status marking -%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \ -awk ' - /^\+(base|yes) / { - print $(NF); - next; - } - /^\+external / { - print $(NF) " external"; - next; - } - /^[-+]/ { - print $(NF) " no"; - next; - } - { - print $(NF); - } -' >%kernel_build_dir/Module.supported -%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \ - sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base +supported_conf() { + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ + sed 's,.*/,,; s,\.ko$,,' | sort -u +} + +# Generate the list of modules to be marked as supported +{ supported_conf base + supported_conf --default=0 external | sed 's/$/ external/' +} > %kernel_build_dir/Module.supported +supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion @@ -693,6 +667,14 @@ if [ %CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ + %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then +%if %supported_modules_check + exit 1 +%endif + echo "Consistency check error: please update supported.conf." + fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -745,12 +727,10 @@ if [ %CONFIG_MODULES = y ]; then %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ -b %kernel_build_dir/Module.base \ -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" - -e \ -%endif %if ! %supported_modules_check - -i + -i \ %endif + -s %kernel_build_dir/Module.supported %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -903,7 +883,6 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd - %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-docs.changes b/kernel-docs.changes index 0baba158..fdc5d025 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,362 +1,51 @@ ------------------------------------------------------------------- -Wed Nov 6 14:54:28 CET 2013 - mhocko@suse.cz +Tue Sep 24 18:47:46 CEST 2013 - trenn@suse.de -- Fix a few incorrectly checked [io_]remap_pfn_range() calls - (bnc#849021, CVE-2013-4511). -- commit 2607707 +- Delete patches.arch/010-acpi_initrd_override_tables.patch. + This old one alone broke acpi initrd override -> delete it. +- commit a75f081 ------------------------------------------------------------------- -Wed Oct 30 19:04:18 CET 2013 - dsterba@suse.cz +Tue Sep 24 18:10:03 CEST 2013 - jeffm@suse.com -- Disable patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch - reference: bnc#848059 -- commit e6d4a27 +- lustre/lloop: don't change the logical size for the queue. +- commit 4a2006a ------------------------------------------------------------------- -Wed Oct 30 17:49:05 CET 2013 - tiwai@suse.de +Tue Sep 24 16:30:50 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops - (bnc#846531). -- commit 5b1b1d3 +- Update to 3.12-rc2. +- Eliminated 3 patches. +- commit d7d9943 ------------------------------------------------------------------- -Wed Oct 30 12:36:05 CET 2013 - tiwai@suse.de +Tue Sep 24 15:55:10 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add a fixup for ASUS N76VZ (bnc#846529). -- commit 8bd2042 - -------------------------------------------------------------------- -Mon Oct 28 10:31:59 CET 2013 - jbeulich@suse.com - -- Update EC2 config files. -- commit 81dd01f - -------------------------------------------------------------------- -Mon Oct 28 09:25:43 CET 2013 - jbeulich@suse.com - -- Refresh Xen patches (bnc#829682, bnc#842063). -- pcifront: Deal with toolstack missing 'XenbusStateClosing' - state. -- Update Xen patches to 3.11.6. -- commit 2339477 - -------------------------------------------------------------------- -Thu Oct 24 18:23:02 CEST 2013 - trenn@suse.de - -- cpufreq: ondemand: Change the calculation of target frequency - (bnc#846734). -- commit 0ba01b7 - -------------------------------------------------------------------- -Thu Oct 24 17:08:03 CEST 2013 - dsterba@suse.cz - -- Btrfs: fix negative qgroup tracking from owner accounting (bnc#821948) -- commit ef319f1 - -------------------------------------------------------------------- -Tue Oct 22 21:17:47 CEST 2013 - jeffm@suse.com - -- nouveau: Fix race with fence signaling (bnc#844177). -- commit 8d7989b - -------------------------------------------------------------------- -Fri Oct 18 22:19:21 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.6 (bnc#841645). -- Delete patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ. -- commit 9ca6827 - -------------------------------------------------------------------- -Mon Oct 14 18:45:32 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 (vanilla) -- commit 53efb9c - -------------------------------------------------------------------- -Mon Oct 14 18:21:41 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 -- commit 22f9877 - -------------------------------------------------------------------- -Mon Oct 14 17:34:08 CEST 2013 - jeffm@suse.com - -- btrfs: Fix creation of per-super sysfs directories when using multiple - subvolumes (bnc#845774). -- commit 0801062 - -------------------------------------------------------------------- -Mon Oct 14 10:57:07 CEST 2013 - oneukum@suse.de - -- sha256_ssse3: also test for BMI2 (bnc#842459). -- commit 626459d - -------------------------------------------------------------------- -Mon Oct 14 09:42:07 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.5. -- Delete - patches.suse/btrfs-0005-reset-ret-in-record_one_backref.patch. -- Delete - patches.suse/btrfs-0010-change-how-we-queue-blocks-for-backref-checkin.patch. -- Delete - patches.suse/btrfs-0022-skip-subvol-entries-when-checking-if-we-ve-cre.patch. -- Delete - patches.suse/btrfs-0033-remove-ourselves-from-the-cluster-list-under-l.patch. -- commit c00734a - -------------------------------------------------------------------- -Fri Oct 11 13:45:25 CEST 2013 - tiwai@suse.de - -- drm/i915: Undo the PIPEA quirk for i845 (bnc#845503). -- commit 61a06cb - -------------------------------------------------------------------- -Tue Oct 8 20:02:53 CEST 2013 - tiwai@suse.de - -- ALSA: hda - Add fixup for ASUS N56VZ (bnc#841645). -- commit a306dfb - -------------------------------------------------------------------- -Sat Oct 5 18:59:29 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.4. -- commit 40d7ca3 - -------------------------------------------------------------------- -Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Check module support only if the -extra package is requested -- commit add86bf - -------------------------------------------------------------------- -Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Remove unused options -- commit 3736315 - -------------------------------------------------------------------- -Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package - CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED -- commit 9e5b6fe - -------------------------------------------------------------------- -Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.3. -- Refresh patches.xen/xen3-patch-3.4. -- commit 485f0d1 - -------------------------------------------------------------------- -Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz - -- Always include the git commit in KOTD builds - This allows us not to set it explicitly in builds submitted to the - official distribution (bnc#821612, bnc#824171). -- commit a80e5ef - -------------------------------------------------------------------- -Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz - -- Btrfs: relocate csums properly with prealloc extents. -- commit cb5d5b5 - -------------------------------------------------------------------- -Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. - actually assign the divide result to hv_lapic_frequency -- commit 420e19b - -------------------------------------------------------------------- -Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 -- commit 221133c - -------------------------------------------------------------------- -Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are - versioned (bnc#821465). -- commit d802bf2 - -------------------------------------------------------------------- -Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) -- commit f5449e6 - -------------------------------------------------------------------- -Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes - for packages that were only seen in openSUSE releases up to 11.0. - (bnc#821465). -- commit 7e1f4b6 - -------------------------------------------------------------------- -Fri Sep 27 22:11:47 CEST 2013 - jeffm@suse.com - -- config: disable FB_UDL in favor of DRM_UDL (bnc#836782). -- commit 68c5865 - -------------------------------------------------------------------- -Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. -- commit 83e7e53 - -------------------------------------------------------------------- -Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de - -- X86: Hyper-V: Get the local APIC timer frequency from the - hypervisor. -- commit 4f400e1 - -------------------------------------------------------------------- -Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de - -- Input: add a driver to support Hyper-V synthetic keyboard - (fate#315887). -- Update config files. -- commit 7affb28 - -------------------------------------------------------------------- -Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors, rpm/mkspec: Add version information to obsolete - flavors (bnc#821465). -- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the - old-flavors file. -- commit 25c1b0d - -------------------------------------------------------------------- -Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors: Convert the old-packages.conf file to a flat - list. -- rpm/mkspec: Adjust. -- rpm/old-packages.conf: Delete. -- commit 4037e16 - -------------------------------------------------------------------- -Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz - -- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) -- commit 50c4c23 - -------------------------------------------------------------------- -Fri Sep 27 10:34:30 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.2. -- Refresh patches.xen/pci-guestdev. -- Refresh patches.xen/xen3-patch-2.6.27. -- Delete - patches.rpmify/powerpc-add-missing-include-to-book3s_xics-c. -- commit d1e8a21 - -------------------------------------------------------------------- -Fri Sep 27 10:29:30 CEST 2013 - jdelvare@suse.de - -- config/*/debug: Enable FSCACHE_DEBUG and CACHEFILES_DEBUG. -- commit 5068fbc - -------------------------------------------------------------------- -Thu Sep 26 17:32:40 CEST 2013 - rgoldwyn@suse.com - -- rpm/kernel-binary.spec.in: Remove Obsoletes ocfs2-kmp - This is done to enable install of ocfs2-kmp-* alongwith the - kernel until the patches are reviewed. -- commit 9d2b4ca - -------------------------------------------------------------------- -Thu Sep 26 16:10:40 CEST 2013 - jeffm@suse.com - -- config.conf: Re-enable s390x and ia64 configs -- commit adb564f - -------------------------------------------------------------------- -Thu Sep 26 16:10:27 CEST 2013 - jeffm@suse.com - -- patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation: - Updated Patch-mainline -- commit a1513a8 - -------------------------------------------------------------------- -Thu Sep 26 15:29:57 CEST 2013 - jdelvare@suse.de - -- Build gpio-ucb1400 as a module -- commit 68bb010 - -------------------------------------------------------------------- -Thu Sep 26 11:47:04 CEST 2013 - mmarek@suse.cz - -- Update README.BRANCH -- commit 4d432eb - -------------------------------------------------------------------- -Wed Sep 25 16:55:12 CEST 2013 - dsterba@suse.cz - -- Disable patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch -- commit e74b2a8 - -------------------------------------------------------------------- -Mon Sep 23 21:33:48 CEST 2013 - jeffm@suse.com - -- patches.suse/btrfs-add-per-super-attribute-publishing-to-sysfs: Fix issue where - the error case would still attempt to create sysfs dir. -- commit 129c02b +- Update to 3.12-rc1. +- Eliminated 42 patches. +- Xen is disabled. +- ARM is disabled. +- commit c58d853 ------------------------------------------------------------------- Fri Sep 20 21:16:16 CEST 2013 - jslaby@suse.cz - power_supply: Prevent suspend until power supply events are processed (bnc#841596). -- commit 11b28da +- commit 50dfbd0 ------------------------------------------------------------------- Wed Sep 18 14:41:04 CEST 2013 - duwe@suse.de - Increase NR_CPUS on ppc64 to 2048 (fate#315438) -- commit 8a38aef +- commit ddaa978 ------------------------------------------------------------------- Tue Sep 17 19:55:19 CEST 2013 - jslaby@suse.cz - Update config files. Fix ZSWAP on vanillas. -- commit da42424 - -------------------------------------------------------------------- -Tue Sep 17 18:05:34 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Fix for Xen detection with --vanilla - When we hit the limit code to handle $SKIP_XEN and there aren't - any Xen patches to apply anyway, we'll fail because LIMIT is unset. -- commit 1d7b879 - -------------------------------------------------------------------- -Tue Sep 17 17:44:49 CEST 2013 - jeffm@suse.com - -- scripts/tar-up.sh: Disable Xen patches when Xen configs are disabled - Similar to the change for scripts/sequence-patch.sh, this change - disables the Xen patches with +noxen in series.conf when creating - the kernel-source package. -- commit 3104a04 - -------------------------------------------------------------------- -Tue Sep 17 17:14:19 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Skip Xen patches when Xen configs are disabled. - When updating the base kernel version, the Xen patches must be updated - separately. This allows us to skip the Xen patches until they're resynced - just by disabling the configs. -- commit d9673e9 +- commit 5a7a093 ------------------------------------------------------------------- Tue Sep 17 16:31:27 CEST 2013 - jeffm@suse.com @@ -475,7 +164,7 @@ Tue Sep 3 17:25:07 CEST 2013 - jeffm@suse.com Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 280c88e +- commit 7032523 ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -605,7 +294,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 43e5ff5 +- commit 3fb567f ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -826,7 +515,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 51c5edf +- commit 62a3621 ------------------------------------------------------------------- Thu Jun 27 18:09:43 CEST 2013 - mszeredi@suse.cz @@ -854,7 +543,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit d8f6242 +- commit 0fcc327 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -1030,7 +719,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit af248e4 +- commit ba8f987 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1165,7 +854,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 882120e +- commit 97197ff ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1377,12 +1066,11 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de -- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 958fe54 +- commit 5457ebe ------------------------------------------------------------------- Fri Apr 5 14:13:15 CEST 2013 - jbeulich@suse.com @@ -1464,7 +1152,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit b9fe3d9 +- commit 801a982 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1656,7 +1344,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit 09220ef +- commit b1aa50e ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -5109,25 +4797,6 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com - Update to 3.1-rc7. - commit ee8cc90 -------------------------------------------------------------------- -Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz - -- rpm/split-modules: Print the full path for modules missing in supported.conf -- commit e55e4c6 - -------------------------------------------------------------------- -Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz - -- Add support for wildcards in supported.conf -- rpm/kernel-binary.spec.in: Generate Module.supported with all - lines from supported conf, unsupported modules are marked as "no" -- rpm/split-modules: Use the supported flag in modules, instead of - parsing the Module.supported file and report modules that have no - supported marking. -- rpm/check-supported-list: Delete, this is done by split-modules - now. -- commit edfdc2a - ------------------------------------------------------------------- Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de @@ -9263,26 +8932,6 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). -------------------------------------------------------------------- -Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: - Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). -- commit a48fbdf - -------------------------------------------------------------------- -Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz - -- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that - obsolete kernel-kdump. -- commit 0a4f75b - -------------------------------------------------------------------- -Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. -- commit 0e039b7 - ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -9667,13 +9316,6 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. -------------------------------------------------------------------- -Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. -- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. -- commit bf55479 - ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-docs.spec b/kernel-docs.spec index 4dff97d5..61245937 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -17,19 +17,15 @@ # norootforbuild -%define patchversion 3.11.6 +%define patchversion 3.12.0-rc2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.11.6 -%if 0%{?is_kotd} -Release: .g2607707 -%else -Release: 0 -%endif +Version: 3.12.rc2 +Release: .ga75f081 BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant Url: http://www.kernel.org/ diff --git a/kernel-pae.changes b/kernel-pae.changes index 0baba158..fdc5d025 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,362 +1,51 @@ ------------------------------------------------------------------- -Wed Nov 6 14:54:28 CET 2013 - mhocko@suse.cz +Tue Sep 24 18:47:46 CEST 2013 - trenn@suse.de -- Fix a few incorrectly checked [io_]remap_pfn_range() calls - (bnc#849021, CVE-2013-4511). -- commit 2607707 +- Delete patches.arch/010-acpi_initrd_override_tables.patch. + This old one alone broke acpi initrd override -> delete it. +- commit a75f081 ------------------------------------------------------------------- -Wed Oct 30 19:04:18 CET 2013 - dsterba@suse.cz +Tue Sep 24 18:10:03 CEST 2013 - jeffm@suse.com -- Disable patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch - reference: bnc#848059 -- commit e6d4a27 +- lustre/lloop: don't change the logical size for the queue. +- commit 4a2006a ------------------------------------------------------------------- -Wed Oct 30 17:49:05 CET 2013 - tiwai@suse.de +Tue Sep 24 16:30:50 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops - (bnc#846531). -- commit 5b1b1d3 +- Update to 3.12-rc2. +- Eliminated 3 patches. +- commit d7d9943 ------------------------------------------------------------------- -Wed Oct 30 12:36:05 CET 2013 - tiwai@suse.de +Tue Sep 24 15:55:10 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add a fixup for ASUS N76VZ (bnc#846529). -- commit 8bd2042 - -------------------------------------------------------------------- -Mon Oct 28 10:31:59 CET 2013 - jbeulich@suse.com - -- Update EC2 config files. -- commit 81dd01f - -------------------------------------------------------------------- -Mon Oct 28 09:25:43 CET 2013 - jbeulich@suse.com - -- Refresh Xen patches (bnc#829682, bnc#842063). -- pcifront: Deal with toolstack missing 'XenbusStateClosing' - state. -- Update Xen patches to 3.11.6. -- commit 2339477 - -------------------------------------------------------------------- -Thu Oct 24 18:23:02 CEST 2013 - trenn@suse.de - -- cpufreq: ondemand: Change the calculation of target frequency - (bnc#846734). -- commit 0ba01b7 - -------------------------------------------------------------------- -Thu Oct 24 17:08:03 CEST 2013 - dsterba@suse.cz - -- Btrfs: fix negative qgroup tracking from owner accounting (bnc#821948) -- commit ef319f1 - -------------------------------------------------------------------- -Tue Oct 22 21:17:47 CEST 2013 - jeffm@suse.com - -- nouveau: Fix race with fence signaling (bnc#844177). -- commit 8d7989b - -------------------------------------------------------------------- -Fri Oct 18 22:19:21 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.6 (bnc#841645). -- Delete patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ. -- commit 9ca6827 - -------------------------------------------------------------------- -Mon Oct 14 18:45:32 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 (vanilla) -- commit 53efb9c - -------------------------------------------------------------------- -Mon Oct 14 18:21:41 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 -- commit 22f9877 - -------------------------------------------------------------------- -Mon Oct 14 17:34:08 CEST 2013 - jeffm@suse.com - -- btrfs: Fix creation of per-super sysfs directories when using multiple - subvolumes (bnc#845774). -- commit 0801062 - -------------------------------------------------------------------- -Mon Oct 14 10:57:07 CEST 2013 - oneukum@suse.de - -- sha256_ssse3: also test for BMI2 (bnc#842459). -- commit 626459d - -------------------------------------------------------------------- -Mon Oct 14 09:42:07 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.5. -- Delete - patches.suse/btrfs-0005-reset-ret-in-record_one_backref.patch. -- Delete - patches.suse/btrfs-0010-change-how-we-queue-blocks-for-backref-checkin.patch. -- Delete - patches.suse/btrfs-0022-skip-subvol-entries-when-checking-if-we-ve-cre.patch. -- Delete - patches.suse/btrfs-0033-remove-ourselves-from-the-cluster-list-under-l.patch. -- commit c00734a - -------------------------------------------------------------------- -Fri Oct 11 13:45:25 CEST 2013 - tiwai@suse.de - -- drm/i915: Undo the PIPEA quirk for i845 (bnc#845503). -- commit 61a06cb - -------------------------------------------------------------------- -Tue Oct 8 20:02:53 CEST 2013 - tiwai@suse.de - -- ALSA: hda - Add fixup for ASUS N56VZ (bnc#841645). -- commit a306dfb - -------------------------------------------------------------------- -Sat Oct 5 18:59:29 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.4. -- commit 40d7ca3 - -------------------------------------------------------------------- -Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Check module support only if the -extra package is requested -- commit add86bf - -------------------------------------------------------------------- -Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Remove unused options -- commit 3736315 - -------------------------------------------------------------------- -Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package - CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED -- commit 9e5b6fe - -------------------------------------------------------------------- -Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.3. -- Refresh patches.xen/xen3-patch-3.4. -- commit 485f0d1 - -------------------------------------------------------------------- -Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz - -- Always include the git commit in KOTD builds - This allows us not to set it explicitly in builds submitted to the - official distribution (bnc#821612, bnc#824171). -- commit a80e5ef - -------------------------------------------------------------------- -Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz - -- Btrfs: relocate csums properly with prealloc extents. -- commit cb5d5b5 - -------------------------------------------------------------------- -Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. - actually assign the divide result to hv_lapic_frequency -- commit 420e19b - -------------------------------------------------------------------- -Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 -- commit 221133c - -------------------------------------------------------------------- -Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are - versioned (bnc#821465). -- commit d802bf2 - -------------------------------------------------------------------- -Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) -- commit f5449e6 - -------------------------------------------------------------------- -Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes - for packages that were only seen in openSUSE releases up to 11.0. - (bnc#821465). -- commit 7e1f4b6 - -------------------------------------------------------------------- -Fri Sep 27 22:11:47 CEST 2013 - jeffm@suse.com - -- config: disable FB_UDL in favor of DRM_UDL (bnc#836782). -- commit 68c5865 - -------------------------------------------------------------------- -Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. -- commit 83e7e53 - -------------------------------------------------------------------- -Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de - -- X86: Hyper-V: Get the local APIC timer frequency from the - hypervisor. -- commit 4f400e1 - -------------------------------------------------------------------- -Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de - -- Input: add a driver to support Hyper-V synthetic keyboard - (fate#315887). -- Update config files. -- commit 7affb28 - -------------------------------------------------------------------- -Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors, rpm/mkspec: Add version information to obsolete - flavors (bnc#821465). -- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the - old-flavors file. -- commit 25c1b0d - -------------------------------------------------------------------- -Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors: Convert the old-packages.conf file to a flat - list. -- rpm/mkspec: Adjust. -- rpm/old-packages.conf: Delete. -- commit 4037e16 - -------------------------------------------------------------------- -Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz - -- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) -- commit 50c4c23 - -------------------------------------------------------------------- -Fri Sep 27 10:34:30 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.2. -- Refresh patches.xen/pci-guestdev. -- Refresh patches.xen/xen3-patch-2.6.27. -- Delete - patches.rpmify/powerpc-add-missing-include-to-book3s_xics-c. -- commit d1e8a21 - -------------------------------------------------------------------- -Fri Sep 27 10:29:30 CEST 2013 - jdelvare@suse.de - -- config/*/debug: Enable FSCACHE_DEBUG and CACHEFILES_DEBUG. -- commit 5068fbc - -------------------------------------------------------------------- -Thu Sep 26 17:32:40 CEST 2013 - rgoldwyn@suse.com - -- rpm/kernel-binary.spec.in: Remove Obsoletes ocfs2-kmp - This is done to enable install of ocfs2-kmp-* alongwith the - kernel until the patches are reviewed. -- commit 9d2b4ca - -------------------------------------------------------------------- -Thu Sep 26 16:10:40 CEST 2013 - jeffm@suse.com - -- config.conf: Re-enable s390x and ia64 configs -- commit adb564f - -------------------------------------------------------------------- -Thu Sep 26 16:10:27 CEST 2013 - jeffm@suse.com - -- patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation: - Updated Patch-mainline -- commit a1513a8 - -------------------------------------------------------------------- -Thu Sep 26 15:29:57 CEST 2013 - jdelvare@suse.de - -- Build gpio-ucb1400 as a module -- commit 68bb010 - -------------------------------------------------------------------- -Thu Sep 26 11:47:04 CEST 2013 - mmarek@suse.cz - -- Update README.BRANCH -- commit 4d432eb - -------------------------------------------------------------------- -Wed Sep 25 16:55:12 CEST 2013 - dsterba@suse.cz - -- Disable patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch -- commit e74b2a8 - -------------------------------------------------------------------- -Mon Sep 23 21:33:48 CEST 2013 - jeffm@suse.com - -- patches.suse/btrfs-add-per-super-attribute-publishing-to-sysfs: Fix issue where - the error case would still attempt to create sysfs dir. -- commit 129c02b +- Update to 3.12-rc1. +- Eliminated 42 patches. +- Xen is disabled. +- ARM is disabled. +- commit c58d853 ------------------------------------------------------------------- Fri Sep 20 21:16:16 CEST 2013 - jslaby@suse.cz - power_supply: Prevent suspend until power supply events are processed (bnc#841596). -- commit 11b28da +- commit 50dfbd0 ------------------------------------------------------------------- Wed Sep 18 14:41:04 CEST 2013 - duwe@suse.de - Increase NR_CPUS on ppc64 to 2048 (fate#315438) -- commit 8a38aef +- commit ddaa978 ------------------------------------------------------------------- Tue Sep 17 19:55:19 CEST 2013 - jslaby@suse.cz - Update config files. Fix ZSWAP on vanillas. -- commit da42424 - -------------------------------------------------------------------- -Tue Sep 17 18:05:34 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Fix for Xen detection with --vanilla - When we hit the limit code to handle $SKIP_XEN and there aren't - any Xen patches to apply anyway, we'll fail because LIMIT is unset. -- commit 1d7b879 - -------------------------------------------------------------------- -Tue Sep 17 17:44:49 CEST 2013 - jeffm@suse.com - -- scripts/tar-up.sh: Disable Xen patches when Xen configs are disabled - Similar to the change for scripts/sequence-patch.sh, this change - disables the Xen patches with +noxen in series.conf when creating - the kernel-source package. -- commit 3104a04 - -------------------------------------------------------------------- -Tue Sep 17 17:14:19 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Skip Xen patches when Xen configs are disabled. - When updating the base kernel version, the Xen patches must be updated - separately. This allows us to skip the Xen patches until they're resynced - just by disabling the configs. -- commit d9673e9 +- commit 5a7a093 ------------------------------------------------------------------- Tue Sep 17 16:31:27 CEST 2013 - jeffm@suse.com @@ -475,7 +164,7 @@ Tue Sep 3 17:25:07 CEST 2013 - jeffm@suse.com Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 280c88e +- commit 7032523 ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -605,7 +294,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 43e5ff5 +- commit 3fb567f ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -826,7 +515,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 51c5edf +- commit 62a3621 ------------------------------------------------------------------- Thu Jun 27 18:09:43 CEST 2013 - mszeredi@suse.cz @@ -854,7 +543,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit d8f6242 +- commit 0fcc327 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -1030,7 +719,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit af248e4 +- commit ba8f987 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1165,7 +854,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 882120e +- commit 97197ff ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1377,12 +1066,11 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de -- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 958fe54 +- commit 5457ebe ------------------------------------------------------------------- Fri Apr 5 14:13:15 CEST 2013 - jbeulich@suse.com @@ -1464,7 +1152,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit b9fe3d9 +- commit 801a982 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1656,7 +1344,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit 09220ef +- commit b1aa50e ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -5109,25 +4797,6 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com - Update to 3.1-rc7. - commit ee8cc90 -------------------------------------------------------------------- -Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz - -- rpm/split-modules: Print the full path for modules missing in supported.conf -- commit e55e4c6 - -------------------------------------------------------------------- -Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz - -- Add support for wildcards in supported.conf -- rpm/kernel-binary.spec.in: Generate Module.supported with all - lines from supported conf, unsupported modules are marked as "no" -- rpm/split-modules: Use the supported flag in modules, instead of - parsing the Module.supported file and report modules that have no - supported marking. -- rpm/check-supported-list: Delete, this is done by split-modules - now. -- commit edfdc2a - ------------------------------------------------------------------- Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de @@ -9263,26 +8932,6 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). -------------------------------------------------------------------- -Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: - Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). -- commit a48fbdf - -------------------------------------------------------------------- -Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz - -- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that - obsolete kernel-kdump. -- commit 0a4f75b - -------------------------------------------------------------------- -Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. -- commit 0e039b7 - ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -9667,13 +9316,6 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. -------------------------------------------------------------------- -Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. -- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. -- commit bf55479 - ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-pae.spec b/kernel-pae.spec index 0c402778..75cdcda3 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.11 -%define patchversion 3.11.6 +%define srcversion 3.12-rc2 +%define patchversion 3.12.0-rc2 %define variant %{nil} %define vanilla_only 0 @@ -39,17 +39,17 @@ %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,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}) +%(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 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") -%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y") +%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") %ifarch %ix86 x86_64 %define install_vdso 1 @@ -59,12 +59,8 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 3.11.6 -%if 0%{?is_kotd} -Release: .g2607707 -%else -Release: 0 -%endif +Version: 3.12.rc2 +Release: .ga75f081 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -122,11 +118,19 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen +%ifarch %ix86 +%if %build_flavor != "ec2" +Provides: kernel-xenpae = %version +Obsoletes: kernel-xenpae < %version +%endif +%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl +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 @@ -145,13 +149,11 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel %ifarch %ix86 -Provides: kernel-bigsmp = 2.6.17 -Obsoletes: kernel-bigsmp <= 2.6.17 -Provides: kernel-vmi = 2.6.38 -Obsoletes: kernel-vmi <= 2.6.38 +Provides: kernel-bigsmp +Obsoletes: kernel-bigsmp %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -166,6 +168,7 @@ Source17: apply-patches Source21: config.conf Source23: supported.conf Source33: check-for-config-changes +Source34: check-supported-list Source35: group-source-files.pl Source37: README.SUSE Source38: README.KSYMS @@ -186,7 +189,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-flavors +Source62: old-packages.conf Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -245,51 +248,31 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. -# Usage: obsolete_kmp -# Note that KMPs embed the version of the kernel built against, that's why -# the _3 suffix for 2.6.x-based KMPs -%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ -Provides: %1-kmp = %2 \ -Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -%obsolete_kmp iwlwifi 1.3.27_3 -%obsolete_kmp ipw3945 1.2.2_3 -# sled10 / 11.0 -%obsolete_kmp uvcvideo r200_3 +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor +# sles10 / 11.0 +Obsoletes: uvcvideo-kmp-%build_flavor +# 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 # sle11-ga -%obsolete_kmp enic 0.0.1_3 -%obsolete_kmp fnic 1.0.0_3 -%obsolete_kmp brocade-bfa 1.1.0.2_3 -%obsolete_kmp kvm 78.2.6.30.1_3 -%obsolete_kmp perfmon 2_3 -%obsolete_kmp iwlagn-2-6-27 1.0_3 -%obsolete_kmp msi-wmi 1.0_3 +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 # sle11 -%obsolete_kmp ocfs2 1.6_4 +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -%obsolete_kmp quickcam 0.6.7 -# sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -327,27 +310,16 @@ fi mkdir -p %kernel_build_dir -# Generate a list of modules with their support status marking -%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \ -awk ' - /^\+(base|yes) / { - print $(NF); - next; - } - /^\+external / { - print $(NF) " external"; - next; - } - /^[-+]/ { - print $(NF) " no"; - next; - } - { - print $(NF); - } -' >%kernel_build_dir/Module.supported -%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \ - sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base +supported_conf() { + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ + sed 's,.*/,,; s,\.ko$,,' | sort -u +} + +# Generate the list of modules to be marked as supported +{ supported_conf base + supported_conf --default=0 external | sed 's/$/ external/' +} > %kernel_build_dir/Module.supported +supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion @@ -692,6 +664,14 @@ if [ %CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ + %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then +%if %supported_modules_check + exit 1 +%endif + echo "Consistency check error: please update supported.conf." + fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -744,12 +724,10 @@ if [ %CONFIG_MODULES = y ]; then %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ -b %kernel_build_dir/Module.base \ -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" - -e \ -%endif %if ! %supported_modules_check - -i + -i \ %endif + -s %kernel_build_dir/Module.supported %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -903,10 +881,6 @@ Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd %ifarch %ix86 -Provides: kernel-vmi-base = 2.6.38 -Obsoletes: kernel-vmi-base <= 2.6.38 -%endif -%ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-source.changes b/kernel-source.changes index 0baba158..fdc5d025 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,362 +1,51 @@ ------------------------------------------------------------------- -Wed Nov 6 14:54:28 CET 2013 - mhocko@suse.cz +Tue Sep 24 18:47:46 CEST 2013 - trenn@suse.de -- Fix a few incorrectly checked [io_]remap_pfn_range() calls - (bnc#849021, CVE-2013-4511). -- commit 2607707 +- Delete patches.arch/010-acpi_initrd_override_tables.patch. + This old one alone broke acpi initrd override -> delete it. +- commit a75f081 ------------------------------------------------------------------- -Wed Oct 30 19:04:18 CET 2013 - dsterba@suse.cz +Tue Sep 24 18:10:03 CEST 2013 - jeffm@suse.com -- Disable patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch - reference: bnc#848059 -- commit e6d4a27 +- lustre/lloop: don't change the logical size for the queue. +- commit 4a2006a ------------------------------------------------------------------- -Wed Oct 30 17:49:05 CET 2013 - tiwai@suse.de +Tue Sep 24 16:30:50 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops - (bnc#846531). -- commit 5b1b1d3 +- Update to 3.12-rc2. +- Eliminated 3 patches. +- commit d7d9943 ------------------------------------------------------------------- -Wed Oct 30 12:36:05 CET 2013 - tiwai@suse.de +Tue Sep 24 15:55:10 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add a fixup for ASUS N76VZ (bnc#846529). -- commit 8bd2042 - -------------------------------------------------------------------- -Mon Oct 28 10:31:59 CET 2013 - jbeulich@suse.com - -- Update EC2 config files. -- commit 81dd01f - -------------------------------------------------------------------- -Mon Oct 28 09:25:43 CET 2013 - jbeulich@suse.com - -- Refresh Xen patches (bnc#829682, bnc#842063). -- pcifront: Deal with toolstack missing 'XenbusStateClosing' - state. -- Update Xen patches to 3.11.6. -- commit 2339477 - -------------------------------------------------------------------- -Thu Oct 24 18:23:02 CEST 2013 - trenn@suse.de - -- cpufreq: ondemand: Change the calculation of target frequency - (bnc#846734). -- commit 0ba01b7 - -------------------------------------------------------------------- -Thu Oct 24 17:08:03 CEST 2013 - dsterba@suse.cz - -- Btrfs: fix negative qgroup tracking from owner accounting (bnc#821948) -- commit ef319f1 - -------------------------------------------------------------------- -Tue Oct 22 21:17:47 CEST 2013 - jeffm@suse.com - -- nouveau: Fix race with fence signaling (bnc#844177). -- commit 8d7989b - -------------------------------------------------------------------- -Fri Oct 18 22:19:21 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.6 (bnc#841645). -- Delete patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ. -- commit 9ca6827 - -------------------------------------------------------------------- -Mon Oct 14 18:45:32 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 (vanilla) -- commit 53efb9c - -------------------------------------------------------------------- -Mon Oct 14 18:21:41 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 -- commit 22f9877 - -------------------------------------------------------------------- -Mon Oct 14 17:34:08 CEST 2013 - jeffm@suse.com - -- btrfs: Fix creation of per-super sysfs directories when using multiple - subvolumes (bnc#845774). -- commit 0801062 - -------------------------------------------------------------------- -Mon Oct 14 10:57:07 CEST 2013 - oneukum@suse.de - -- sha256_ssse3: also test for BMI2 (bnc#842459). -- commit 626459d - -------------------------------------------------------------------- -Mon Oct 14 09:42:07 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.5. -- Delete - patches.suse/btrfs-0005-reset-ret-in-record_one_backref.patch. -- Delete - patches.suse/btrfs-0010-change-how-we-queue-blocks-for-backref-checkin.patch. -- Delete - patches.suse/btrfs-0022-skip-subvol-entries-when-checking-if-we-ve-cre.patch. -- Delete - patches.suse/btrfs-0033-remove-ourselves-from-the-cluster-list-under-l.patch. -- commit c00734a - -------------------------------------------------------------------- -Fri Oct 11 13:45:25 CEST 2013 - tiwai@suse.de - -- drm/i915: Undo the PIPEA quirk for i845 (bnc#845503). -- commit 61a06cb - -------------------------------------------------------------------- -Tue Oct 8 20:02:53 CEST 2013 - tiwai@suse.de - -- ALSA: hda - Add fixup for ASUS N56VZ (bnc#841645). -- commit a306dfb - -------------------------------------------------------------------- -Sat Oct 5 18:59:29 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.4. -- commit 40d7ca3 - -------------------------------------------------------------------- -Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Check module support only if the -extra package is requested -- commit add86bf - -------------------------------------------------------------------- -Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Remove unused options -- commit 3736315 - -------------------------------------------------------------------- -Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package - CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED -- commit 9e5b6fe - -------------------------------------------------------------------- -Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.3. -- Refresh patches.xen/xen3-patch-3.4. -- commit 485f0d1 - -------------------------------------------------------------------- -Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz - -- Always include the git commit in KOTD builds - This allows us not to set it explicitly in builds submitted to the - official distribution (bnc#821612, bnc#824171). -- commit a80e5ef - -------------------------------------------------------------------- -Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz - -- Btrfs: relocate csums properly with prealloc extents. -- commit cb5d5b5 - -------------------------------------------------------------------- -Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. - actually assign the divide result to hv_lapic_frequency -- commit 420e19b - -------------------------------------------------------------------- -Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 -- commit 221133c - -------------------------------------------------------------------- -Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are - versioned (bnc#821465). -- commit d802bf2 - -------------------------------------------------------------------- -Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) -- commit f5449e6 - -------------------------------------------------------------------- -Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes - for packages that were only seen in openSUSE releases up to 11.0. - (bnc#821465). -- commit 7e1f4b6 - -------------------------------------------------------------------- -Fri Sep 27 22:11:47 CEST 2013 - jeffm@suse.com - -- config: disable FB_UDL in favor of DRM_UDL (bnc#836782). -- commit 68c5865 - -------------------------------------------------------------------- -Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. -- commit 83e7e53 - -------------------------------------------------------------------- -Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de - -- X86: Hyper-V: Get the local APIC timer frequency from the - hypervisor. -- commit 4f400e1 - -------------------------------------------------------------------- -Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de - -- Input: add a driver to support Hyper-V synthetic keyboard - (fate#315887). -- Update config files. -- commit 7affb28 - -------------------------------------------------------------------- -Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors, rpm/mkspec: Add version information to obsolete - flavors (bnc#821465). -- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the - old-flavors file. -- commit 25c1b0d - -------------------------------------------------------------------- -Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors: Convert the old-packages.conf file to a flat - list. -- rpm/mkspec: Adjust. -- rpm/old-packages.conf: Delete. -- commit 4037e16 - -------------------------------------------------------------------- -Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz - -- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) -- commit 50c4c23 - -------------------------------------------------------------------- -Fri Sep 27 10:34:30 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.2. -- Refresh patches.xen/pci-guestdev. -- Refresh patches.xen/xen3-patch-2.6.27. -- Delete - patches.rpmify/powerpc-add-missing-include-to-book3s_xics-c. -- commit d1e8a21 - -------------------------------------------------------------------- -Fri Sep 27 10:29:30 CEST 2013 - jdelvare@suse.de - -- config/*/debug: Enable FSCACHE_DEBUG and CACHEFILES_DEBUG. -- commit 5068fbc - -------------------------------------------------------------------- -Thu Sep 26 17:32:40 CEST 2013 - rgoldwyn@suse.com - -- rpm/kernel-binary.spec.in: Remove Obsoletes ocfs2-kmp - This is done to enable install of ocfs2-kmp-* alongwith the - kernel until the patches are reviewed. -- commit 9d2b4ca - -------------------------------------------------------------------- -Thu Sep 26 16:10:40 CEST 2013 - jeffm@suse.com - -- config.conf: Re-enable s390x and ia64 configs -- commit adb564f - -------------------------------------------------------------------- -Thu Sep 26 16:10:27 CEST 2013 - jeffm@suse.com - -- patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation: - Updated Patch-mainline -- commit a1513a8 - -------------------------------------------------------------------- -Thu Sep 26 15:29:57 CEST 2013 - jdelvare@suse.de - -- Build gpio-ucb1400 as a module -- commit 68bb010 - -------------------------------------------------------------------- -Thu Sep 26 11:47:04 CEST 2013 - mmarek@suse.cz - -- Update README.BRANCH -- commit 4d432eb - -------------------------------------------------------------------- -Wed Sep 25 16:55:12 CEST 2013 - dsterba@suse.cz - -- Disable patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch -- commit e74b2a8 - -------------------------------------------------------------------- -Mon Sep 23 21:33:48 CEST 2013 - jeffm@suse.com - -- patches.suse/btrfs-add-per-super-attribute-publishing-to-sysfs: Fix issue where - the error case would still attempt to create sysfs dir. -- commit 129c02b +- Update to 3.12-rc1. +- Eliminated 42 patches. +- Xen is disabled. +- ARM is disabled. +- commit c58d853 ------------------------------------------------------------------- Fri Sep 20 21:16:16 CEST 2013 - jslaby@suse.cz - power_supply: Prevent suspend until power supply events are processed (bnc#841596). -- commit 11b28da +- commit 50dfbd0 ------------------------------------------------------------------- Wed Sep 18 14:41:04 CEST 2013 - duwe@suse.de - Increase NR_CPUS on ppc64 to 2048 (fate#315438) -- commit 8a38aef +- commit ddaa978 ------------------------------------------------------------------- Tue Sep 17 19:55:19 CEST 2013 - jslaby@suse.cz - Update config files. Fix ZSWAP on vanillas. -- commit da42424 - -------------------------------------------------------------------- -Tue Sep 17 18:05:34 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Fix for Xen detection with --vanilla - When we hit the limit code to handle $SKIP_XEN and there aren't - any Xen patches to apply anyway, we'll fail because LIMIT is unset. -- commit 1d7b879 - -------------------------------------------------------------------- -Tue Sep 17 17:44:49 CEST 2013 - jeffm@suse.com - -- scripts/tar-up.sh: Disable Xen patches when Xen configs are disabled - Similar to the change for scripts/sequence-patch.sh, this change - disables the Xen patches with +noxen in series.conf when creating - the kernel-source package. -- commit 3104a04 - -------------------------------------------------------------------- -Tue Sep 17 17:14:19 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Skip Xen patches when Xen configs are disabled. - When updating the base kernel version, the Xen patches must be updated - separately. This allows us to skip the Xen patches until they're resynced - just by disabling the configs. -- commit d9673e9 +- commit 5a7a093 ------------------------------------------------------------------- Tue Sep 17 16:31:27 CEST 2013 - jeffm@suse.com @@ -475,7 +164,7 @@ Tue Sep 3 17:25:07 CEST 2013 - jeffm@suse.com Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 280c88e +- commit 7032523 ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -605,7 +294,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 43e5ff5 +- commit 3fb567f ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -826,7 +515,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 51c5edf +- commit 62a3621 ------------------------------------------------------------------- Thu Jun 27 18:09:43 CEST 2013 - mszeredi@suse.cz @@ -854,7 +543,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit d8f6242 +- commit 0fcc327 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -1030,7 +719,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit af248e4 +- commit ba8f987 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1165,7 +854,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 882120e +- commit 97197ff ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1377,12 +1066,11 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de -- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 958fe54 +- commit 5457ebe ------------------------------------------------------------------- Fri Apr 5 14:13:15 CEST 2013 - jbeulich@suse.com @@ -1464,7 +1152,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit b9fe3d9 +- commit 801a982 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1656,7 +1344,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit 09220ef +- commit b1aa50e ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -5109,25 +4797,6 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com - Update to 3.1-rc7. - commit ee8cc90 -------------------------------------------------------------------- -Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz - -- rpm/split-modules: Print the full path for modules missing in supported.conf -- commit e55e4c6 - -------------------------------------------------------------------- -Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz - -- Add support for wildcards in supported.conf -- rpm/kernel-binary.spec.in: Generate Module.supported with all - lines from supported conf, unsupported modules are marked as "no" -- rpm/split-modules: Use the supported flag in modules, instead of - parsing the Module.supported file and report modules that have no - supported marking. -- rpm/check-supported-list: Delete, this is done by split-modules - now. -- commit edfdc2a - ------------------------------------------------------------------- Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de @@ -9263,26 +8932,6 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). -------------------------------------------------------------------- -Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: - Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). -- commit a48fbdf - -------------------------------------------------------------------- -Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz - -- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that - obsolete kernel-kdump. -- commit 0a4f75b - -------------------------------------------------------------------- -Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. -- commit 0e039b7 - ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -9667,13 +9316,6 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. -------------------------------------------------------------------- -Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. -- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. -- commit bf55479 - ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index e9766d94..27ea75d4 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -18,8 +18,8 @@ # norootforbuild # icecream 0 -%define srcversion 3.11 -%define patchversion 3.11.6 +%define srcversion 3.12-rc2 +%define patchversion 3.12.0-rc2 %define variant %{nil} %define vanilla_only 0 @@ -29,12 +29,8 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.11.6 -%if 0%{?is_kotd} -Release: .g2607707 -%else -Release: 0 -%endif +Version: 3.12.rc2 +Release: .ga75f081 License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ @@ -45,7 +41,7 @@ Requires(post): coreutils sed Provides: multiversion(kernel) Provides: linux Provides: %name = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -60,6 +56,7 @@ Source17: apply-patches Source21: config.conf Source23: supported.conf Source33: check-for-config-changes +Source34: check-supported-list Source35: group-source-files.pl Source37: README.SUSE Source38: README.KSYMS @@ -80,7 +77,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-flavors +Source62: old-packages.conf Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -110,7 +107,7 @@ Prefix: /usr/src # Source is only complete with devel files. Requires: kernel-devel = %version-%release -%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,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}) +%(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) diff --git a/kernel-syms.changes b/kernel-syms.changes index 0baba158..fdc5d025 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,362 +1,51 @@ ------------------------------------------------------------------- -Wed Nov 6 14:54:28 CET 2013 - mhocko@suse.cz +Tue Sep 24 18:47:46 CEST 2013 - trenn@suse.de -- Fix a few incorrectly checked [io_]remap_pfn_range() calls - (bnc#849021, CVE-2013-4511). -- commit 2607707 +- Delete patches.arch/010-acpi_initrd_override_tables.patch. + This old one alone broke acpi initrd override -> delete it. +- commit a75f081 ------------------------------------------------------------------- -Wed Oct 30 19:04:18 CET 2013 - dsterba@suse.cz +Tue Sep 24 18:10:03 CEST 2013 - jeffm@suse.com -- Disable patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch - reference: bnc#848059 -- commit e6d4a27 +- lustre/lloop: don't change the logical size for the queue. +- commit 4a2006a ------------------------------------------------------------------- -Wed Oct 30 17:49:05 CET 2013 - tiwai@suse.de +Tue Sep 24 16:30:50 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops - (bnc#846531). -- commit 5b1b1d3 +- Update to 3.12-rc2. +- Eliminated 3 patches. +- commit d7d9943 ------------------------------------------------------------------- -Wed Oct 30 12:36:05 CET 2013 - tiwai@suse.de +Tue Sep 24 15:55:10 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add a fixup for ASUS N76VZ (bnc#846529). -- commit 8bd2042 - -------------------------------------------------------------------- -Mon Oct 28 10:31:59 CET 2013 - jbeulich@suse.com - -- Update EC2 config files. -- commit 81dd01f - -------------------------------------------------------------------- -Mon Oct 28 09:25:43 CET 2013 - jbeulich@suse.com - -- Refresh Xen patches (bnc#829682, bnc#842063). -- pcifront: Deal with toolstack missing 'XenbusStateClosing' - state. -- Update Xen patches to 3.11.6. -- commit 2339477 - -------------------------------------------------------------------- -Thu Oct 24 18:23:02 CEST 2013 - trenn@suse.de - -- cpufreq: ondemand: Change the calculation of target frequency - (bnc#846734). -- commit 0ba01b7 - -------------------------------------------------------------------- -Thu Oct 24 17:08:03 CEST 2013 - dsterba@suse.cz - -- Btrfs: fix negative qgroup tracking from owner accounting (bnc#821948) -- commit ef319f1 - -------------------------------------------------------------------- -Tue Oct 22 21:17:47 CEST 2013 - jeffm@suse.com - -- nouveau: Fix race with fence signaling (bnc#844177). -- commit 8d7989b - -------------------------------------------------------------------- -Fri Oct 18 22:19:21 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.6 (bnc#841645). -- Delete patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ. -- commit 9ca6827 - -------------------------------------------------------------------- -Mon Oct 14 18:45:32 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 (vanilla) -- commit 53efb9c - -------------------------------------------------------------------- -Mon Oct 14 18:21:41 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 -- commit 22f9877 - -------------------------------------------------------------------- -Mon Oct 14 17:34:08 CEST 2013 - jeffm@suse.com - -- btrfs: Fix creation of per-super sysfs directories when using multiple - subvolumes (bnc#845774). -- commit 0801062 - -------------------------------------------------------------------- -Mon Oct 14 10:57:07 CEST 2013 - oneukum@suse.de - -- sha256_ssse3: also test for BMI2 (bnc#842459). -- commit 626459d - -------------------------------------------------------------------- -Mon Oct 14 09:42:07 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.5. -- Delete - patches.suse/btrfs-0005-reset-ret-in-record_one_backref.patch. -- Delete - patches.suse/btrfs-0010-change-how-we-queue-blocks-for-backref-checkin.patch. -- Delete - patches.suse/btrfs-0022-skip-subvol-entries-when-checking-if-we-ve-cre.patch. -- Delete - patches.suse/btrfs-0033-remove-ourselves-from-the-cluster-list-under-l.patch. -- commit c00734a - -------------------------------------------------------------------- -Fri Oct 11 13:45:25 CEST 2013 - tiwai@suse.de - -- drm/i915: Undo the PIPEA quirk for i845 (bnc#845503). -- commit 61a06cb - -------------------------------------------------------------------- -Tue Oct 8 20:02:53 CEST 2013 - tiwai@suse.de - -- ALSA: hda - Add fixup for ASUS N56VZ (bnc#841645). -- commit a306dfb - -------------------------------------------------------------------- -Sat Oct 5 18:59:29 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.4. -- commit 40d7ca3 - -------------------------------------------------------------------- -Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Check module support only if the -extra package is requested -- commit add86bf - -------------------------------------------------------------------- -Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Remove unused options -- commit 3736315 - -------------------------------------------------------------------- -Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package - CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED -- commit 9e5b6fe - -------------------------------------------------------------------- -Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.3. -- Refresh patches.xen/xen3-patch-3.4. -- commit 485f0d1 - -------------------------------------------------------------------- -Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz - -- Always include the git commit in KOTD builds - This allows us not to set it explicitly in builds submitted to the - official distribution (bnc#821612, bnc#824171). -- commit a80e5ef - -------------------------------------------------------------------- -Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz - -- Btrfs: relocate csums properly with prealloc extents. -- commit cb5d5b5 - -------------------------------------------------------------------- -Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. - actually assign the divide result to hv_lapic_frequency -- commit 420e19b - -------------------------------------------------------------------- -Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 -- commit 221133c - -------------------------------------------------------------------- -Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are - versioned (bnc#821465). -- commit d802bf2 - -------------------------------------------------------------------- -Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) -- commit f5449e6 - -------------------------------------------------------------------- -Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes - for packages that were only seen in openSUSE releases up to 11.0. - (bnc#821465). -- commit 7e1f4b6 - -------------------------------------------------------------------- -Fri Sep 27 22:11:47 CEST 2013 - jeffm@suse.com - -- config: disable FB_UDL in favor of DRM_UDL (bnc#836782). -- commit 68c5865 - -------------------------------------------------------------------- -Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. -- commit 83e7e53 - -------------------------------------------------------------------- -Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de - -- X86: Hyper-V: Get the local APIC timer frequency from the - hypervisor. -- commit 4f400e1 - -------------------------------------------------------------------- -Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de - -- Input: add a driver to support Hyper-V synthetic keyboard - (fate#315887). -- Update config files. -- commit 7affb28 - -------------------------------------------------------------------- -Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors, rpm/mkspec: Add version information to obsolete - flavors (bnc#821465). -- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the - old-flavors file. -- commit 25c1b0d - -------------------------------------------------------------------- -Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors: Convert the old-packages.conf file to a flat - list. -- rpm/mkspec: Adjust. -- rpm/old-packages.conf: Delete. -- commit 4037e16 - -------------------------------------------------------------------- -Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz - -- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) -- commit 50c4c23 - -------------------------------------------------------------------- -Fri Sep 27 10:34:30 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.2. -- Refresh patches.xen/pci-guestdev. -- Refresh patches.xen/xen3-patch-2.6.27. -- Delete - patches.rpmify/powerpc-add-missing-include-to-book3s_xics-c. -- commit d1e8a21 - -------------------------------------------------------------------- -Fri Sep 27 10:29:30 CEST 2013 - jdelvare@suse.de - -- config/*/debug: Enable FSCACHE_DEBUG and CACHEFILES_DEBUG. -- commit 5068fbc - -------------------------------------------------------------------- -Thu Sep 26 17:32:40 CEST 2013 - rgoldwyn@suse.com - -- rpm/kernel-binary.spec.in: Remove Obsoletes ocfs2-kmp - This is done to enable install of ocfs2-kmp-* alongwith the - kernel until the patches are reviewed. -- commit 9d2b4ca - -------------------------------------------------------------------- -Thu Sep 26 16:10:40 CEST 2013 - jeffm@suse.com - -- config.conf: Re-enable s390x and ia64 configs -- commit adb564f - -------------------------------------------------------------------- -Thu Sep 26 16:10:27 CEST 2013 - jeffm@suse.com - -- patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation: - Updated Patch-mainline -- commit a1513a8 - -------------------------------------------------------------------- -Thu Sep 26 15:29:57 CEST 2013 - jdelvare@suse.de - -- Build gpio-ucb1400 as a module -- commit 68bb010 - -------------------------------------------------------------------- -Thu Sep 26 11:47:04 CEST 2013 - mmarek@suse.cz - -- Update README.BRANCH -- commit 4d432eb - -------------------------------------------------------------------- -Wed Sep 25 16:55:12 CEST 2013 - dsterba@suse.cz - -- Disable patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch -- commit e74b2a8 - -------------------------------------------------------------------- -Mon Sep 23 21:33:48 CEST 2013 - jeffm@suse.com - -- patches.suse/btrfs-add-per-super-attribute-publishing-to-sysfs: Fix issue where - the error case would still attempt to create sysfs dir. -- commit 129c02b +- Update to 3.12-rc1. +- Eliminated 42 patches. +- Xen is disabled. +- ARM is disabled. +- commit c58d853 ------------------------------------------------------------------- Fri Sep 20 21:16:16 CEST 2013 - jslaby@suse.cz - power_supply: Prevent suspend until power supply events are processed (bnc#841596). -- commit 11b28da +- commit 50dfbd0 ------------------------------------------------------------------- Wed Sep 18 14:41:04 CEST 2013 - duwe@suse.de - Increase NR_CPUS on ppc64 to 2048 (fate#315438) -- commit 8a38aef +- commit ddaa978 ------------------------------------------------------------------- Tue Sep 17 19:55:19 CEST 2013 - jslaby@suse.cz - Update config files. Fix ZSWAP on vanillas. -- commit da42424 - -------------------------------------------------------------------- -Tue Sep 17 18:05:34 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Fix for Xen detection with --vanilla - When we hit the limit code to handle $SKIP_XEN and there aren't - any Xen patches to apply anyway, we'll fail because LIMIT is unset. -- commit 1d7b879 - -------------------------------------------------------------------- -Tue Sep 17 17:44:49 CEST 2013 - jeffm@suse.com - -- scripts/tar-up.sh: Disable Xen patches when Xen configs are disabled - Similar to the change for scripts/sequence-patch.sh, this change - disables the Xen patches with +noxen in series.conf when creating - the kernel-source package. -- commit 3104a04 - -------------------------------------------------------------------- -Tue Sep 17 17:14:19 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Skip Xen patches when Xen configs are disabled. - When updating the base kernel version, the Xen patches must be updated - separately. This allows us to skip the Xen patches until they're resynced - just by disabling the configs. -- commit d9673e9 +- commit 5a7a093 ------------------------------------------------------------------- Tue Sep 17 16:31:27 CEST 2013 - jeffm@suse.com @@ -475,7 +164,7 @@ Tue Sep 3 17:25:07 CEST 2013 - jeffm@suse.com Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 280c88e +- commit 7032523 ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -605,7 +294,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 43e5ff5 +- commit 3fb567f ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -826,7 +515,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 51c5edf +- commit 62a3621 ------------------------------------------------------------------- Thu Jun 27 18:09:43 CEST 2013 - mszeredi@suse.cz @@ -854,7 +543,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit d8f6242 +- commit 0fcc327 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -1030,7 +719,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit af248e4 +- commit ba8f987 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1165,7 +854,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 882120e +- commit 97197ff ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1377,12 +1066,11 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de -- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 958fe54 +- commit 5457ebe ------------------------------------------------------------------- Fri Apr 5 14:13:15 CEST 2013 - jbeulich@suse.com @@ -1464,7 +1152,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit b9fe3d9 +- commit 801a982 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1656,7 +1344,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit 09220ef +- commit b1aa50e ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -5109,25 +4797,6 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com - Update to 3.1-rc7. - commit ee8cc90 -------------------------------------------------------------------- -Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz - -- rpm/split-modules: Print the full path for modules missing in supported.conf -- commit e55e4c6 - -------------------------------------------------------------------- -Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz - -- Add support for wildcards in supported.conf -- rpm/kernel-binary.spec.in: Generate Module.supported with all - lines from supported conf, unsupported modules are marked as "no" -- rpm/split-modules: Use the supported flag in modules, instead of - parsing the Module.supported file and report modules that have no - supported marking. -- rpm/check-supported-list: Delete, this is done by split-modules - now. -- commit edfdc2a - ------------------------------------------------------------------- Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de @@ -9263,26 +8932,6 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). -------------------------------------------------------------------- -Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: - Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). -- commit a48fbdf - -------------------------------------------------------------------- -Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz - -- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that - obsolete kernel-kdump. -- commit 0a4f75b - -------------------------------------------------------------------- -Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. -- commit 0e039b7 - ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -9667,13 +9316,6 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. -------------------------------------------------------------------- -Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. -- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. -- commit bf55479 - ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-syms.spec b/kernel-syms.spec index d86e1143..2ae73a19 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -23,13 +23,9 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.11.6 +Version: 3.12.rc2 %if %using_buildservice -%if 0%{?is_kotd} -Release: .g2607707 -%else -Release: 0 -%endif +Release: .ga75f081 %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 @@ -39,33 +35,21 @@ Group: Development/Sources Url: http://www.kernel.org/ AutoReqProv: off BuildRequires: coreutils -%ifarch armv7hl -Requires: kernel-cubox-devel = %version-%source_rel -%endif -%ifarch aarch64 armv6hl armv7hl %ix86 ia64 ppc ppc64 s390x x86_64 +%ifarch %ix86 ppc ppc64 x86_64 Requires: kernel-default-devel = %version-%source_rel %endif %ifarch %ix86 x86_64 Requires: kernel-desktop-devel = %version-%source_rel %endif -%ifarch armv7hl -Requires: kernel-exynos-devel = %version-%source_rel -%endif -%ifarch armv7hl -Requires: kernel-lpae-devel = %version-%source_rel -%endif %ifarch %ix86 Requires: kernel-pae-devel = %version-%source_rel %endif -%ifarch %ix86 x86_64 -Requires: kernel-xen-devel = %version-%source_rel -%endif Provides: multiversion(kernel) Provides: %name = %version-%source_rel Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 aarch64 armv6hl armv7hl ia64 ppc ppc64 s390x x86_64 +ExclusiveArch: %ix86 ppc ppc64 x86_64 Prefix: /usr/src %description diff --git a/kernel-trace.changes b/kernel-trace.changes index 0baba158..fdc5d025 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,362 +1,51 @@ ------------------------------------------------------------------- -Wed Nov 6 14:54:28 CET 2013 - mhocko@suse.cz +Tue Sep 24 18:47:46 CEST 2013 - trenn@suse.de -- Fix a few incorrectly checked [io_]remap_pfn_range() calls - (bnc#849021, CVE-2013-4511). -- commit 2607707 +- Delete patches.arch/010-acpi_initrd_override_tables.patch. + This old one alone broke acpi initrd override -> delete it. +- commit a75f081 ------------------------------------------------------------------- -Wed Oct 30 19:04:18 CET 2013 - dsterba@suse.cz +Tue Sep 24 18:10:03 CEST 2013 - jeffm@suse.com -- Disable patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch - reference: bnc#848059 -- commit e6d4a27 +- lustre/lloop: don't change the logical size for the queue. +- commit 4a2006a ------------------------------------------------------------------- -Wed Oct 30 17:49:05 CET 2013 - tiwai@suse.de +Tue Sep 24 16:30:50 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops - (bnc#846531). -- commit 5b1b1d3 +- Update to 3.12-rc2. +- Eliminated 3 patches. +- commit d7d9943 ------------------------------------------------------------------- -Wed Oct 30 12:36:05 CET 2013 - tiwai@suse.de +Tue Sep 24 15:55:10 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add a fixup for ASUS N76VZ (bnc#846529). -- commit 8bd2042 - -------------------------------------------------------------------- -Mon Oct 28 10:31:59 CET 2013 - jbeulich@suse.com - -- Update EC2 config files. -- commit 81dd01f - -------------------------------------------------------------------- -Mon Oct 28 09:25:43 CET 2013 - jbeulich@suse.com - -- Refresh Xen patches (bnc#829682, bnc#842063). -- pcifront: Deal with toolstack missing 'XenbusStateClosing' - state. -- Update Xen patches to 3.11.6. -- commit 2339477 - -------------------------------------------------------------------- -Thu Oct 24 18:23:02 CEST 2013 - trenn@suse.de - -- cpufreq: ondemand: Change the calculation of target frequency - (bnc#846734). -- commit 0ba01b7 - -------------------------------------------------------------------- -Thu Oct 24 17:08:03 CEST 2013 - dsterba@suse.cz - -- Btrfs: fix negative qgroup tracking from owner accounting (bnc#821948) -- commit ef319f1 - -------------------------------------------------------------------- -Tue Oct 22 21:17:47 CEST 2013 - jeffm@suse.com - -- nouveau: Fix race with fence signaling (bnc#844177). -- commit 8d7989b - -------------------------------------------------------------------- -Fri Oct 18 22:19:21 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.6 (bnc#841645). -- Delete patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ. -- commit 9ca6827 - -------------------------------------------------------------------- -Mon Oct 14 18:45:32 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 (vanilla) -- commit 53efb9c - -------------------------------------------------------------------- -Mon Oct 14 18:21:41 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 -- commit 22f9877 - -------------------------------------------------------------------- -Mon Oct 14 17:34:08 CEST 2013 - jeffm@suse.com - -- btrfs: Fix creation of per-super sysfs directories when using multiple - subvolumes (bnc#845774). -- commit 0801062 - -------------------------------------------------------------------- -Mon Oct 14 10:57:07 CEST 2013 - oneukum@suse.de - -- sha256_ssse3: also test for BMI2 (bnc#842459). -- commit 626459d - -------------------------------------------------------------------- -Mon Oct 14 09:42:07 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.5. -- Delete - patches.suse/btrfs-0005-reset-ret-in-record_one_backref.patch. -- Delete - patches.suse/btrfs-0010-change-how-we-queue-blocks-for-backref-checkin.patch. -- Delete - patches.suse/btrfs-0022-skip-subvol-entries-when-checking-if-we-ve-cre.patch. -- Delete - patches.suse/btrfs-0033-remove-ourselves-from-the-cluster-list-under-l.patch. -- commit c00734a - -------------------------------------------------------------------- -Fri Oct 11 13:45:25 CEST 2013 - tiwai@suse.de - -- drm/i915: Undo the PIPEA quirk for i845 (bnc#845503). -- commit 61a06cb - -------------------------------------------------------------------- -Tue Oct 8 20:02:53 CEST 2013 - tiwai@suse.de - -- ALSA: hda - Add fixup for ASUS N56VZ (bnc#841645). -- commit a306dfb - -------------------------------------------------------------------- -Sat Oct 5 18:59:29 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.4. -- commit 40d7ca3 - -------------------------------------------------------------------- -Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Check module support only if the -extra package is requested -- commit add86bf - -------------------------------------------------------------------- -Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Remove unused options -- commit 3736315 - -------------------------------------------------------------------- -Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package - CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED -- commit 9e5b6fe - -------------------------------------------------------------------- -Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.3. -- Refresh patches.xen/xen3-patch-3.4. -- commit 485f0d1 - -------------------------------------------------------------------- -Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz - -- Always include the git commit in KOTD builds - This allows us not to set it explicitly in builds submitted to the - official distribution (bnc#821612, bnc#824171). -- commit a80e5ef - -------------------------------------------------------------------- -Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz - -- Btrfs: relocate csums properly with prealloc extents. -- commit cb5d5b5 - -------------------------------------------------------------------- -Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. - actually assign the divide result to hv_lapic_frequency -- commit 420e19b - -------------------------------------------------------------------- -Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 -- commit 221133c - -------------------------------------------------------------------- -Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are - versioned (bnc#821465). -- commit d802bf2 - -------------------------------------------------------------------- -Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) -- commit f5449e6 - -------------------------------------------------------------------- -Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes - for packages that were only seen in openSUSE releases up to 11.0. - (bnc#821465). -- commit 7e1f4b6 - -------------------------------------------------------------------- -Fri Sep 27 22:11:47 CEST 2013 - jeffm@suse.com - -- config: disable FB_UDL in favor of DRM_UDL (bnc#836782). -- commit 68c5865 - -------------------------------------------------------------------- -Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. -- commit 83e7e53 - -------------------------------------------------------------------- -Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de - -- X86: Hyper-V: Get the local APIC timer frequency from the - hypervisor. -- commit 4f400e1 - -------------------------------------------------------------------- -Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de - -- Input: add a driver to support Hyper-V synthetic keyboard - (fate#315887). -- Update config files. -- commit 7affb28 - -------------------------------------------------------------------- -Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors, rpm/mkspec: Add version information to obsolete - flavors (bnc#821465). -- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the - old-flavors file. -- commit 25c1b0d - -------------------------------------------------------------------- -Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors: Convert the old-packages.conf file to a flat - list. -- rpm/mkspec: Adjust. -- rpm/old-packages.conf: Delete. -- commit 4037e16 - -------------------------------------------------------------------- -Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz - -- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) -- commit 50c4c23 - -------------------------------------------------------------------- -Fri Sep 27 10:34:30 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.2. -- Refresh patches.xen/pci-guestdev. -- Refresh patches.xen/xen3-patch-2.6.27. -- Delete - patches.rpmify/powerpc-add-missing-include-to-book3s_xics-c. -- commit d1e8a21 - -------------------------------------------------------------------- -Fri Sep 27 10:29:30 CEST 2013 - jdelvare@suse.de - -- config/*/debug: Enable FSCACHE_DEBUG and CACHEFILES_DEBUG. -- commit 5068fbc - -------------------------------------------------------------------- -Thu Sep 26 17:32:40 CEST 2013 - rgoldwyn@suse.com - -- rpm/kernel-binary.spec.in: Remove Obsoletes ocfs2-kmp - This is done to enable install of ocfs2-kmp-* alongwith the - kernel until the patches are reviewed. -- commit 9d2b4ca - -------------------------------------------------------------------- -Thu Sep 26 16:10:40 CEST 2013 - jeffm@suse.com - -- config.conf: Re-enable s390x and ia64 configs -- commit adb564f - -------------------------------------------------------------------- -Thu Sep 26 16:10:27 CEST 2013 - jeffm@suse.com - -- patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation: - Updated Patch-mainline -- commit a1513a8 - -------------------------------------------------------------------- -Thu Sep 26 15:29:57 CEST 2013 - jdelvare@suse.de - -- Build gpio-ucb1400 as a module -- commit 68bb010 - -------------------------------------------------------------------- -Thu Sep 26 11:47:04 CEST 2013 - mmarek@suse.cz - -- Update README.BRANCH -- commit 4d432eb - -------------------------------------------------------------------- -Wed Sep 25 16:55:12 CEST 2013 - dsterba@suse.cz - -- Disable patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch -- commit e74b2a8 - -------------------------------------------------------------------- -Mon Sep 23 21:33:48 CEST 2013 - jeffm@suse.com - -- patches.suse/btrfs-add-per-super-attribute-publishing-to-sysfs: Fix issue where - the error case would still attempt to create sysfs dir. -- commit 129c02b +- Update to 3.12-rc1. +- Eliminated 42 patches. +- Xen is disabled. +- ARM is disabled. +- commit c58d853 ------------------------------------------------------------------- Fri Sep 20 21:16:16 CEST 2013 - jslaby@suse.cz - power_supply: Prevent suspend until power supply events are processed (bnc#841596). -- commit 11b28da +- commit 50dfbd0 ------------------------------------------------------------------- Wed Sep 18 14:41:04 CEST 2013 - duwe@suse.de - Increase NR_CPUS on ppc64 to 2048 (fate#315438) -- commit 8a38aef +- commit ddaa978 ------------------------------------------------------------------- Tue Sep 17 19:55:19 CEST 2013 - jslaby@suse.cz - Update config files. Fix ZSWAP on vanillas. -- commit da42424 - -------------------------------------------------------------------- -Tue Sep 17 18:05:34 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Fix for Xen detection with --vanilla - When we hit the limit code to handle $SKIP_XEN and there aren't - any Xen patches to apply anyway, we'll fail because LIMIT is unset. -- commit 1d7b879 - -------------------------------------------------------------------- -Tue Sep 17 17:44:49 CEST 2013 - jeffm@suse.com - -- scripts/tar-up.sh: Disable Xen patches when Xen configs are disabled - Similar to the change for scripts/sequence-patch.sh, this change - disables the Xen patches with +noxen in series.conf when creating - the kernel-source package. -- commit 3104a04 - -------------------------------------------------------------------- -Tue Sep 17 17:14:19 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Skip Xen patches when Xen configs are disabled. - When updating the base kernel version, the Xen patches must be updated - separately. This allows us to skip the Xen patches until they're resynced - just by disabling the configs. -- commit d9673e9 +- commit 5a7a093 ------------------------------------------------------------------- Tue Sep 17 16:31:27 CEST 2013 - jeffm@suse.com @@ -475,7 +164,7 @@ Tue Sep 3 17:25:07 CEST 2013 - jeffm@suse.com Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 280c88e +- commit 7032523 ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -605,7 +294,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 43e5ff5 +- commit 3fb567f ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -826,7 +515,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 51c5edf +- commit 62a3621 ------------------------------------------------------------------- Thu Jun 27 18:09:43 CEST 2013 - mszeredi@suse.cz @@ -854,7 +543,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit d8f6242 +- commit 0fcc327 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -1030,7 +719,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit af248e4 +- commit ba8f987 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1165,7 +854,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 882120e +- commit 97197ff ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1377,12 +1066,11 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de -- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 958fe54 +- commit 5457ebe ------------------------------------------------------------------- Fri Apr 5 14:13:15 CEST 2013 - jbeulich@suse.com @@ -1464,7 +1152,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit b9fe3d9 +- commit 801a982 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1656,7 +1344,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit 09220ef +- commit b1aa50e ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -5109,25 +4797,6 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com - Update to 3.1-rc7. - commit ee8cc90 -------------------------------------------------------------------- -Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz - -- rpm/split-modules: Print the full path for modules missing in supported.conf -- commit e55e4c6 - -------------------------------------------------------------------- -Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz - -- Add support for wildcards in supported.conf -- rpm/kernel-binary.spec.in: Generate Module.supported with all - lines from supported conf, unsupported modules are marked as "no" -- rpm/split-modules: Use the supported flag in modules, instead of - parsing the Module.supported file and report modules that have no - supported marking. -- rpm/check-supported-list: Delete, this is done by split-modules - now. -- commit edfdc2a - ------------------------------------------------------------------- Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de @@ -9263,26 +8932,6 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). -------------------------------------------------------------------- -Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: - Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). -- commit a48fbdf - -------------------------------------------------------------------- -Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz - -- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that - obsolete kernel-kdump. -- commit 0a4f75b - -------------------------------------------------------------------- -Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. -- commit 0e039b7 - ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -9667,13 +9316,6 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. -------------------------------------------------------------------- -Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. -- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. -- commit bf55479 - ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-trace.spec b/kernel-trace.spec index 858430b0..f189ee88 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.11 -%define patchversion 3.11.6 +%define srcversion 3.12-rc2 +%define patchversion 3.12.0-rc2 %define variant %{nil} %define vanilla_only 0 @@ -39,17 +39,17 @@ %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,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}) +%(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 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") -%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y") +%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") %ifarch %ix86 x86_64 %define install_vdso 1 @@ -59,12 +59,8 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.11.6 -%if 0%{?is_kotd} -Release: .g2607707 -%else -Release: 0 -%endif +Version: 3.12.rc2 +Release: .ga75f081 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -122,11 +118,19 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen +%ifarch %ix86 +%if %build_flavor != "ec2" +Provides: kernel-xenpae = %version +Obsoletes: kernel-xenpae < %version +%endif +%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl +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 @@ -145,11 +149,11 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel %ifarch ppc64 -Provides: kernel-kdump = 2.6.28 -Obsoletes: kernel-kdump <= 2.6.28 +Provides: kernel-kdump +Obsoletes: kernel-kdump %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -164,6 +168,7 @@ Source17: apply-patches Source21: config.conf Source23: supported.conf Source33: check-for-config-changes +Source34: check-supported-list Source35: group-source-files.pl Source37: README.SUSE Source38: README.KSYMS @@ -184,7 +189,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-flavors +Source62: old-packages.conf Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -209,7 +214,7 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ia64 ppc64 s390x x86_64 +ExclusiveArch: %ix86 ppc64 x86_64 %define kmp_target_cpu %_target_cpu %ifarch %ix86 # Only i386/default supports i586, mark other flavors' packages as i686 @@ -243,51 +248,31 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. -# Usage: obsolete_kmp -# Note that KMPs embed the version of the kernel built against, that's why -# the _3 suffix for 2.6.x-based KMPs -%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ -Provides: %1-kmp = %2 \ -Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -%obsolete_kmp iwlwifi 1.3.27_3 -%obsolete_kmp ipw3945 1.2.2_3 -# sled10 / 11.0 -%obsolete_kmp uvcvideo r200_3 +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor +# sles10 / 11.0 +Obsoletes: uvcvideo-kmp-%build_flavor +# 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 # sle11-ga -%obsolete_kmp enic 0.0.1_3 -%obsolete_kmp fnic 1.0.0_3 -%obsolete_kmp brocade-bfa 1.1.0.2_3 -%obsolete_kmp kvm 78.2.6.30.1_3 -%obsolete_kmp perfmon 2_3 -%obsolete_kmp iwlagn-2-6-27 1.0_3 -%obsolete_kmp msi-wmi 1.0_3 +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 # sle11 -%obsolete_kmp ocfs2 1.6_4 +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -%obsolete_kmp quickcam 0.6.7 -# sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -318,27 +303,16 @@ fi mkdir -p %kernel_build_dir -# Generate a list of modules with their support status marking -%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \ -awk ' - /^\+(base|yes) / { - print $(NF); - next; - } - /^\+external / { - print $(NF) " external"; - next; - } - /^[-+]/ { - print $(NF) " no"; - next; - } - { - print $(NF); - } -' >%kernel_build_dir/Module.supported -%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \ - sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base +supported_conf() { + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ + sed 's,.*/,,; s,\.ko$,,' | sort -u +} + +# Generate the list of modules to be marked as supported +{ supported_conf base + supported_conf --default=0 external | sed 's/$/ external/' +} > %kernel_build_dir/Module.supported +supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion @@ -683,6 +657,14 @@ if [ %CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ + %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then +%if %supported_modules_check + exit 1 +%endif + echo "Consistency check error: please update supported.conf." + fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -735,12 +717,10 @@ if [ %CONFIG_MODULES = y ]; then %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ -b %kernel_build_dir/Module.base \ -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" - -e \ -%endif %if ! %supported_modules_check - -i + -i \ %endif + -s %kernel_build_dir/Module.supported %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -893,7 +873,6 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd - %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 0baba158..fdc5d025 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,362 +1,51 @@ ------------------------------------------------------------------- -Wed Nov 6 14:54:28 CET 2013 - mhocko@suse.cz +Tue Sep 24 18:47:46 CEST 2013 - trenn@suse.de -- Fix a few incorrectly checked [io_]remap_pfn_range() calls - (bnc#849021, CVE-2013-4511). -- commit 2607707 +- Delete patches.arch/010-acpi_initrd_override_tables.patch. + This old one alone broke acpi initrd override -> delete it. +- commit a75f081 ------------------------------------------------------------------- -Wed Oct 30 19:04:18 CET 2013 - dsterba@suse.cz +Tue Sep 24 18:10:03 CEST 2013 - jeffm@suse.com -- Disable patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch - reference: bnc#848059 -- commit e6d4a27 +- lustre/lloop: don't change the logical size for the queue. +- commit 4a2006a ------------------------------------------------------------------- -Wed Oct 30 17:49:05 CET 2013 - tiwai@suse.de +Tue Sep 24 16:30:50 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops - (bnc#846531). -- commit 5b1b1d3 +- Update to 3.12-rc2. +- Eliminated 3 patches. +- commit d7d9943 ------------------------------------------------------------------- -Wed Oct 30 12:36:05 CET 2013 - tiwai@suse.de +Tue Sep 24 15:55:10 CEST 2013 - jeffm@suse.com -- ALSA: hda - Add a fixup for ASUS N76VZ (bnc#846529). -- commit 8bd2042 - -------------------------------------------------------------------- -Mon Oct 28 10:31:59 CET 2013 - jbeulich@suse.com - -- Update EC2 config files. -- commit 81dd01f - -------------------------------------------------------------------- -Mon Oct 28 09:25:43 CET 2013 - jbeulich@suse.com - -- Refresh Xen patches (bnc#829682, bnc#842063). -- pcifront: Deal with toolstack missing 'XenbusStateClosing' - state. -- Update Xen patches to 3.11.6. -- commit 2339477 - -------------------------------------------------------------------- -Thu Oct 24 18:23:02 CEST 2013 - trenn@suse.de - -- cpufreq: ondemand: Change the calculation of target frequency - (bnc#846734). -- commit 0ba01b7 - -------------------------------------------------------------------- -Thu Oct 24 17:08:03 CEST 2013 - dsterba@suse.cz - -- Btrfs: fix negative qgroup tracking from owner accounting (bnc#821948) -- commit ef319f1 - -------------------------------------------------------------------- -Tue Oct 22 21:17:47 CEST 2013 - jeffm@suse.com - -- nouveau: Fix race with fence signaling (bnc#844177). -- commit 8d7989b - -------------------------------------------------------------------- -Fri Oct 18 22:19:21 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.6 (bnc#841645). -- Delete patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ. -- commit 9ca6827 - -------------------------------------------------------------------- -Mon Oct 14 18:45:32 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 (vanilla) -- commit 53efb9c - -------------------------------------------------------------------- -Mon Oct 14 18:21:41 CEST 2013 - jeffm@suse.com - -- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 -- commit 22f9877 - -------------------------------------------------------------------- -Mon Oct 14 17:34:08 CEST 2013 - jeffm@suse.com - -- btrfs: Fix creation of per-super sysfs directories when using multiple - subvolumes (bnc#845774). -- commit 0801062 - -------------------------------------------------------------------- -Mon Oct 14 10:57:07 CEST 2013 - oneukum@suse.de - -- sha256_ssse3: also test for BMI2 (bnc#842459). -- commit 626459d - -------------------------------------------------------------------- -Mon Oct 14 09:42:07 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.5. -- Delete - patches.suse/btrfs-0005-reset-ret-in-record_one_backref.patch. -- Delete - patches.suse/btrfs-0010-change-how-we-queue-blocks-for-backref-checkin.patch. -- Delete - patches.suse/btrfs-0022-skip-subvol-entries-when-checking-if-we-ve-cre.patch. -- Delete - patches.suse/btrfs-0033-remove-ourselves-from-the-cluster-list-under-l.patch. -- commit c00734a - -------------------------------------------------------------------- -Fri Oct 11 13:45:25 CEST 2013 - tiwai@suse.de - -- drm/i915: Undo the PIPEA quirk for i845 (bnc#845503). -- commit 61a06cb - -------------------------------------------------------------------- -Tue Oct 8 20:02:53 CEST 2013 - tiwai@suse.de - -- ALSA: hda - Add fixup for ASUS N56VZ (bnc#841645). -- commit a306dfb - -------------------------------------------------------------------- -Sat Oct 5 18:59:29 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.4. -- commit 40d7ca3 - -------------------------------------------------------------------- -Fri Oct 4 13:04:43 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Check module support only if the -extra package is requested -- commit add86bf - -------------------------------------------------------------------- -Fri Oct 4 13:02:48 CEST 2013 - mmarek@suse.cz - -- rpm/split-modules: Remove unused options -- commit 3736315 - -------------------------------------------------------------------- -Fri Oct 4 12:57:44 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Fix creating the kernel-*-extra package - CONFIG_ENTERPRISE_SUPPORT has been renamed to CONFIG_SUSE_KERNEL_SUPPORTED -- commit 9e5b6fe - -------------------------------------------------------------------- -Wed Oct 2 07:54:02 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.3. -- Refresh patches.xen/xen3-patch-3.4. -- commit 485f0d1 - -------------------------------------------------------------------- -Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz - -- Always include the git commit in KOTD builds - This allows us not to set it explicitly in builds submitted to the - official distribution (bnc#821612, bnc#824171). -- commit a80e5ef - -------------------------------------------------------------------- -Mon Sep 30 13:49:46 CEST 2013 - dsterba@suse.cz - -- Btrfs: relocate csums properly with prealloc extents. -- commit cb5d5b5 - -------------------------------------------------------------------- -Sat Sep 28 18:00:10 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. - actually assign the divide result to hv_lapic_frequency -- commit 420e19b - -------------------------------------------------------------------- -Fri Sep 27 23:46:35 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Add obsolete KMPs from sle11-sp1 -- commit 221133c - -------------------------------------------------------------------- -Fri Sep 27 23:16:48 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Make sure that all KMP obsoletes are - versioned (bnc#821465). -- commit d802bf2 - -------------------------------------------------------------------- -Fri Sep 27 23:07:09 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Provide obsoleted KMPs (bnc#753353) -- commit f5449e6 - -------------------------------------------------------------------- -Fri Sep 27 22:59:13 CEST 2013 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in: Remove unversioned provides/obsoletes - for packages that were only seen in openSUSE releases up to 11.0. - (bnc#821465). -- commit 7e1f4b6 - -------------------------------------------------------------------- -Fri Sep 27 22:11:47 CEST 2013 - jeffm@suse.com - -- config: disable FB_UDL in favor of DRM_UDL (bnc#836782). -- commit 68c5865 - -------------------------------------------------------------------- -Fri Sep 27 18:13:45 CEST 2013 - ohering@suse.de - -- Refresh - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch. -- commit 83e7e53 - -------------------------------------------------------------------- -Fri Sep 27 16:24:13 CEST 2013 - ohering@suse.de - -- X86: Hyper-V: Get the local APIC timer frequency from the - hypervisor. -- commit 4f400e1 - -------------------------------------------------------------------- -Fri Sep 27 16:22:49 CEST 2013 - ohering@suse.de - -- Input: add a driver to support Hyper-V synthetic keyboard - (fate#315887). -- Update config files. -- commit 7affb28 - -------------------------------------------------------------------- -Fri Sep 27 14:52:18 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors, rpm/mkspec: Add version information to obsolete - flavors (bnc#821465). -- rpm/kernel-binary.spec.in: Move the xenpae obsolete to the - old-flavors file. -- commit 25c1b0d - -------------------------------------------------------------------- -Fri Sep 27 14:09:37 CEST 2013 - mmarek@suse.cz - -- rpm/old-flavors: Convert the old-packages.conf file to a flat - list. -- rpm/mkspec: Adjust. -- rpm/old-packages.conf: Delete. -- commit 4037e16 - -------------------------------------------------------------------- -Fri Sep 27 13:20:24 CEST 2013 - mmarek@suse.cz - -- rpm/old-packages.conf: Drop bogus obsoletes for "smp" (bnc#821465) -- commit 50c4c23 - -------------------------------------------------------------------- -Fri Sep 27 10:34:30 CEST 2013 - jslaby@suse.cz - -- Linux 3.11.2. -- Refresh patches.xen/pci-guestdev. -- Refresh patches.xen/xen3-patch-2.6.27. -- Delete - patches.rpmify/powerpc-add-missing-include-to-book3s_xics-c. -- commit d1e8a21 - -------------------------------------------------------------------- -Fri Sep 27 10:29:30 CEST 2013 - jdelvare@suse.de - -- config/*/debug: Enable FSCACHE_DEBUG and CACHEFILES_DEBUG. -- commit 5068fbc - -------------------------------------------------------------------- -Thu Sep 26 17:32:40 CEST 2013 - rgoldwyn@suse.com - -- rpm/kernel-binary.spec.in: Remove Obsoletes ocfs2-kmp - This is done to enable install of ocfs2-kmp-* alongwith the - kernel until the patches are reviewed. -- commit 9d2b4ca - -------------------------------------------------------------------- -Thu Sep 26 16:10:40 CEST 2013 - jeffm@suse.com - -- config.conf: Re-enable s390x and ia64 configs -- commit adb564f - -------------------------------------------------------------------- -Thu Sep 26 16:10:27 CEST 2013 - jeffm@suse.com - -- patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation: - Updated Patch-mainline -- commit a1513a8 - -------------------------------------------------------------------- -Thu Sep 26 15:29:57 CEST 2013 - jdelvare@suse.de - -- Build gpio-ucb1400 as a module -- commit 68bb010 - -------------------------------------------------------------------- -Thu Sep 26 11:47:04 CEST 2013 - mmarek@suse.cz - -- Update README.BRANCH -- commit 4d432eb - -------------------------------------------------------------------- -Wed Sep 25 16:55:12 CEST 2013 - dsterba@suse.cz - -- Disable patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch -- commit e74b2a8 - -------------------------------------------------------------------- -Mon Sep 23 21:33:48 CEST 2013 - jeffm@suse.com - -- patches.suse/btrfs-add-per-super-attribute-publishing-to-sysfs: Fix issue where - the error case would still attempt to create sysfs dir. -- commit 129c02b +- Update to 3.12-rc1. +- Eliminated 42 patches. +- Xen is disabled. +- ARM is disabled. +- commit c58d853 ------------------------------------------------------------------- Fri Sep 20 21:16:16 CEST 2013 - jslaby@suse.cz - power_supply: Prevent suspend until power supply events are processed (bnc#841596). -- commit 11b28da +- commit 50dfbd0 ------------------------------------------------------------------- Wed Sep 18 14:41:04 CEST 2013 - duwe@suse.de - Increase NR_CPUS on ppc64 to 2048 (fate#315438) -- commit 8a38aef +- commit ddaa978 ------------------------------------------------------------------- Tue Sep 17 19:55:19 CEST 2013 - jslaby@suse.cz - Update config files. Fix ZSWAP on vanillas. -- commit da42424 - -------------------------------------------------------------------- -Tue Sep 17 18:05:34 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Fix for Xen detection with --vanilla - When we hit the limit code to handle $SKIP_XEN and there aren't - any Xen patches to apply anyway, we'll fail because LIMIT is unset. -- commit 1d7b879 - -------------------------------------------------------------------- -Tue Sep 17 17:44:49 CEST 2013 - jeffm@suse.com - -- scripts/tar-up.sh: Disable Xen patches when Xen configs are disabled - Similar to the change for scripts/sequence-patch.sh, this change - disables the Xen patches with +noxen in series.conf when creating - the kernel-source package. -- commit 3104a04 - -------------------------------------------------------------------- -Tue Sep 17 17:14:19 CEST 2013 - jeffm@suse.com - -- scripts/sequence-patch.sh: Skip Xen patches when Xen configs are disabled. - When updating the base kernel version, the Xen patches must be updated - separately. This allows us to skip the Xen patches until they're resynced - just by disabling the configs. -- commit d9673e9 +- commit 5a7a093 ------------------------------------------------------------------- Tue Sep 17 16:31:27 CEST 2013 - jeffm@suse.com @@ -475,7 +164,7 @@ Tue Sep 3 17:25:07 CEST 2013 - jeffm@suse.com Tue Aug 27 21:34:49 CEST 2013 - jeffm@suse.com - rpm/kernel-docs.spec.in: Fix missing whitespace error in description -- commit 280c88e +- commit 7032523 ------------------------------------------------------------------- Tue Aug 27 15:32:27 CEST 2013 - jeffm@suse.com @@ -605,7 +294,7 @@ Thu Jul 25 02:08:31 CEST 2013 - jeffm@suse.com - rpm/kernel-binary.spec.in: Obsolete microcode_ctl The kernel can request CPU microcode itself now and microcode_ctl is no longer required. -- commit 43e5ff5 +- commit 3fb567f ------------------------------------------------------------------- Thu Jul 25 00:51:31 CEST 2013 - jeffm@suse.com @@ -826,7 +515,7 @@ Sat Jun 29 12:59:07 CEST 2013 - dmueller@suse.com targets from the openSUSE ARM portfolio. Add a armv6hl default kernel flavor and remove traces of armv5tel. -- commit 51c5edf +- commit 62a3621 ------------------------------------------------------------------- Thu Jun 27 18:09:43 CEST 2013 - mszeredi@suse.cz @@ -854,7 +543,7 @@ Thu Jun 27 17:14:19 CEST 2013 - jeffm@suse.com Thu Jun 27 09:33:57 CEST 2013 - guillaume.gardet@oliseo.fr - arm: build lpae kernel as zImage -- commit d8f6242 +- commit 0fcc327 ------------------------------------------------------------------- Wed Jun 26 23:16:51 CEST 2013 - jeffm@suse.com @@ -1030,7 +719,7 @@ Wed May 22 10:58:24 CEST 2013 - schwab@suse.de - Update group-source-files.pl to handle symlink to directory Also add arch/[^/]+/boot/dts/include/dt-bindings to the list of devel files and avoid listing README.SUSE twice. -- commit af248e4 +- commit ba8f987 ------------------------------------------------------------------- Tue May 21 14:44:17 CEST 2013 - jeffm@suse.com @@ -1165,7 +854,7 @@ Tue May 7 18:35:02 CEST 2013 - dmueller@suse.com (which is the default for our openSUSE 12.3 release), needs more header files from the machine specific directories to be included in kernel-devel. -- commit 882120e +- commit 97197ff ------------------------------------------------------------------- Tue May 7 16:32:41 CEST 2013 - jslaby@suse.cz @@ -1377,12 +1066,11 @@ Sun Apr 7 14:04:19 CEST 2013 - agraf@suse.de ------------------------------------------------------------------- Sun Apr 7 13:25:33 CEST 2013 - agraf@suse.de -- rpm/package-descriptions: add lpae config for ARM - ARM: Update config files (fix default, split out lpae). - ARM: xen: Add missing define. - config.conf: add lpae config for ARM - rpm/package-descriptions: add lpae config for ARM -- commit 958fe54 +- commit 5457ebe ------------------------------------------------------------------- Fri Apr 5 14:13:15 CEST 2013 - jbeulich@suse.com @@ -1464,7 +1152,7 @@ Wed Mar 27 22:11:11 CET 2013 - mmarek@suse.cz Tue Mar 26 12:35:11 CET 2013 - agraf@suse.de - Delete config/armv7hl/u8500. -- commit b9fe3d9 +- commit 801a982 ------------------------------------------------------------------- Mon Mar 25 16:23:30 CET 2013 - jeffm@suse.com @@ -1656,7 +1344,7 @@ Fri Mar 1 14:02:28 CET 2013 - jslaby@suse.cz Thu Feb 28 19:42:40 CET 2013 - agraf@suse.de - Add AArch64 support -- commit 09220ef +- commit b1aa50e ------------------------------------------------------------------- Thu Feb 28 17:24:08 CET 2013 - jslaby@suse.cz @@ -5109,25 +4797,6 @@ Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com - Update to 3.1-rc7. - commit ee8cc90 -------------------------------------------------------------------- -Thu Sep 22 11:18:31 CEST 2011 - mmarek@suse.cz - -- rpm/split-modules: Print the full path for modules missing in supported.conf -- commit e55e4c6 - -------------------------------------------------------------------- -Wed Sep 21 16:33:53 CEST 2011 - mmarek@suse.cz - -- Add support for wildcards in supported.conf -- rpm/kernel-binary.spec.in: Generate Module.supported with all - lines from supported conf, unsupported modules are marked as "no" -- rpm/split-modules: Use the supported flag in modules, instead of - parsing the Module.supported file and report modules that have no - supported marking. -- rpm/check-supported-list: Delete, this is done by split-modules - now. -- commit edfdc2a - ------------------------------------------------------------------- Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de @@ -9263,26 +8932,6 @@ Mon Apr 19 21:21:26 CEST 2010 - jeffm@suse.de x86/apbt: conditionally register cpu hp notifier for apbt (bko#15786). -------------------------------------------------------------------- -Fri Apr 16 12:29:31 CEST 2010 - mmarek@suse.cz - -- rpm/kernel-binary.spec.in, rpm/mkspec, rpm/old-packages.conf: - Obsolete kernel-vmi-base by kernel-pae-base (bnc#594271). -- commit a48fbdf - -------------------------------------------------------------------- -Fri Apr 16 12:22:06 CEST 2010 - mmarek@suse.cz - -- rpm/mkspec, rpm/old-packages.conf: Explicitly list ppc64 flavors that - obsolete kernel-kdump. -- commit 0a4f75b - -------------------------------------------------------------------- -Fri Apr 16 12:12:12 CEST 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: s390(x) provides/obsoletes not needed anymore. -- commit 0e039b7 - ------------------------------------------------------------------- Thu Apr 15 15:13:15 CEST 2010 - jbeulich@novell.com @@ -9667,13 +9316,6 @@ Wed Mar 10 00:03:12 CET 2010 - jeffm@suse.de - Added new doc/config-options.changes to document configuration changes. -------------------------------------------------------------------- -Tue Mar 9 14:36:48 CET 2010 - mmarek@suse.cz - -- rpm/old-packages.conf: Obsolete kernel-vmi by kernel-default. -- rpm/kernel-module-subpackage: Also obsolete vmi KMPs. -- commit bf55479 - ------------------------------------------------------------------- Tue Mar 9 13:57:49 CET 2010 - mmarek@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 57d85af9..afbb22a7 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.11 -%define patchversion 3.11.6 +%define srcversion 3.12-rc2 +%define patchversion 3.12.0-rc2 %define variant %{nil} %define vanilla_only 0 @@ -39,17 +39,17 @@ %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,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}) +%(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 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT CONFIG_EFI_STUB %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_base (%CONFIG_SPLIT_PACKAGE == "y") -%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y") +%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y") %ifarch %ix86 x86_64 %define install_vdso 1 @@ -59,12 +59,8 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -Version: 3.11.6 -%if 0%{?is_kotd} -Release: .g2607707 -%else -Release: 0 -%endif +Version: 3.12.rc2 +Release: .ga75f081 License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ @@ -122,11 +118,19 @@ BuildRequires: dwarfextract BuildRequires: u-boot-tools %endif %if %build_xen +%ifarch %ix86 +%if %build_flavor != "ec2" +Provides: kernel-xenpae = %version +Obsoletes: kernel-xenpae < %version +%endif +%endif #!BuildIgnore: xen %endif Obsoletes: microcode_ctl +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 @@ -146,7 +150,7 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -161,6 +165,7 @@ Source17: apply-patches Source21: config.conf Source23: supported.conf Source33: check-for-config-changes +Source34: check-supported-list Source35: group-source-files.pl Source37: README.SUSE Source38: README.KSYMS @@ -181,7 +186,7 @@ Source56: kernel-docs.spec.in Source57: kernel-cert-subpackage Source60: config.sh Source61: compute-PATCHVERSION.sh -Source62: old-flavors +Source62: old-packages.conf Source63: arch-symbols Source64: package-descriptions Source65: kernel-spec-macros @@ -206,7 +211,7 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ia64 ppc ppc64 s390x x86_64 +ExclusiveArch: %ix86 ppc ppc64 x86_64 %define kmp_target_cpu %_target_cpu %ifarch %ix86 # Only i386/default supports i586, mark other flavors' packages as i686 @@ -240,51 +245,31 @@ NoSource: 121 # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. -# Usage: obsolete_kmp -# Note that KMPs embed the version of the kernel built against, that's why -# the _3 suffix for 2.6.x-based KMPs -%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \ -Provides: %1-kmp = %2 \ -Provides: %1-kmp-%build_flavor = %2 # sles10 / 10.3 -%obsolete_kmp iwlwifi 1.3.27_3 -%obsolete_kmp ipw3945 1.2.2_3 -# sled10 / 11.0 -%obsolete_kmp uvcvideo r200_3 +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor +# sles10 / 11.0 +Obsoletes: uvcvideo-kmp-%build_flavor +# 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 # sle11-ga -%obsolete_kmp enic 0.0.1_3 -%obsolete_kmp fnic 1.0.0_3 -%obsolete_kmp brocade-bfa 1.1.0.2_3 -%obsolete_kmp kvm 78.2.6.30.1_3 -%obsolete_kmp perfmon 2_3 -%obsolete_kmp iwlagn-2-6-27 1.0_3 -%obsolete_kmp msi-wmi 1.0_3 +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 # sle11 -%obsolete_kmp ocfs2 1.6_4 +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -%obsolete_kmp quickcam 0.6.7 -# sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -315,27 +300,16 @@ fi mkdir -p %kernel_build_dir -# Generate a list of modules with their support status marking -%_sourcedir/guards --list --with-guards <%_sourcedir/supported.conf | \ -awk ' - /^\+(base|yes) / { - print $(NF); - next; - } - /^\+external / { - print $(NF) " external"; - next; - } - /^[-+]/ { - print $(NF) " no"; - next; - } - { - print $(NF); - } -' >%kernel_build_dir/Module.supported -%_sourcedir/guards --default=0 base < %_sourcedir/supported.conf | \ - sed 's,.*/,,; s,\.ko$,,' | sort -u >%kernel_build_dir/Module.base +supported_conf() { + %_sourcedir/guards $* < %_sourcedir/supported.conf | \ + sed 's,.*/,,; s,\.ko$,,' | sort -u +} + +# Generate the list of modules to be marked as supported +{ supported_conf base + supported_conf --default=0 external | sed 's/$/ external/' +} > %kernel_build_dir/Module.supported +supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion @@ -680,6 +654,14 @@ if [ %CONFIG_MODULES = y ]; then make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot + if ! %_sourcedir/check-supported-list \ + %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then +%if %supported_modules_check + exit 1 +%endif + echo "Consistency check error: please update supported.conf." + fi + %ifarch s390 s390x if test -e arch/s390/boot/kerntypes.o; then : @@ -732,12 +714,10 @@ if [ %CONFIG_MODULES = y ]; then %_sourcedir/split-modules -d %buildroot \ -o %my_builddir \ -b %kernel_build_dir/Module.base \ -%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y" - -e \ -%endif %if ! %supported_modules_check - -i + -i \ %endif + -s %kernel_build_dir/Module.supported %if ! %split_extra cat %my_builddir/unsupported-modules >>%my_builddir/main-modules %endif @@ -890,7 +870,6 @@ Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader Requires(post): mkinitrd - %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif diff --git a/linux-3.12-rc2.tar.bz2 b/linux-3.12-rc2.tar.bz2 new file mode 100644 index 00000000..33c76760 --- /dev/null +++ b/linux-3.12-rc2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0b60b0baf376d136884820d278a83018209b7ae2c32aa2084f00dae75693741 +size 91066850 diff --git a/patches.apparmor.tar.bz2 b/patches.apparmor.tar.bz2 index 94aea39a..740efb42 100644 --- a/patches.apparmor.tar.bz2 +++ b/patches.apparmor.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c71439113c44288244bb59b769f24a75f2c1c40866c17b412364345289a5caa4 -size 6642 +oid sha256:9ceb66c80b2f09f5134931e1080bf77f6db663200c0ab5ccbc3130732fb5874e +size 5138 diff --git a/patches.arch.tar.bz2 b/patches.arch.tar.bz2 index e0192942..457745ae 100644 --- a/patches.arch.tar.bz2 +++ b/patches.arch.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4421f38bd077c7209a685d669fea3a3402c3d6bbb8ad36781633ad6260cdf1c2 -size 156008 +oid sha256:43feff7c42bba3634d7c7eb505b9ba45c8a36d6d5240ac454555b4defd6b7306 +size 155123 diff --git a/patches.drivers.tar.bz2 b/patches.drivers.tar.bz2 index 84f32b30..f9c621d1 100644 --- a/patches.drivers.tar.bz2 +++ b/patches.drivers.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:706796a645bdbdbeb25600a75e0476fd09eac02a3a0296380eb051b58a99fc7b -size 6194 +oid sha256:1e4879f3b1103b28f9e6f247d01b8313c6b53ef33d6ee9ef574be5381c5b1569 +size 3435 diff --git a/patches.fixes.tar.bz2 b/patches.fixes.tar.bz2 index 565e255a..7964b4aa 100644 --- a/patches.fixes.tar.bz2 +++ b/patches.fixes.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdd1f7c018aee3c891dbf8b2652e17f53edd518d0d3281f068192d1ac312c3c7 -size 32166 +oid sha256:e280fb8c17dac24b6b677c064b51ebb1660da3517c30303b28fd57f1d4098515 +size 12543 diff --git a/patches.kernel.org.tar.bz2 b/patches.kernel.org.tar.bz2 index 53e1733d..3f8741cd 100644 --- a/patches.kernel.org.tar.bz2 +++ b/patches.kernel.org.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffe448720a61c9a5fb9012e0ead2c78a4943d442cd050c1badfac19f5593ea40 -size 153542 +oid sha256:ee18541c0eac40ab98a3cc2afffb20d24e6531f3cdbb7990b74d2deb7c88225b +size 133 diff --git a/patches.rpmify.tar.bz2 b/patches.rpmify.tar.bz2 index a0c6e2c7..b07415a2 100644 --- a/patches.rpmify.tar.bz2 +++ b/patches.rpmify.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80fd1477b3c75ba2908e500bed0f592e7b3c4d145f801043dcdfb344c5fba51b -size 3695 +oid sha256:dfc706980084eb47da8203f6168001fba4c3d3f193d5961204a2c9a5aa209dd5 +size 3802 diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index 81ebb71d..d9420257 100644 --- a/patches.suse.tar.bz2 +++ b/patches.suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dca1e38d24c9f3fa67c537e701e50214f498ae9d3d597386c808101278ca48db -size 146052 +oid sha256:82a138957f99a96e1f21883185c0741810b3294f65f6cbaaf35324496c9a2784 +size 123310 diff --git a/series.conf b/series.conf index e84d61c1..cee55e12 100644 --- a/series.conf +++ b/series.conf @@ -27,21 +27,15 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## - patches.kernel.org/patch-3.11.1 - patches.kernel.org/patch-3.11.1-2 - patches.kernel.org/patch-3.11.2-3 - patches.kernel.org/patch-3.11.3-4 - patches.kernel.org/patch-3.11.4-5 - patches.kernel.org/patch-3.11.5-6 ######################################################## # Build fixes that apply to the vanilla kernel too. # Patches in patches.rpmify are applied to both -vanilla # and patched flavors. ######################################################## - patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation patches.rpmify/nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo patches.rpmify/chipidea-clean-up-dependencies + patches.rpmify/lustre-lloop-dont-change-logical-size ######################################################## # kABI consistency patches @@ -115,8 +109,6 @@ +needs_update patches.arch/kvm-split-the-KVM-pv-ops-support-by-feature +needs_update patches.arch/kvm-replace-kvm-io-delay-pv-ops-with-linux-magic - patches.fixes/0001-sha256_ssse3-also-test-for-BMI2.patch - ######################################################## # x86 MCE/MCA (Machine Check Error/Architecture) extensions ######################################################## @@ -159,7 +151,6 @@ +needs_update patches.arch/arm-exynos-nosparse.patch patches.arch/arm-OMAP-Fix-missing-cm3xxx.h-include.patch patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch - patches.arch/arm-imx-usb.patch patches.arch/arm-omap3isp.patch # Compile fix for Xen on ARM with our Xen patches applied @@ -214,14 +205,11 @@ patches.arch/acpi_thermal_passive_blacklist.patch - patches.arch/010-acpi_initrd_override_tables.patch - ######################################################## # CPUFREQ ######################################################## +trenn patches.fixes/cpufreq_ondemand_performance_optimise_default_settings.patch - patches.fixes/cpufreq_performance_tuning.patch ## cpuidle perf events cleanups and related patches.arch/perf_timechart_fix_zero_timestamps.patch @@ -233,10 +221,7 @@ ######################################################## # Suse specific stuff ######################################################## - patches.suse/suse-hv-Drivers-hv-util-Fix-a-bug-in-version-negotiation-cod.patch patches.suse/suse-hv-Drivers-hv-util-Fix-a-bug-in-util-version-negotiatio.patch - patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch - patches.suse/suse-hv-Input-add-a-driver-to-support-Hyper-V-synthetic-keyb.patch ######################################################## # Networking, IPv6 @@ -269,41 +254,8 @@ # btrfs ######################################################## patches.suse/btrfs-use-correct-device-for-maps.patch - patches.suse/btrfs-fall-back-to-global-reservation-when-removing-subvolumes patches.suse/btrfs-check-index-in-extent_buffer_page - patches.suse/btrfs-0001-Release-uuid_mutex-for-shrink-during-device-de.patch - patches.suse/btrfs-0002-add-missing-error-checks-to-add_data_reference.patch - patches.suse/btrfs-0003-set-qgroup_ulist-to-be-null-after-calling-ulis.patch - patches.suse/btrfs-0004-fix-get-set-label-blocking-against-balance.patch - patches.suse/btrfs-0006-cleanup-reloc-roots-properly-on-error.patch - patches.suse/btrfs-0007-don-t-bother-autodefragging-if-our-root-is-goi.patch - patches.suse/btrfs-0008-use-u64-for-subvolid-when-parsing-mount-option.patch - patches.suse/btrfs-0009-add-missing-mounting-options-in-btrfs_show_opt.patch - patches.suse/btrfs-0011-don-t-bug_on-when-we-fail-when-cleaning-up-tra.patch - patches.suse/btrfs-0012-add-missing-error-check-to-find_parent_nodes.patch - patches.suse/btrfs-0013-add-missing-error-handling-to-read_tree_block.patch - patches.suse/btrfs-0014-handle-errors-when-doing-slow-caching.patch - patches.suse/btrfs-0015-check-our-parent-dir-when-doing-a-compare-send.patch - patches.suse/btrfs-0016-deal-with-enomem-in-the-rewind-path.patch - patches.suse/btrfs-0017-stop-using-GFP_ATOMIC-when-allocating-rewind-e.patch - patches.suse/btrfs-0018-fix-inode-leak-on-kmalloc-failure-in-tree-log..patch - patches.suse/btrfs-0019-don-t-ignore-errors-from-btrfs_run_delayed_ite.patch - patches.suse/btrfs-0020-return-ENOSPC-when-target-space-is-full.patch - patches.suse/btrfs-0021-fix-possible-memory-leak-in-find_parent_nodes.patch - patches.suse/btrfs-0023-don-t-allow-a-subvol-to-be-deleted-if-it-is-th.patch - patches.suse/btrfs-0024-fix-the-error-handling-wrt-orphan-items.patch - patches.suse/btrfs-0025-fix-heavy-delalloc-related-deadlock.patch - patches.suse/btrfs-0026-fix-oops-when-writing-dirty-qgroups-to-disk.patch - patches.suse/btrfs-0027-move-btrfs_free_qgroup_config-out-of-spin_lock.patch - patches.suse/btrfs-0028-add-missing-error-code-to-btrfs_IOC_INO_LOOKUP.patch - patches.suse/btrfs-0029-don-t-miss-inode-ref-items-in-btrfs_IOC_INO_LO.patch - patches.suse/btrfs-0030-fix-memory-leak-of-orphan-block-rsv.patch - patches.suse/btrfs-0031-fix-printing-of-non-NULL-terminated-string.patch - patches.suse/btrfs-0032-do-not-clear-our-orphan-item-runtime-flag-on-e.patch -+dsterba patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch - patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch -+dsterba patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch patches.suse/btrfs-use-end-trans-in-label-ioctl patches.suse/btrfs-add-ability-to-query-change-feature-bits-online-ioctl patches.suse/introduce-kobj_completion @@ -317,9 +269,6 @@ ######################################################## # Reiserfs Patches ######################################################## - patches.fixes/reiserfs-locking-push-write-lock-out-of-xattr-code - patches.fixes/reiserfs-locking-handle-nested-locks-properly - patches.fixes/reiserfs-locking-release-lock-around-quota-operations ######################################################## # dlm @@ -422,10 +371,8 @@ ######################################################## # DRM/Video ######################################################## - patches.drivers/drm-i915-Undo-the-PIPEA-quirk-for-i845 patches.drivers/drm-cirrus-Correct-register-values-for-16bpp patches.drivers/drm-cirrus-Use-16bpp-as-default - patches.fixes/nouveau-fix-race-with-fence-signaling ######################################################## # video4linux @@ -435,7 +382,6 @@ # Network ######################################################## patches.fixes/tulip-quad-NIC-ifdown - patches.drivers/ehea-modinfo.patch ######################################################## # Wireless Networking @@ -477,8 +423,6 @@ ########################################################## # Sound ########################################################## - patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ - patches.drivers/ALSA-hda-Add-extra-chmap-for-2.1-outputs-on-ASUS-lap ######################################################## # Char / serial @@ -491,8 +435,6 @@ # Needs updating WRT d27769ec (block: add GENHD_FL_NO_PART_SCAN) +hare patches.suse/no-partition-scan - patches.drivers/gpio-ucb1400-can-be-built-as-a-module.patch - patches.fixes/power_supply-Prevent-suspend-until-power-supply-even.patch ######################################################## # Other drivers we have added to the tree @@ -528,7 +470,6 @@ # Security stuff # ########################################################## - patches.fixes/Fix-a-few-incorrectly-checked-io_-remap_pfn_range-ca.patch ########################################################## # Audit @@ -538,7 +479,7 @@ # AppArmor ########################################################## patches.apparmor/apparmor-compatibility-patch-for-v5-network-control - patches.apparmor/apparmor-profiles-seq_file +# patches.apparmor/apparmor-profiles-seq_file ######################################################## # Address space layout randomization @@ -603,127 +544,124 @@ # re-basing to a newer xen tree. # # split out patches - patches.xen/kexec-move-segment-code-i386.patch - patches.xen/kexec-move-segment-code-x86_64.patch - patches.xen/ipv6-no-autoconf - patches.xen/pci-guestdev - patches.xen/pci-reserve ++noxen patches.xen/kexec-move-segment-code-i386.patch ++noxen patches.xen/kexec-move-segment-code-x86_64.patch ++noxen patches.xen/ipv6-no-autoconf ++noxen patches.xen/pci-guestdev ++noxen patches.xen/pci-reserve # bulk stuff, new files for xen - patches.xen/xen3-auto-xen-arch.diff - patches.xen/xen3-auto-xen-drivers.diff - patches.xen/xen3-auto-include-xen-interface.diff - patches.xen/xen3-auto-blktap2-pvops.diff ++noxen patches.xen/xen3-auto-xen-arch.diff ++noxen patches.xen/xen3-auto-xen-drivers.diff ++noxen patches.xen/xen3-auto-include-xen-interface.diff ++noxen patches.xen/xen3-auto-blktap2-pvops.diff # kconfig bits for xen - patches.xen/xen3-auto-xen-kconfig.diff ++noxen patches.xen/xen3-auto-xen-kconfig.diff # common code changes - patches.xen/xen3-auto-common.diff - patches.xen/xen3-auto-arch-x86.diff - patches.xen/xen3-auto-arch-i386.diff - patches.xen/xen3-auto-arch-x86_64.diff ++noxen patches.xen/xen3-auto-common.diff ++noxen patches.xen/xen3-auto-arch-x86.diff ++noxen patches.xen/xen3-auto-arch-i386.diff ++noxen patches.xen/xen3-auto-arch-x86_64.diff # fixups due to upstream Xen parts - patches.xen/xen3-fixup-xen ++noxen patches.xen/xen3-fixup-xen # newer changeset backports - patches.xen/1240-pcifront-toolstack-missing-XenbusStateClosing.patch # changes outside arch/{i386,x86_64}/xen - patches.xen/xen3-fixup-kconfig - patches.xen/xen3-fixup-common - patches.xen/xen3-fixup-arch-x86 - patches.xen/xen3-fixup-blktap2-pvops ++noxen patches.xen/xen3-fixup-kconfig ++noxen patches.xen/xen3-fixup-common ++noxen patches.xen/xen3-fixup-arch-x86 ++noxen patches.xen/xen3-fixup-blktap2-pvops # ports of upstream patches - patches.xen/xen3-patch-2.6.18 - patches.xen/xen3-patch-2.6.19 - patches.xen/xen3-patch-2.6.20 - patches.xen/xen3-patch-2.6.21 - patches.xen/xen3-patch-2.6.22 - patches.xen/xen3-patch-2.6.23 - patches.xen/xen3-patch-2.6.24 - patches.xen/xen3-patch-2.6.25 - patches.xen/xen3-patch-2.6.26 - patches.xen/xen3-patch-2.6.27 - patches.xen/xen3-patch-2.6.28 - patches.xen/xen3-patch-2.6.29 - patches.xen/xen3-patch-2.6.30 - patches.xen/xen3-patch-2.6.31 - patches.xen/xen3-patch-2.6.32 - patches.xen/xen3-patch-2.6.33 - patches.xen/xen3-patch-2.6.34 - patches.xen/xen3-patch-2.6.35 - patches.xen/xen3-patch-2.6.36 - patches.xen/xen3-patch-2.6.37 - patches.xen/xen3-patch-2.6.38 - patches.xen/xen3-patch-2.6.39 - patches.xen/xen3-patch-3.0 - patches.xen/xen3-patch-3.1 - patches.xen/xen3-patch-3.2 - patches.xen/xen3-patch-3.3 - patches.xen/xen3-patch-3.4 - patches.xen/xen3-patch-3.5 - patches.xen/xen3-patch-3.6 - patches.xen/xen3-patch-3.7 - patches.xen/xen3-patch-3.8 - patches.xen/xen3-patch-3.9 - patches.xen/xen3-patch-3.10 - patches.xen/xen3-patch-3.11 - patches.xen/xen3-patch-3.11.1-2 - patches.xen/xen3-patch-3.11.5-6 ++noxen patches.xen/xen3-patch-2.6.18 ++noxen patches.xen/xen3-patch-2.6.19 ++noxen patches.xen/xen3-patch-2.6.20 ++noxen patches.xen/xen3-patch-2.6.21 ++noxen patches.xen/xen3-patch-2.6.22 ++noxen patches.xen/xen3-patch-2.6.23 ++noxen patches.xen/xen3-patch-2.6.24 ++noxen patches.xen/xen3-patch-2.6.25 ++noxen patches.xen/xen3-patch-2.6.26 ++noxen patches.xen/xen3-patch-2.6.27 ++noxen patches.xen/xen3-patch-2.6.28 ++noxen patches.xen/xen3-patch-2.6.29 ++noxen patches.xen/xen3-patch-2.6.30 ++noxen patches.xen/xen3-patch-2.6.31 ++noxen patches.xen/xen3-patch-2.6.32 ++noxen patches.xen/xen3-patch-2.6.33 ++noxen patches.xen/xen3-patch-2.6.34 ++noxen patches.xen/xen3-patch-2.6.35 ++noxen patches.xen/xen3-patch-2.6.36 ++noxen patches.xen/xen3-patch-2.6.37 ++noxen patches.xen/xen3-patch-2.6.38 ++noxen patches.xen/xen3-patch-2.6.39 ++noxen patches.xen/xen3-patch-3.0 ++noxen patches.xen/xen3-patch-3.1 ++noxen patches.xen/xen3-patch-3.2 ++noxen patches.xen/xen3-patch-3.3 ++noxen patches.xen/xen3-patch-3.4 ++noxen patches.xen/xen3-patch-3.5 ++noxen patches.xen/xen3-patch-3.6 ++noxen patches.xen/xen3-patch-3.7 ++noxen patches.xen/xen3-patch-3.8 ++noxen patches.xen/xen3-patch-3.9 ++noxen patches.xen/xen3-patch-3.10 ++noxen patches.xen/xen3-patch-3.11 # ports of other patches - patches.xen/xen3-010-acpi_initrd_override_tables.patch - patches.xen/xen3-stack-unwind - patches.xen/xen3-x86_64-unwind-annotations ++noxen patches.xen/xen3-010-acpi_initrd_override_tables.patch ++noxen patches.xen/xen3-stack-unwind ++noxen patches.xen/xen3-x86_64-unwind-annotations # bugfixes and enhancements - patches.xen/xen-hypercall-symbols - patches.xen/xen-sys-suspend - patches.xen/xen-ipi-per-cpu-irq - patches.xen/xen-virq-per-cpu-irq - patches.xen/xen-clockevents - patches.xen/xen-spinlock-poll-early - patches.xen/xen-pcpu-hotplug - patches.xen/xen-pcpu-hotplug-kexec - patches.xen/xen-mem-hotplug - patches.xen/xen-configurable-guest-devices - patches.xen/xen-setup-gsi - patches.xen/xen-unpriv-build - patches.xen/xen-cpufreq-report - patches.xen/xen-multi-page-ring - patches.xen/xen-balloon-max-target - patches.xen/xen-blkback-multi-page-ring - patches.xen/xen-blkback-cdrom - patches.xen/xen-blkif-protocol-fallback-hack - patches.xen/xen-blkfront-multi-page-ring - patches.xen/xen-blkif-op-packet - patches.xen/xen-blkfront-cdrom - patches.xen/xen-blkfront-hvm-no-cdrom - patches.xen/xen-blktap-modular - patches.xen/xen-blktap-write-barriers - patches.xen/xen-blktap2-configurable-nr-devs - patches.xen/xen-netback-notify-multi - patches.xen/xen-netback-generalize - patches.xen/xen-netback-multiple-tasklets - patches.xen/xen-netback-kernel-threads - patches.xen/xen-cxgb3 - patches.xen/xen-dcdbas - patches.xen/xen-x86-panic-no-reboot - patches.xen/xen-x86-dcr-fallback - patches.xen/xen-x86-no-lapic - patches.xen/xen-x86-pmd-handling - patches.xen/xen-x86-bigmem - patches.xen/xen-x86-exit-mmap - patches.xen/xen-x86-per-cpu-vcpu-info - patches.xen/xen-x86-pcpu - patches.xen/xen-x86-EFI - patches.xen/xen-x86-bzImage - patches.xen/xen-x86_64-pgd-pin - patches.xen/xen-x86_64-pgd-alloc-order - patches.xen/xen-x86_64-dump-user-pgt - patches.xen/xen-x86_64-note-init-p2m - patches.xen/xen-x86_64-unmapped-initrd - patches.xen/xen-x86_64-vread-pvclock ++noxen patches.xen/xen-hypercall-symbols ++noxen patches.xen/xen-sys-suspend ++noxen patches.xen/xen-ipi-per-cpu-irq ++noxen patches.xen/xen-virq-per-cpu-irq ++noxen patches.xen/xen-clockevents ++noxen patches.xen/xen-spinlock-poll-early ++noxen patches.xen/xen-pcpu-hotplug ++noxen patches.xen/xen-pcpu-hotplug-kexec ++noxen patches.xen/xen-mem-hotplug ++noxen patches.xen/xen-configurable-guest-devices ++noxen patches.xen/xen-setup-gsi ++noxen patches.xen/xen-unpriv-build ++noxen patches.xen/xen-cpufreq-report ++noxen patches.xen/xen-multi-page-ring ++noxen patches.xen/xen-balloon-max-target ++noxen patches.xen/xen-blkback-multi-page-ring ++noxen patches.xen/xen-blkback-cdrom ++noxen patches.xen/xen-blkif-protocol-fallback-hack ++noxen patches.xen/xen-blkfront-multi-page-ring ++noxen patches.xen/xen-blkif-op-packet ++noxen patches.xen/xen-blkfront-cdrom ++noxen patches.xen/xen-blkfront-hvm-no-cdrom ++noxen patches.xen/xen-blktap-modular ++noxen patches.xen/xen-blktap-write-barriers ++noxen patches.xen/xen-blktap2-configurable-nr-devs ++noxen patches.xen/xen-netback-notify-multi ++noxen patches.xen/xen-netback-generalize ++noxen patches.xen/xen-netback-multiple-tasklets ++noxen patches.xen/xen-netback-kernel-threads ++noxen patches.xen/xen-cxgb3 ++noxen patches.xen/xen-dcdbas ++noxen patches.xen/xen-x86-panic-no-reboot ++noxen patches.xen/xen-x86-dcr-fallback ++noxen patches.xen/xen-x86-no-lapic ++noxen patches.xen/xen-x86-pmd-handling ++noxen patches.xen/xen-x86-bigmem ++noxen patches.xen/xen-x86-exit-mmap ++noxen patches.xen/xen-x86-per-cpu-vcpu-info ++noxen patches.xen/xen-x86-pcpu ++noxen patches.xen/xen-x86-EFI ++noxen patches.xen/xen-x86-bzImage ++noxen patches.xen/xen-x86_64-pgd-pin ++noxen patches.xen/xen-x86_64-pgd-alloc-order ++noxen patches.xen/xen-x86_64-dump-user-pgt ++noxen patches.xen/xen-x86_64-note-init-p2m ++noxen patches.xen/xen-x86_64-unmapped-initrd ++noxen patches.xen/xen-x86_64-vread-pvclock diff --git a/series.confe b/series.confe new file mode 100644 index 00000000..0802913b --- /dev/null +++ b/series.confe @@ -0,0 +1,667 @@ +# Kernel patches configuration file +# vim: set ts=8 sw=8 noet: +# +# There are three kinds of rules (see guards.1 for details): +# +symbol include this patch if symbol is defined; otherwise exclude. +# -symbol exclude this patch if symbol is defined; otherwise include. +# - exclude this patch. +# +# Using symbols means that an entirely different source tree will be +# generated depending on which symbols are defined. This used to be +# a good thing when arch-specific patches contained conflicts with other +# patches, but we now have a policy that patches must build everywhere. +# The result is a unified source tree that allows us to do neat things +# like ship kernel module packages. Creating a divergent tree breaks +# these # so you'd better have an extraordinary reason for using them. +# For example, the openSUSE 10.3 kernel uses them for segregating the +# -rt patches until they can be integrated completely, and these are +# only applied at the very end of the series. +# +# The most common use in recent kernels is to disable a patch with a +# username as the symbol to indicate responsbility. Another use is +# to check in a patch for testing, but have it disabled in all but your +# own build environment. + + ######################################################## + # latest standard kernel patches + # DO NOT MODIFY THEM! + # Send separate patches upstream if you find a problem... + ######################################################## + + ######################################################## + # Build fixes that apply to the vanilla kernel too. + # Patches in patches.rpmify are applied to both -vanilla + # and patched flavors. + ######################################################## + patches.rpmify/nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo + patches.rpmify/chipidea-clean-up-dependencies + patches.rpmify/lustre-lloop-dont-change-logical-size + + ######################################################## + # kABI consistency patches + ######################################################## + + ######################################################## + # + # packaging-specific patches (tweaks for autobuild, + # CONFIG_SUSE_KERNEL, config/version tracking and other + # build stuff like that ...). + # + # Note that every patch in the patches.rpmify directory + # will be included in the vanilla package. + ######################################################## + patches.rpmify/firmware-path + + patches.rpmify/rpm-kernel-config + patches.rpmify/split-package + patches.rpmify/cloneconfig.diff + + ######################################################## + # kbuild/module infrastructure fixes + ######################################################## + patches.suse/supported-flag + patches.suse/genksyms-add-override-flag.diff + patches.suse/kconfig-automate-kernel-desktop + + ######################################################## + # Simple export additions/removals + ######################################################## + + ######################################################## + # Bug workarounds for binutils + ######################################################## + + ######################################################## + # Scheduler / Core + ######################################################## + patches.suse/setuid-dumpable-wrongdir + + ######################################################## + # Architecture-specific patches. These used to be all + # at the end of series.conf, but since we don't do + # conditional builds anymore, there's no point. + ######################################################## + + + ######################################################## + # ia64 + ######################################################## + + ######################################################## + # i386 + ######################################################## + + + # amd64 | x86-64 | x86_64 + # 'Intel(r) Extended Memory 64 Technology' | 'Intel(r) EM64T' + # x64 + # Intel 64 + # "the architecture with too many names" + # TAWTMN + + ######################################################## + # x86_64/i386 biarch + ######################################################## + patches.arch/x86_64-hpet-64bit-timer.patch + ++needs_update patches.arch/kvm-split-paravirt-ops-by-functionality ++needs_update patches.arch/kvm-only-export-selected-pv-ops-feature-structs ++needs_update patches.arch/kvm-split-the-KVM-pv-ops-support-by-feature ++needs_update patches.arch/kvm-replace-kvm-io-delay-pv-ops-with-linux-magic + + ######################################################## + # x86 MCE/MCA (Machine Check Error/Architecture) extensions + ######################################################## + + + ######################################################## + # x86_64/4096CPUS - from SGI + ######################################################## + patches.arch/x86-apic-force-bigsmp-apic-on-IBM-EXA3-4.patch + + ######################################################## + # x86 UV patches from SGI + ######################################################## + + ######################################################## + # x86_64/i386 depending on the UV patchset + ######################################################## + + ######################################################## + # powerpc/generic + ######################################################## + patches.suse/8250-sysrq-ctrl_o.patch ++needs_update? patches.suse/ppc-no-LDFLAGS_MODULE.patch + patches.arch/ppc-pegasos-console-autodetection.patch + patches.suse/ppc-powerbook-usb-fn-key-default.patch + patches.drivers/ppc64-adb + patches.suse/suse-ppc64-branding ++needs_update patches.arch/ppc64-xmon-dmesg-printing.patch + patches.arch/ppc-prom-nodisplay.patch + patches.fixes/ptrace-getsiginfo + + ######################################################## + # PS3 + ######################################################## + + ######################################################## + # ARM + ######################################################## + patches.arch/cubox-configuration.patch ++needs_update patches.arch/arm-exynos-nosparse.patch + patches.arch/arm-OMAP-Fix-missing-cm3xxx.h-include.patch + patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch + patches.arch/arm-omap3isp.patch + + # Compile fix for Xen on ARM with our Xen patches applied + patches.arch/arm-xen-fixup.patch + patches.arch/arm-refresh-mach-types.diff + patches.arch/arm-arndale-usb.patch ++needs_update patches.arch/arm-arndale-dma.patch + patches.arch/arm-arndale-usb-phy.patch + patches.arch/arm-exynos-dwmmc-modalias.patch ++needs_update patches.arch/arm-xen-0001-arm-introduce-psci_smp_ops.patch ++needs_update patches.arch/arm-xen-0002-ARM-Enable-selection-of-SMP-operations-at-boot-time.patch ++needs_update patches.arch/arm-xen-0006-xen-arm-disable-cpuidle-when-linux-is-running-as-dom.patch ++needs_update patches.arch/arm-xen-0007-arm-choose-debug-uncompress.h-include-when-uncompres.patch ++needs_update patches.arch/arm-xen-0008-xen-arm-enable-PV-control-for-ARM.patch + + ######################################################## + # S/390 + ######################################################## + patches.arch/s390-message-catalog.diff + patches.arch/kmsg-fix-parameter-limitations + + ######################################################## + # VM/FS patches + ######################################################## + patches.fixes/oom-warning + patches.fixes/remount-no-shrink-dcache + patches.suse/readahead-request-tunables.patch + patches.fixes/mm-Fix-assertion-mapping-nrpages-0-in-end_writeback.patch + + ######################################################## + # IPC patches + ######################################################## + + ######################################################## + # nfsacl protocol (agruen) + ######################################################## + + ######################################################## + # misc small fixes + ######################################################## + patches.suse/connector-read-mostly + patches.suse/kbd-ignore-gfx.patch + patches.suse/ida-remove-warning-dump-stack.patch + + ######################################################## + # + # ACPI patches + # + ######################################################## + # Check resource conflicts between hwmon and ACPI OpRegs + patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch + + patches.arch/acpi_thermal_passive_blacklist.patch + + ######################################################## + # CPUFREQ + ######################################################## + ++trenn patches.fixes/cpufreq_ondemand_performance_optimise_default_settings.patch + +## cpuidle perf events cleanups and related + patches.arch/perf_timechart_fix_zero_timestamps.patch + + ######################################################## + # AGP, graphics related stuff + ######################################################## + + ######################################################## + # Suse specific stuff + ######################################################## + patches.suse/suse-hv-Drivers-hv-util-Fix-a-bug-in-util-version-negotiatio.patch + + ######################################################## + # Networking, IPv6 + ######################################################## + patches.fixes/bridge-module-get-put.patch + + ######################################################## + # NFS + ######################################################## + + + ######################################################## + # lockd + statd + ######################################################## + + ######################################################## + # cifs patches + ######################################################## + + ######################################################## + # ext2/ext3 + ######################################################## +# patches.suse/ext2-fsync-err + + ######################################################## + # ext4 + ######################################################## + + ######################################################## + # btrfs + ######################################################## + patches.suse/btrfs-use-correct-device-for-maps.patch + patches.suse/btrfs-check-index-in-extent_buffer_page + + patches.suse/btrfs-use-end-trans-in-label-ioctl + patches.suse/btrfs-add-ability-to-query-change-feature-bits-online-ioctl + patches.suse/introduce-kobj_completion + patches.suse/btrfs-export-supported-featured-to-sysfs + patches.suse/btrfs-add-per-super-attribute-publishing-to-sysfs + patches.suse/btrfs-publish-per-super-features-to-sysfs + patches.suse/btrfs-add-publishing-of-unknown-features-in-sysfs + patches.suse/btrfs-add-ability-to-change-features-via-sysfs + patches.suse/btrfs-use-feature-attributes-to-print-names-in-errors + + ######################################################## + # Reiserfs Patches + ######################################################## + + ######################################################## + # dlm + ######################################################## + + ######################################################## + # ocfs2 + ######################################################## + + ######################################################## + # gfs2 + ######################################################## + + ######################################################## + # xfs + ######################################################## + + ######################################################## + # other filesystem stuff: richacls + ######################################################## + patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch + patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch + patches.suse/0003-vfs-Add-IS_RICHACL-test-for-richacl-support.patch + patches.suse/0004-richacl-In-memory-representation-and-helper-function.patch + patches.suse/0005-richacl-Permission-mapping-functions.patch + patches.suse/0006-richacl-Compute-maximum-file-masks-from-an-acl.patch + patches.suse/0007-richacl-Update-the-file-masks-in-chmod.patch + patches.suse/0008-richacl-Permission-check-algorithm.patch + patches.suse/0009-richacl-Helper-functions-for-implementing-richacl-in.patch + patches.suse/0010-richacl-Create-time-inheritance.patch + patches.suse/0011-richacl-Check-if-an-acl-is-equivalent-to-a-file-mode.patch + patches.suse/0012-richacl-Automatic-Inheritance.patch + patches.suse/0013-richacl-Restrict-access-check-algorithm.patch + patches.suse/0014-richacl-xattr-mapping-functions.patch + + # The RICHACL name index was used for system xattrs. This needs + # to be sorted out upstream. + patches.suse/0016-ext4-Implement-richacl-support-in-ext4.patch + + ######################################################## + # other filesystem stuff + ######################################################## + + patches.drivers/pstore_disable_efi_backend_by_default.patch + ######################################################## + # Overlayfs + ######################################################## + + patches.suse/ovl01-vfs-add-i_op-dentry_open.patch + patches.suse/ovl02-vfs-export-do_splice_direct-to-modules.patch + patches.suse/ovl03-vfs-export-inode_permission-to-modules.patch + patches.suse/ovl04-vfs-introduce-clone_private_mount.patch + patches.suse/ovl05-overlay-filesystem.patch + patches.suse/ovl06-overlayfs-add-statfs-support.patch + patches.suse/ovl07-overlayfs-implement-show_options.patch + patches.suse/ovl08-overlay-overlay-filesystem-documentation.patch + patches.suse/ovl09-fs-limit-filesystem-stacking-depth.patch + + ######################################################## + # Swap-over-NFS + ######################################################## + + ######################################################## + # Netfilter + ######################################################## + + patches.suse/netfilter-ip_conntrack_slp.patch + + ######################################################## + # + # Device drivers + # + ######################################################## + + ######################################################## + # Storage + ######################################################## + + # Block layer fixes + patches.fixes/scsi-inquiry-too-short-ratelimit + patches.suse/scsi-netlink-ml + + patches.fixes/scsi-retry-alua-transition-in-progress + + patches.fixes/scsi-dh-queuedata-accessors + + patches.drivers/megaraid-mbox-fix-SG_IO + + # Remaining SCSI patches (garloff) ++needs_update patches.suse/scsi-error-test-unit-ready-timeout + patches.fixes/scsi-scan-blist-update + + patches.fixes/scsi-ibmvscsi-show-config.patch + # bnc#362850 + patches.fixes/sd_liberal_28_sense_invalid.diff + + patches.fixes/scsi-ibmvscsi-module_alias.patch + patches.suse/sd_init.mark_majors_busy.patch + + ######################################################## + # DRM/Video + ######################################################## + patches.drivers/drm-cirrus-Correct-register-values-for-16bpp + patches.drivers/drm-cirrus-Use-16bpp-as-default + + ######################################################## + # video4linux + ######################################################## + + ######################################################## + # Network + ######################################################## + patches.fixes/tulip-quad-NIC-ifdown + + ######################################################## + # Wireless Networking + ######################################################## + patches.suse/b43-missing-firmware-info.patch + + ######################################################## + # ISDN + ######################################################## + patches.fixes/misdn-add-support-for-group-membership-check + + ######################################################## + # iSCSI + ######################################################## + + ######################################################## + # PCI and PCI hotplug + ######################################################## + + ######################################################## + # sysfs / driver core + ######################################################## + + ######################################################## + # USB + ######################################################## + + ######################################################## + # I2C + ######################################################## + + ######################################################## + # Input & Console + ######################################################## +# patches.suse/SUSE-bootsplash +# patches.suse/SUSE-bootsplash-mgadrmfb-workaround + patches.fixes/input-add-acer-aspire-5710-to-nomux.patch + + ########################################################## + # Sound + ########################################################## + + ######################################################## + # Char / serial + ######################################################## + + ######################################################## + # Other driver fixes + ######################################################## + + # Needs updating WRT d27769ec (block: add GENHD_FL_NO_PART_SCAN) ++hare patches.suse/no-partition-scan + + + ######################################################## + # Other drivers we have added to the tree + ######################################################## + + ######################################################## + # Suspend/Resume stuff + ######################################################## + + ######################################################## + # device-mapper + ######################################################## + patches.suse/dm-emulate-blkrrpart-ioctl + patches.suse/dm-raid45-26-Nov-2009.patch + patches.suse/dmraid45-api-updates + patches.suse/dm-raid45-split-dependencies + patches.fixes/dm-mpath-reattach-dh + patches.suse/dm-mpath-leastpending-path-update ++needs_update patches.suse/dm-mpath-accept-failed-paths ++needs_update patches.suse/dm-mpath-detach-existing-hardware-handler + patches.fixes/dm-table-switch-to-readonly ++needs_update patches.fixes/dm-release-map_lock-before-set_disk_ro + patches.suse/dm-mpath-no-activate-for-offlined-paths + patches.suse/dm-mpath-no-partitions-feature + patches.suse/mpath-fix + + ######################################################## + # md + ######################################################## + + ########################################################## + # + # Security stuff + # + ########################################################## + + ########################################################## + # Audit + ########################################################## + + ########################################################## + # AppArmor + ########################################################## + patches.apparmor/apparmor-compatibility-patch-for-v5-network-control +# patches.apparmor/apparmor-profiles-seq_file + + ######################################################## + # Address space layout randomization + ######################################################## + + ######################################################## + # KDB v4.4 + ######################################################## + + ######################################################## + # Other patches for debugging + ######################################################## + patches.suse/crasher-26.diff + patches.suse/stack-unwind + patches.suse/revert-x86-remove-warning-and-warning_symbol-from-struct-stacktrace_ops + patches.suse/no-frame-pointer-select + patches.arch/x86_64-unwind-annotations + patches.arch/stack-unwind-cfi_ignore-takes-more-arguments + + ######################################################## + # Kdump + ######################################################## + + ######################################################## + # cgroups + ######################################################## + + ######################################################## + # audit subsystem + ######################################################## + + ######################################################## + # Performance Monitoring, Tracing etc + ######################################################## + + ######################################################## + # KVM patches + ######################################################## + patches.fixes/kvm-ioapic.patch + patches.fixes/kvm-macos.patch + + ######################################################## + # Staging tree patches + # new drivers that are going upstream + ######################################################## + + ######################################################## + # You'd better have a good reason for adding a patch + # below here. + ######################################################## + +######################################################## +# XEN architecture, version 3 +######################################################## + +# xen patches, from xenbits mercurial repository. +# http://xenbits.xensource.com/ext/linux-2.6-merge.hg +# +# everything named "xen3-auto-*" is auto-generated. +# PLEASE DON'T EDIT THESE PATCHES. Create fixup patches +# on top of them instead. This reduces workload when +# re-basing to a newer xen tree. +# + # split out patches + patches.xen/kexec-move-segment-code-i386.patch + patches.xen/kexec-move-segment-code-x86_64.patch + patches.xen/ipv6-no-autoconf + patches.xen/pci-guestdev + patches.xen/pci-reserve + + # bulk stuff, new files for xen + patches.xen/xen3-auto-xen-arch.diff + patches.xen/xen3-auto-xen-drivers.diff + patches.xen/xen3-auto-include-xen-interface.diff + patches.xen/xen3-auto-blktap2-pvops.diff + + # kconfig bits for xen + patches.xen/xen3-auto-xen-kconfig.diff + + # common code changes + patches.xen/xen3-auto-common.diff + patches.xen/xen3-auto-arch-x86.diff + patches.xen/xen3-auto-arch-i386.diff + patches.xen/xen3-auto-arch-x86_64.diff + + # fixups due to upstream Xen parts + patches.xen/xen3-fixup-xen + + # newer changeset backports + + # changes outside arch/{i386,x86_64}/xen + patches.xen/xen3-fixup-kconfig + patches.xen/xen3-fixup-common + patches.xen/xen3-fixup-arch-x86 + patches.xen/xen3-fixup-blktap2-pvops + + # ports of upstream patches + patches.xen/xen3-patch-2.6.18 + patches.xen/xen3-patch-2.6.19 + patches.xen/xen3-patch-2.6.20 + patches.xen/xen3-patch-2.6.21 + patches.xen/xen3-patch-2.6.22 + patches.xen/xen3-patch-2.6.23 + patches.xen/xen3-patch-2.6.24 + patches.xen/xen3-patch-2.6.25 + patches.xen/xen3-patch-2.6.26 + patches.xen/xen3-patch-2.6.27 + patches.xen/xen3-patch-2.6.28 + patches.xen/xen3-patch-2.6.29 + patches.xen/xen3-patch-2.6.30 + patches.xen/xen3-patch-2.6.31 + patches.xen/xen3-patch-2.6.32 + patches.xen/xen3-patch-2.6.33 + patches.xen/xen3-patch-2.6.34 + patches.xen/xen3-patch-2.6.35 + patches.xen/xen3-patch-2.6.36 + patches.xen/xen3-patch-2.6.37 + patches.xen/xen3-patch-2.6.38 + patches.xen/xen3-patch-2.6.39 + patches.xen/xen3-patch-3.0 + patches.xen/xen3-patch-3.1 + patches.xen/xen3-patch-3.2 + patches.xen/xen3-patch-3.3 + patches.xen/xen3-patch-3.4 + patches.xen/xen3-patch-3.5 + patches.xen/xen3-patch-3.6 + patches.xen/xen3-patch-3.7 + patches.xen/xen3-patch-3.8 + patches.xen/xen3-patch-3.9 + patches.xen/xen3-patch-3.10 + patches.xen/xen3-patch-3.11 + + # ports of other patches + patches.xen/xen3-010-acpi_initrd_override_tables.patch + patches.xen/xen3-stack-unwind + patches.xen/xen3-x86_64-unwind-annotations + + # bugfixes and enhancements + patches.xen/xen-hypercall-symbols + patches.xen/xen-sys-suspend + patches.xen/xen-ipi-per-cpu-irq + patches.xen/xen-virq-per-cpu-irq + patches.xen/xen-clockevents + patches.xen/xen-spinlock-poll-early + patches.xen/xen-pcpu-hotplug + patches.xen/xen-pcpu-hotplug-kexec + patches.xen/xen-mem-hotplug + patches.xen/xen-configurable-guest-devices + patches.xen/xen-setup-gsi + patches.xen/xen-unpriv-build + patches.xen/xen-cpufreq-report + patches.xen/xen-multi-page-ring + patches.xen/xen-balloon-max-target + patches.xen/xen-blkback-multi-page-ring + patches.xen/xen-blkback-cdrom + patches.xen/xen-blkif-protocol-fallback-hack + patches.xen/xen-blkfront-multi-page-ring + patches.xen/xen-blkif-op-packet + patches.xen/xen-blkfront-cdrom + patches.xen/xen-blkfront-hvm-no-cdrom + patches.xen/xen-blktap-modular + patches.xen/xen-blktap-write-barriers + patches.xen/xen-blktap2-configurable-nr-devs + patches.xen/xen-netback-notify-multi + patches.xen/xen-netback-generalize + patches.xen/xen-netback-multiple-tasklets + patches.xen/xen-netback-kernel-threads + patches.xen/xen-cxgb3 + patches.xen/xen-dcdbas + patches.xen/xen-x86-panic-no-reboot + patches.xen/xen-x86-dcr-fallback + patches.xen/xen-x86-no-lapic + patches.xen/xen-x86-pmd-handling + patches.xen/xen-x86-bigmem + patches.xen/xen-x86-exit-mmap + patches.xen/xen-x86-per-cpu-vcpu-info + patches.xen/xen-x86-pcpu + patches.xen/xen-x86-EFI + patches.xen/xen-x86-bzImage + patches.xen/xen-x86_64-pgd-pin + patches.xen/xen-x86_64-pgd-alloc-order + patches.xen/xen-x86_64-dump-user-pgt + patches.xen/xen-x86_64-note-init-p2m + patches.xen/xen-x86_64-unmapped-initrd + patches.xen/xen-x86_64-vread-pvclock diff --git a/source-timestamp b/source-timestamp index d97c23d9..b28b1917 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2013-11-06 14:54:28 +0100 -GIT Revision: 2607707bb5fc8eb6a132671dfdf8be56978f697d -GIT Branch: openSUSE-13.1 +2013-09-24 18:47:46 +0200 +GIT Revision: a75f0811a1fd493be9750989368aff128585ec07 +GIT Branch: master