Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2015-10-17 22:10:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2015-10-01 09:28:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2015-10-17 22:11:04.000000000 +0200 @@ -1,0 +2,66 @@ +Mon Oct 12 12:01:32 CEST 2015 - [email protected] + +- rpm/kernel-obs-build.spec.in: Add virtio_rng to the initrd + This allows to feed some randomness to the OBS workers. +- commit fbb0589 + +------------------------------------------------------------------- +Sat Oct 3 19:37:16 CEST 2015 - [email protected] + +- Linux 4.2.3. +- commit f17d4c9 + +------------------------------------------------------------------- +Sat Oct 3 18:13:57 CEST 2015 - [email protected] + +- config: armv7hl: Enable missing STMMAC Ethernet options + This attempts to fix regressions from 4.1 like built-in Ethernet on + Cubietruck not working. + (cherry picked from commit 68608454650632c84ab3c4c67a923ba834be6c59) +- commit 2a10792 + +------------------------------------------------------------------- +Fri Oct 2 17:09:31 CEST 2015 - [email protected] + +- Obsolete kernel-desktop also in Tumbleweed +- commit 35c44c6 + +------------------------------------------------------------------- +Fri Oct 2 10:44:35 CEST 2015 - [email protected] + +- apparmor: temporary work around for bug while unloading policy + (boo#941867). +- commit 1193b90 + +------------------------------------------------------------------- +Wed Sep 30 02:16:01 CEST 2015 - [email protected] + +- Update config files. (bsc#947816) + Put # CONFIG_KEXEC_VERIFY_SIG is not set (bsc#947816) +- commit 0dc8788 + +------------------------------------------------------------------- +Tue Sep 29 20:51:15 CEST 2015 - [email protected] + +- Update config files. + (vanilla) +- commit b3ecf72 + +------------------------------------------------------------------- +Tue Sep 29 20:29:23 CEST 2015 - [email protected] + +- Linux 4.2.2 (bnc#934531). +- Delete + patches.fixes/mmc-sdhci-fix-dma-memory-leak-in-sdhci_pre_req.patch. +- Delete + patches.fixes/workqueue-Make-flush_workqueue-available-again-to-no.patch. +- Update config files. +- commit 5256b5c + +------------------------------------------------------------------- +Fri Sep 25 22:42:00 CEST 2015 - [email protected] + +- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416) +- commit ad49492 + +------------------------------------------------------------------- kernel-default.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa-xen.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-pv.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change Old: ---- kernel-desktop.changes kernel-desktop.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:10.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 4.2 -%define patchversion 4.2.1 +%define patchversion 4.2.3 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.2.1 +Version: 4.2.3 %if 0%{?is_kotd} -Release: <RELEASE>.g6996a42 +Release: <RELEASE>.g202286f %else Release: 0 %endif ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:10.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 4.2 -%define patchversion 4.2.1 +%define patchversion 4.2.3 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.2.1 +Version: 4.2.3 %if 0%{?is_kotd} -Release: <RELEASE>.g6996a42 +Release: <RELEASE>.g202286f %else Release: 0 %endif @@ -167,6 +167,8 @@ Obsoletes: kernel-trace <= 3.13 Provides: kernel-bigsmp = 3.1 Obsoletes: kernel-bigsmp <= 3.1 +Provides: kernel-desktop = 4.3 +Obsoletes: kernel-desktop <= 4.3 %endif %ifarch %ix86 Provides: kernel-trace-base = 3.13 @@ -185,6 +187,8 @@ Obsoletes: kernel-trace-base <= 3.13 Provides: kernel-bigsmp-base = 3.1 Obsoletes: kernel-bigsmp-base <= 3.1 +Provides: kernel-desktop-base = 4.3 +Obsoletes: kernel-desktop-base <= 4.3 %endif %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz @@ -1009,6 +1013,8 @@ Obsoletes: kernel-trace-base <= 3.13 Provides: kernel-bigsmp-base = 3.1 Obsoletes: kernel-bigsmp-base <= 3.1 +Provides: kernel-desktop-base = 4.3 +Obsoletes: kernel-desktop-base <= 4.3 %endif %obsolete_rebuilds %name-base %ifarch %ix86 @@ -1065,6 +1071,8 @@ Obsoletes: kernel-trace-extra <= 3.13 Provides: kernel-bigsmp-extra = 3.1 Obsoletes: kernel-bigsmp-extra <= 3.1 +Provides: kernel-desktop-extra = 4.3 +Obsoletes: kernel-desktop-extra <= 4.3 %endif %obsolete_rebuilds %name-extra Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -1134,6 +1142,8 @@ Obsoletes: kernel-trace-devel <= 3.13 Provides: kernel-bigsmp-devel = 3.1 Obsoletes: kernel-bigsmp-devel <= 3.1 +Provides: kernel-desktop-devel = 4.3 +Obsoletes: kernel-desktop-devel <= 4.3 %endif %obsolete_rebuilds %name-devel PreReq: coreutils ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:10.000000000 +0200 @@ -16,7 +16,7 @@ # -%define patchversion 4.2.1 +%define patchversion 4.2.3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -27,9 +27,9 @@ Summary: Kernel Documentation (man pages) License: GPL-2.0 Group: Documentation/Man -Version: 4.2.1 +Version: 4.2.3 %if 0%{?is_kotd} -Release: <RELEASE>.g6996a42 +Release: <RELEASE>.g202286f %else Release: 0 %endif ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:10.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 4.2 -%define patchversion 4.2.1 +%define patchversion 4.2.3 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The Amazon EC2 Xen Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.2.1 +Version: 4.2.3 %if 0%{?is_kotd} -Release: <RELEASE>.g6996a42 +Release: <RELEASE>.g202286f %else Release: 0 %endif kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:10.000000000 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 4.2.1 +%define patchversion 4.2.3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -45,9 +45,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 4.2.1 +Version: 4.2.3 %if 0%{?is_kotd} -Release: <RELEASE>.g6996a42 +Release: <RELEASE>.g202286f %else Release: 0 %endif @@ -93,7 +93,7 @@ # a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env. # this list of modules where available on build workers of build.opensuse.org, so we stay compatible. -export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk fat vfat nls_cp437 nls_iso8859-1 ibmvscsi ibmvscsic" +export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi ibmvscsic" # manually load all modules to make sure they're available for i in $KERNEL_MODULES; do ++++++ kernel-obs-qa-xen.spec ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:10.000000000 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 4.2.1 +%define patchversion 4.2.3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 4.2.1 +Version: 4.2.3 %if 0%{?is_kotd} -Release: <RELEASE>.g6996a42 +Release: <RELEASE>.g202286f %else Release: 0 %endif kernel-obs-qa.spec: same change ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:10.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 4.2 -%define patchversion 4.2.1 +%define patchversion 4.2.3 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 4.2.1 +Version: 4.2.3 %if 0%{?is_kotd} -Release: <RELEASE>.g6996a42 +Release: <RELEASE>.g202286f %else Release: 0 %endif @@ -151,10 +151,14 @@ Obsoletes: kernel-bigsmp <= 2.6.17 Provides: kernel-vmi = 2.6.38 Obsoletes: kernel-vmi <= 2.6.38 +Provides: kernel-desktop = 4.3 +Obsoletes: kernel-desktop <= 4.3 %endif %ifarch %ix86 Provides: kernel-vmi-base = 2.6.38 Obsoletes: kernel-vmi-base <= 2.6.38 +Provides: kernel-desktop-base = 4.3 +Obsoletes: kernel-desktop-base <= 4.3 %endif %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz @@ -972,6 +976,8 @@ %ifarch %ix86 Provides: kernel-vmi-base = 2.6.38 Obsoletes: kernel-vmi-base <= 2.6.38 +Provides: kernel-desktop-base = 4.3 +Obsoletes: kernel-desktop-base <= 4.3 %endif %obsolete_rebuilds %name-base %ifarch %ix86 @@ -1021,6 +1027,8 @@ %ifarch %ix86 Provides: kernel-vmi-extra = 2.6.38 Obsoletes: kernel-vmi-extra <= 2.6.38 +Provides: kernel-desktop-extra = 4.3 +Obsoletes: kernel-desktop-extra <= 4.3 %endif %obsolete_rebuilds %name-extra Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -1083,6 +1091,8 @@ %ifarch %ix86 Provides: kernel-vmi-devel = 2.6.38 Obsoletes: kernel-vmi-devel <= 2.6.38 +Provides: kernel-desktop-devel = 4.3 +Obsoletes: kernel-desktop-devel <= 4.3 %endif %obsolete_rebuilds %name-devel PreReq: coreutils ++++++ kernel-pv.spec ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:10.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 4.2 -%define patchversion 4.2.1 +%define patchversion 4.2.3 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The para-virtualized Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.2.1 +Version: 4.2.3 %if 0%{?is_kotd} -Release: <RELEASE>.g6996a42 +Release: <RELEASE>.g202286f %else Release: 0 %endif ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:10.000000000 +0200 @@ -18,7 +18,7 @@ %define srcversion 4.2 -%define patchversion 4.2.1 +%define patchversion 4.2.3 %define variant %{nil} %define vanilla_only 0 @@ -30,9 +30,9 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 4.2.1 +Version: 4.2.3 %if 0%{?is_kotd} -Release: <RELEASE>.g6996a42 +Release: <RELEASE>.g202286f %else Release: 0 %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:10.000000000 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 4.2.1 +Version: 4.2.3 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g6996a42 +Release: <RELEASE>.g202286f %else Release: 0 %endif @@ -41,9 +41,6 @@ %ifarch aarch64 armv7hl %ix86 ppc ppc64 ppc64le s390x 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-lpae-devel = %version-%source_rel %endif ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:10.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:10.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 4.2 -%define patchversion 4.2.1 +%define patchversion 4.2.3 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 4.2.1 +Version: 4.2.3 %if 0%{?is_kotd} -Release: <RELEASE>.g6996a42 +Release: <RELEASE>.g202286f %else Release: 0 %endif kernel-xen.spec: same change ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:11.000000000 +0200 @@ -11,7 +11,6 @@ <arch>x86_64</arch> <package>kernel-debug</package> <package>kernel-default</package> -<package>kernel-desktop</package> <package>kernel-ec2</package> <package>kernel-lpae</package> <package>kernel-pae</package> @@ -34,7 +33,6 @@ <arch>ppc64le</arch> <package>kernel-debug</package> <package>kernel-default</package> -<package>kernel-desktop</package> <package>kernel-ec2</package> <package>kernel-lpae</package> <package>kernel-pae</package> ++++++ config-options.changes.txt ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:11.000000000 +0200 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Fri Sep 25 20:35:38 UTC 2015 - [email protected] + +- Drop the -desktop flavors and merge these settings back to + i386/pae and x86_64/default, respectively: + - CONFIG_PREEMPT=y + - vm.dirty_ratio=20 + The builtin driver choices of the desktop configs were discarded + and CONFIG_HZ is 250 (fate#319416). + +------------------------------------------------------------------- Fri Feb 13 14:58:32 CET 2015 - [email protected] - On x86 and ppc*: ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:11.000000000 +0200 @@ -9,7 +9,6 @@ # +i386 i386/default -+i386 i386/desktop +i386 i386/pae +i386 i386/xen +i386 -syms i386/ec2 @@ -18,7 +17,6 @@ +i386 i386/vanilla +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/pv ++++++ config.tar.bz2 ++++++ ++++ 14843 lines of diff (skipped) ++++++ kernel-module-subpackage ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:11.000000000 +0200 @@ -31,6 +31,12 @@ %ifarch %ix86 Obsoletes: %{-n*}-vmi %endif +%ifarch x86_64 +Obsoletes: %{-n*}-desktop +%endif +%endif +%if %1 == "pae" +Obsoletes: %{-n*}-desktop %endif AutoReqProv: on %{-p:%{expand:%(cd %_sourcedir; cat %{-p*})}} ++++++ kernel-obs-build.spec.in ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:11.000000000 +0200 @@ -93,7 +93,7 @@ # a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env. # this list of modules where available on build workers of build.opensuse.org, so we stay compatible. -export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk fat vfat nls_cp437 nls_iso8859-1 ibmvscsi ibmvscsic" +export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi ibmvscsic" # manually load all modules to make sure they're available for i in $KERNEL_MODULES; do ++++++ old-flavors ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:12.000000000 +0200 @@ -34,3 +34,7 @@ x86_64/default bigsmp 3.1 s390x/default trace 3.13 + +# openSUSE 13.2 / Tumbleweed until 2015-10-01 +i386/pae desktop 4.3 +x86_64/default desktop 4.3 ++++++ patches.apparmor.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-temporary-work-around-for-bug-while-unloadi new/patches.apparmor/apparmor-temporary-work-around-for-bug-while-unloadi --- old/patches.apparmor/apparmor-temporary-work-around-for-bug-while-unloadi 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.apparmor/apparmor-temporary-work-around-for-bug-while-unloadi 2015-10-02 10:47:00.000000000 +0200 @@ -0,0 +1,35 @@ +From: John Johansen <[email protected]> +Date: Thu, 1 Oct 2015 11:57:52 -0700 +Subject: [PATCH] apparmor: temporary work around for bug while unloading policy +Patch-mainline: TBD +References: boo#941867 + +Buglink: https://bugzilla.opensuse.org/show_bug.cgi?id=941867 + +This patch will stop the bug() call from triggering while unloading/ +replacing policy. It does not address the root cause of the issue +but will only cause some memory leakage of the sub policies that +should have been freed before the current profile being destroyed. + +Signed-off-by: John Johansen <[email protected]> +Acked-by: Takashi Iwai <[email protected]> + +--- + security/apparmor/policy.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/security/apparmor/policy.c ++++ b/security/apparmor/policy.c +@@ -157,12 +157,10 @@ static void policy_destroy(struct aa_pol + AA_ERROR("%s: internal error, " + "policy '%s' still contains profiles\n", + __func__, policy->name); +- BUG(); + } + if (on_list_rcu(&policy->list)) { + AA_ERROR("%s: internal error, policy '%s' still on list\n", + __func__, policy->name); +- BUG(); + } + + /* don't free name as its a subset of hname */ ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/mmc-sdhci-fix-dma-memory-leak-in-sdhci_pre_req.patch new/patches.fixes/mmc-sdhci-fix-dma-memory-leak-in-sdhci_pre_req.patch --- old/patches.fixes/mmc-sdhci-fix-dma-memory-leak-in-sdhci_pre_req.patch 2015-09-14 17:37:27.000000000 +0200 +++ new/patches.fixes/mmc-sdhci-fix-dma-memory-leak-in-sdhci_pre_req.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,210 +0,0 @@ -From: Haibo Chen <[email protected]> -Date: Tue, 25 Aug 2015 10:02:11 +0800 -Subject: mmc: sdhci: fix dma memory leak in sdhci_pre_req() -Patch-mainline: v4.3-rc1 -Git-commit: d31911b9374a76560d2c8ea4aa6ce5781621e81d -References: bnc#934531 - -Currently one mrq->data maybe execute dma_map_sg() twice -when mmc subsystem prepare over one new request, and the -following log show up: - sdhci[sdhci_pre_dma_transfer] invalid cookie: 24, next-cookie 25 - -In this condition, mrq->date map a dma-memory(1) in sdhci_pre_req -for the first time, and map another dma-memory(2) in sdhci_prepare_data -for the second time. But driver only unmap the dma-memory(2), and -dma-memory(1) never unmapped, which cause the dma memory leak issue. - -This patch use another method to map the dma memory for the mrq->data -which can fix this dma memory leak issue. - -Fixes: 348487cb28e6 ("mmc: sdhci: use pipeline mmc requests to improve performance") -Reported-and-tested-by: Jiri Slaby <[email protected]> -Signed-off-by: Haibo Chen <[email protected]> -Signed-off-by: Ulf Hansson <[email protected]> -Signed-off-by: Jiri Slaby <[email protected]> ---- - drivers/mmc/host/sdhci.c | 67 ++++++++++++++++++------------------------------ - drivers/mmc/host/sdhci.h | 8 +++--- - 2 files changed, 29 insertions(+), 46 deletions(-) - -diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c -index 0f1a8876e3b1..31678b55b5ec 100644 ---- a/drivers/mmc/host/sdhci.c -+++ b/drivers/mmc/host/sdhci.c -@@ -54,8 +54,7 @@ static void sdhci_finish_command(struct sdhci_host *); - static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode); - static void sdhci_enable_preset_value(struct sdhci_host *host, bool enable); - static int sdhci_pre_dma_transfer(struct sdhci_host *host, -- struct mmc_data *data, -- struct sdhci_host_next *next); -+ struct mmc_data *data); - static int sdhci_do_get_cd(struct sdhci_host *host); - - #ifdef CONFIG_PM -@@ -495,7 +494,7 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, - goto fail; - BUG_ON(host->align_addr & host->align_mask); - -- host->sg_count = sdhci_pre_dma_transfer(host, data, NULL); -+ host->sg_count = sdhci_pre_dma_transfer(host, data); - if (host->sg_count < 0) - goto unmap_align; - -@@ -634,9 +633,11 @@ static void sdhci_adma_table_post(struct sdhci_host *host, - } - } - -- if (!data->host_cookie) -+ if (data->host_cookie == COOKIE_MAPPED) { - dma_unmap_sg(mmc_dev(host->mmc), data->sg, - data->sg_len, direction); -+ data->host_cookie = COOKIE_UNMAPPED; -+ } - } - - static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) -@@ -832,7 +833,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) - } else { - int sg_cnt; - -- sg_cnt = sdhci_pre_dma_transfer(host, data, NULL); -+ sg_cnt = sdhci_pre_dma_transfer(host, data); - if (sg_cnt <= 0) { - /* - * This only happens when someone fed -@@ -948,11 +949,13 @@ static void sdhci_finish_data(struct sdhci_host *host) - if (host->flags & SDHCI_USE_ADMA) - sdhci_adma_table_post(host, data); - else { -- if (!data->host_cookie) -+ if (data->host_cookie == COOKIE_MAPPED) { - dma_unmap_sg(mmc_dev(host->mmc), - data->sg, data->sg_len, - (data->flags & MMC_DATA_READ) ? - DMA_FROM_DEVICE : DMA_TO_DEVICE); -+ data->host_cookie = COOKIE_UNMAPPED; -+ } - } - } - -@@ -2116,49 +2119,36 @@ static void sdhci_post_req(struct mmc_host *mmc, struct mmc_request *mrq, - struct mmc_data *data = mrq->data; - - if (host->flags & SDHCI_REQ_USE_DMA) { -- if (data->host_cookie) -+ if (data->host_cookie == COOKIE_GIVEN || -+ data->host_cookie == COOKIE_MAPPED) - dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len, - data->flags & MMC_DATA_WRITE ? - DMA_TO_DEVICE : DMA_FROM_DEVICE); -- mrq->data->host_cookie = 0; -+ data->host_cookie = COOKIE_UNMAPPED; - } - } - - static int sdhci_pre_dma_transfer(struct sdhci_host *host, -- struct mmc_data *data, -- struct sdhci_host_next *next) -+ struct mmc_data *data) - { - int sg_count; - -- if (!next && data->host_cookie && -- data->host_cookie != host->next_data.cookie) { -- pr_debug(DRIVER_NAME "[%s] invalid cookie: %d, next-cookie %d\n", -- __func__, data->host_cookie, host->next_data.cookie); -- data->host_cookie = 0; -+ if (data->host_cookie == COOKIE_MAPPED) { -+ data->host_cookie = COOKIE_GIVEN; -+ return data->sg_count; - } - -- /* Check if next job is already prepared */ -- if (next || -- (!next && data->host_cookie != host->next_data.cookie)) { -- sg_count = dma_map_sg(mmc_dev(host->mmc), data->sg, -- data->sg_len, -- data->flags & MMC_DATA_WRITE ? -- DMA_TO_DEVICE : DMA_FROM_DEVICE); -- -- } else { -- sg_count = host->next_data.sg_count; -- host->next_data.sg_count = 0; -- } -+ WARN_ON(data->host_cookie == COOKIE_GIVEN); - -+ sg_count = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len, -+ data->flags & MMC_DATA_WRITE ? -+ DMA_TO_DEVICE : DMA_FROM_DEVICE); - - if (sg_count == 0) -- return -EINVAL; -+ return -ENOSPC; - -- if (next) { -- next->sg_count = sg_count; -- data->host_cookie = ++next->cookie < 0 ? 1 : next->cookie; -- } else -- host->sg_count = sg_count; -+ data->sg_count = sg_count; -+ data->host_cookie = COOKIE_MAPPED; - - return sg_count; - } -@@ -2168,16 +2158,10 @@ static void sdhci_pre_req(struct mmc_host *mmc, struct mmc_request *mrq, - { - struct sdhci_host *host = mmc_priv(mmc); - -- if (mrq->data->host_cookie) { -- mrq->data->host_cookie = 0; -- return; -- } -+ mrq->data->host_cookie = COOKIE_UNMAPPED; - - if (host->flags & SDHCI_REQ_USE_DMA) -- if (sdhci_pre_dma_transfer(host, -- mrq->data, -- &host->next_data) < 0) -- mrq->data->host_cookie = 0; -+ sdhci_pre_dma_transfer(host, mrq->data); - } - - static void sdhci_card_event(struct mmc_host *mmc) -@@ -3049,7 +3033,6 @@ int sdhci_add_host(struct sdhci_host *host) - host->max_clk = host->ops->get_max_clock(host); - } - -- host->next_data.cookie = 1; - /* - * In case of Host Controller v3.00, find out whether clock - * multiplier is supported. -diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h -index 67046ca0c1f0..7c02ff46c8ac 100644 ---- a/drivers/mmc/host/sdhci.h -+++ b/drivers/mmc/host/sdhci.h -@@ -309,9 +309,10 @@ struct sdhci_adma2_64_desc { - */ - #define SDHCI_MAX_SEGS 128 - --struct sdhci_host_next { -- unsigned int sg_count; -- s32 cookie; -+enum sdhci_cookie { -+ COOKIE_UNMAPPED, -+ COOKIE_MAPPED, -+ COOKIE_GIVEN, - }; - - struct sdhci_host { -@@ -505,7 +506,6 @@ struct sdhci_host { - unsigned int tuning_mode; /* Re-tuning mode supported by host */ - #define SDHCI_TUNING_MODE_1 0 - -- struct sdhci_host_next next_data; - unsigned long private[0] ____cacheline_aligned; - }; - --- -2.5.0 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/workqueue-Make-flush_workqueue-available-again-to-no.patch new/patches.fixes/workqueue-Make-flush_workqueue-available-again-to-no.patch --- old/patches.fixes/workqueue-Make-flush_workqueue-available-again-to-no.patch 2015-09-14 17:37:27.000000000 +0200 +++ new/patches.fixes/workqueue-Make-flush_workqueue-available-again-to-no.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -From: Tim Gardner <[email protected]> -Date: Tue, 4 Aug 2015 11:26:04 -0600 -Subject: workqueue: Make flush_workqueue() available again to non GPL modules -Patch-mainline: v4.3-rc1 -Git-commit: 1dadafa86a779884f14a6e7a3ddde1a57b0a0a65 - -Commit 37b1ef31a568fc02e53587620226e5f3c66454c8 ("workqueue: move -flush_scheduled_work() to workqueue.h") moved the exported non GPL -flush_scheduled_work() from a function to an inline wrapper. -Unfortunately, it directly calls flush_workqueue() which is a GPL function. -This has the effect of changing the licensing requirement for this function -and makes it unavailable to non GPL modules. - -See commit ad7b1f841f8a54c6d61ff181451f55b68175e15a ("workqueue: Make -schedule_work() available again to non GPL modules") for precedent. - -Signed-off-by: Tim Gardner <[email protected]> -Signed-off-by: Tejun Heo <[email protected]> -Signed-off-by: Jiri Slaby <[email protected]> ---- - kernel/workqueue.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/kernel/workqueue.c -+++ b/kernel/workqueue.c -@@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_st - out_unlock: - mutex_unlock(&wq->mutex); - } --EXPORT_SYMBOL_GPL(flush_workqueue); -+EXPORT_SYMBOL(flush_workqueue); - - /** - * drain_workqueue - drain a workqueue ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 6727 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:12.000000000 +0200 @@ -28,6 +28,8 @@ # Send separate patches upstream if you find a problem... ######################################################## patches.kernel.org/patch-4.2.1 + patches.kernel.org/patch-4.2.1-2 + patches.kernel.org/patch-4.2.2-3 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -67,7 +69,6 @@ ######################################################## # Simple export additions/removals ######################################################## - patches.fixes/workqueue-Make-flush_workqueue-available-again-to-no.patch ######################################################## # Bug workarounds for binutils @@ -412,7 +413,6 @@ # Needs updating WRT d27769ec (block: add GENHD_FL_NO_PART_SCAN) +hare patches.suse/no-partition-scan - patches.fixes/mmc-sdhci-fix-dma-memory-leak-in-sdhci_pre_req.patch patches.fixes/leds-lp55xx-Correct-Kconfig-dependency-for-f-w-user- ######################################################## @@ -456,6 +456,7 @@ ########################################################## patches.apparmor/apparmor-compatibility-patch-for-v5-network-control # patches.apparmor/apparmor-profiles-seq_file + patches.apparmor/apparmor-temporary-work-around-for-bug-while-unloadi ######################################################## # Address space layout randomization ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.6SOVzt/_old 2015-10-17 22:11:12.000000000 +0200 +++ /var/tmp/diff_new_pack.6SOVzt/_new 2015-10-17 22:11:12.000000000 +0200 @@ -1,3 +1,3 @@ -2015-09-25 10:21:54 +0200 -GIT Revision: 6996a42b7e04d743c62cbcd0a390cf8f357908f0 +2015-10-12 13:32:29 +0200 +GIT Revision: 202286f8a61ea2f99f0737a10e82f020f4908e02 GIT Branch: stable ++++++ sysctl.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysctl/i386/desktop new/sysctl/i386/desktop --- old/sysctl/i386/desktop 2015-07-01 14:33:24.000000000 +0200 +++ new/sysctl/i386/desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -# The desktop workload is sensitive to latency, so start writeout earlier -# (bnc#552883) -vm.dirty_ratio=20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysctl/i386/pae new/sysctl/i386/pae --- old/sysctl/i386/pae 1970-01-01 01:00:00.000000000 +0100 +++ new/sysctl/i386/pae 2015-09-30 21:14:34.000000000 +0200 @@ -0,0 +1,3 @@ +# The desktop workload is sensitive to latency, so start writeout earlier +# (bnc#552883) +vm.dirty_ratio=20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysctl/x86_64/default new/sysctl/x86_64/default --- old/sysctl/x86_64/default 1970-01-01 01:00:00.000000000 +0100 +++ new/sysctl/x86_64/default 2015-09-30 21:14:34.000000000 +0200 @@ -0,0 +1,3 @@ +# The desktop workload is sensitive to latency, so start writeout earlier +# (bnc#552883) +vm.dirty_ratio=20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysctl/x86_64/desktop new/sysctl/x86_64/desktop --- old/sysctl/x86_64/desktop 2015-07-01 14:33:24.000000000 +0200 +++ new/sysctl/x86_64/desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -# The desktop workload is sensitive to latency, so start writeout earlier -# (bnc#552883) -vm.dirty_ratio=20
