Hello community, here is the log from the commit of package kernel-source for openSUSE:12.1:Update:Test checked in at 2012-01-23 14:54:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/kernel-source (Old) and /work/SRC/openSUSE:12.1:Update:Test/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source", Maintainer is "kernel-maintainers@forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/kernel-source/kernel-debug.changes 2012-01-10 01:47:45.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.kernel-source.new/kernel-debug.changes 2012-01-23 14:54:04.000000000 +0100 @@ -1,0 +2,50 @@ +Fri Jan 20 16:02:04 CET 2012 - mhocko@suse.cz + +- patches.fixes/proc-enable-writing-to-proc-pid-mem-revert.patch: + proc: enable writing to /proc/pid/mem (bnc#742279 + CVE-2012-0056). +- commit a0563d8 + +------------------------------------------------------------------- +Tue Jan 17 12:48:20 CET 2012 - mszeredi@suse.cz + +- fsnotify: don't BUG in fsnotify_destroy_mark() (bnc#689860). +- commit 03e5714 + +------------------------------------------------------------------- +Fri Jan 13 10:06:55 CET 2012 - jslaby@suse.cz + +- kABI: struct inet_peer fixup. +- Refresh + patches.kabi/revert-clocksource-Avoid-selecting-mult-values-that-.patch. +- Delete + patches.kabi/revert-inet-add-a-redirect-generation-id-in-inetpeer.patch. +- commit b82046b + +------------------------------------------------------------------- +Thu Jan 12 23:27:11 CET 2012 - jslaby@suse.cz + +- Linux 3.1.9. +- kABI: struct urb fixup. +- Delete + patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash. +- commit 3f7b746 + +------------------------------------------------------------------- +Tue Jan 10 15:48:30 CET 2012 - tiwai@suse.de + +- ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs (bnc#740118). +- commit 45aaea8 + +------------------------------------------------------------------- +Mon Jan 9 11:07:07 CET 2012 - jslaby@suse.cz + +- Linux 3.1.8. +- Refresh + patches.kabi/revert-inet-add-a-redirect-generation-id-in-inetpeer.patch. +- Delete + patches.fixes/net-Add-a-flow_cache_flush_deferred-function.patch. +- Reintroduce removed blk_init_allocated_queue_node. +- commit b0b1ef0 + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.iA0Nd2/_old 2012-01-23 14:54:06.000000000 +0100 +++ /var/tmp/diff_new_pack.iA0Nd2/_new 2012-01-23 14:54:06.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 3.1 -%define patchversion 3.1.7 +%define patchversion 3.1.9 %define variant %{nil} %define vanilla_only 0 @@ -56,7 +56,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 3.1.7 +Version: 3.1.9 Release: 0 License: GPL-2.0 Group: System/Kernel kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.iA0Nd2/_old 2012-01-23 14:54:06.000000000 +0100 +++ /var/tmp/diff_new_pack.iA0Nd2/_new 2012-01-23 14:54:06.000000000 +0100 @@ -17,14 +17,14 @@ # norootforbuild -%define patchversion 3.1.7 +%define patchversion 3.1.9 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.1.7 +Version: 3.1.9 Release: 0 BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.iA0Nd2/_old 2012-01-23 14:54:06.000000000 +0100 +++ /var/tmp/diff_new_pack.iA0Nd2/_new 2012-01-23 14:54:06.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 3.1 -%define patchversion 3.1.7 +%define patchversion 3.1.9 %define variant %{nil} %define vanilla_only 0 @@ -56,7 +56,7 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel -Version: 3.1.7 +Version: 3.1.9 Release: 0 License: GPL-2.0 Group: System/Kernel kernel-pae.spec: same change kernel-ppc64.spec: same change kernel-s390.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.iA0Nd2/_old 2012-01-23 14:54:06.000000000 +0100 +++ /var/tmp/diff_new_pack.iA0Nd2/_new 2012-01-23 14:54:06.000000000 +0100 @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 3.1 -%define patchversion 3.1.7 +%define patchversion 3.1.9 %define variant %{nil} %define vanilla_only 0 @@ -29,7 +29,7 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.1.7 +Version: 3.1.9 Release: 0 License: GPL-2.0 Group: Development/Sources ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.iA0Nd2/_old 2012-01-23 14:54:06.000000000 +0100 +++ /var/tmp/diff_new_pack.iA0Nd2/_new 2012-01-23 14:54:06.000000000 +0100 @@ -23,7 +23,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.1.7 +Version: 3.1.9 %if %using_buildservice Release: 0 %else ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.iA0Nd2/_old 2012-01-23 14:54:06.000000000 +0100 +++ /var/tmp/diff_new_pack.iA0Nd2/_new 2012-01-23 14:54:06.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 3.1 -%define patchversion 3.1.7 +%define patchversion 3.1.9 %define variant %{nil} %define vanilla_only 0 @@ -56,7 +56,7 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.1.7 +Version: 3.1.9 Release: 0 License: GPL-2.0 Group: System/Kernel kernel-vanilla.spec: same change kernel-xen.spec: same change ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-hda-0002-Return-the-error-from-get_wcaps_type-for-in new/patches.drivers/alsa-hda-0002-Return-the-error-from-get_wcaps_type-for-in --- old/patches.drivers/alsa-hda-0002-Return-the-error-from-get_wcaps_type-for-in 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/alsa-hda-0002-Return-the-error-from-get_wcaps_type-for-in 2012-01-10 15:48:30.000000000 +0100 @@ -0,0 +1,61 @@ +From 3a90274de3548ebb2aabfbf488cea8e275a73dc6 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai@suse.de> +Date: Tue, 10 Jan 2012 12:41:22 +0100 +Subject: [PATCH] ALSA: hda - Return the error from get_wcaps_type() for + invalid NIDs +Git-commit: 3a90274de3548ebb2aabfbf488cea8e275a73dc6 +Patch-mainline: Submitted +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git +References: bnc#740118 + +When an invalid NID is given, get_wcaps() returns zero as the error, +but get_wcaps_type() takes it as the normal value and returns a bogus +AC_WID_AUD_OUT value. This confuses the parser. + +With this patch, get_wcaps_type() returns -1 when value 0 is given, +i.e. an invalid NID is passed to get_wcaps(). + +Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=740118 + +Cc: <stable@kernel.org> +Signed-off-by: Takashi Iwai <tiwai@suse.de> + +--- + sound/pci/hda/hda_local.h | 7 ++++++- + sound/pci/hda/hda_proc.c | 2 ++ + 2 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h +index e1abc07..aca8d31 100644 +--- a/sound/pci/hda/hda_local.h ++++ b/sound/pci/hda/hda_local.h +@@ -488,7 +488,12 @@ static inline u32 get_wcaps(struct hda_codec *codec, hda_nid_t nid) + } + + /* get the widget type from widget capability bits */ +-#define get_wcaps_type(wcaps) (((wcaps) & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT) ++static inline int get_wcaps_type(unsigned int wcaps) ++{ ++ if (!wcaps) ++ return -1; /* invalid type */ ++ return (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; ++} + + static inline unsigned int get_wcaps_channels(u32 wcaps) + { +diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c +index 2c981b5..254ab52 100644 +--- a/sound/pci/hda/hda_proc.c ++++ b/sound/pci/hda/hda_proc.c +@@ -54,6 +54,8 @@ static const char *get_wid_type_name(unsigned int wid_value) + [AC_WID_BEEP] = "Beep Generator Widget", + [AC_WID_VENDOR] = "Vendor Defined Widget", + }; ++ if (wid_value == -1) ++ return "UNKNOWN Widget"; + wid_value &= 0xf; + if (names[wid_value]) + return names[wid_value]; +-- +1.7.8 + ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/fsnotify-dont-bug-in-fsnotify_destroy_mark.patch new/patches.fixes/fsnotify-dont-bug-in-fsnotify_destroy_mark.patch --- old/patches.fixes/fsnotify-dont-bug-in-fsnotify_destroy_mark.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/fsnotify-dont-bug-in-fsnotify_destroy_mark.patch 2012-01-20 17:18:24.000000000 +0100 @@ -0,0 +1,59 @@ +From: Miklos Szeredi <mszeredi@suse.cz> +Date: Thu, 12 Jan 2012 17:59:46 +0100 +Subject: fsnotify: don't BUG in fsnotify_destroy_mark() +Git-commit: fed474857efbed79cd390d0aee224231ca718f63 +Patch-mainline: 3.3-rc1? +References: bnc#689860 + +Removing the parent of a watched file results in "kernel BUG at +fs/notify/mark.c:139". + +To reproduce + + add "-w /tmp/audit/dir/watched_file" to audit.rules + rm -rf /tmp/audit/dir + +This is caused by fsnotify_destroy_mark() being called without an +extra reference taken by the caller. + +Reported by Francesco Cosoleto here: + + https://bugzilla.novell.com/show_bug.cgi?id=689860 + +Fix by removing the BUG_ON and adding a comment about not accessing mark after +the iput. + +Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> +Cc: stable@vger.kernel.org +Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Acked-by: Miklos Szeredi <mszeredi@suse.cz> +--- + fs/notify/mark.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +Index: linux-2.6.37-openSUSE-11.4/fs/notify/mark.c +=================================================================== +--- linux-2.6.37-openSUSE-11.4.orig/fs/notify/mark.c 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37-openSUSE-11.4/fs/notify/mark.c 2012-01-17 12:21:55.000000000 +0100 +@@ -136,9 +136,6 @@ void fsnotify_destroy_mark(struct fsnoti + + mark->flags &= ~FSNOTIFY_MARK_FLAG_ALIVE; + +- /* 1 from caller and 1 for being on i_list/g_list */ +- BUG_ON(atomic_read(&mark->refcnt) < 2); +- + spin_lock(&group->mark_lock); + + if (mark->flags & FSNOTIFY_MARK_FLAG_INODE) { +@@ -183,6 +180,11 @@ void fsnotify_destroy_mark(struct fsnoti + iput(inode); + + /* ++ * We don't necessarily have a ref on mark from caller so the above iput ++ * may have already destroyed it. Don't touch from now on. ++ */ ++ ++ /* + * it's possible that this group tried to destroy itself, but this + * this mark was simultaneously being freed by inode. If that's the + * case, we finish freeing the group here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/net-Add-a-flow_cache_flush_deferred-function.patch new/patches.fixes/net-Add-a-flow_cache_flush_deferred-function.patch --- old/patches.fixes/net-Add-a-flow_cache_flush_deferred-function.patch 2011-12-30 15:20:59.000000000 +0100 +++ new/patches.fixes/net-Add-a-flow_cache_flush_deferred-function.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,106 +0,0 @@ -From: Steffen Klassert <steffen.klassert@secunet.com> -Date: Wed, 21 Dec 2011 16:48:08 -0500 -Subject: [PATCH] net: Add a flow_cache_flush_deferred function -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Patch-mainline: Queued in subsystem maintainer repository -Git-commit: c0ed1c14a72ca9ebacd51fb94a8aca488b0d361e -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git -References: bnc#737624 - -flow_cach_flush() might sleep but can be called from -atomic context via the xfrm garbage collector. So add -a flow_cache_flush_deferred() function and use this if -the xfrm garbage colector is invoked from within the -packet path. - -Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> -Acked-by: Timo Teräs <timo.teras@iki.fi> -Signed-off-by: David S. Miller <davem@davemloft.net> -Acked-by: Benjamin Poirier <bpoirier@suse.de> ---- - include/net/flow.h | 1 + - net/core/flow.c | 12 ++++++++++++ - net/xfrm/xfrm_policy.c | 18 ++++++++++++++---- - 3 files changed, 27 insertions(+), 4 deletions(-) - ---- a/include/net/flow.h -+++ b/include/net/flow.h -@@ -207,6 +207,7 @@ extern struct flow_cache_object *flow_ca - u8 dir, flow_resolve_t resolver, void *ctx); - - extern void flow_cache_flush(void); -+extern void flow_cache_flush_deferred(void); - extern atomic_t flow_cache_genid; - - #endif ---- a/net/core/flow.c -+++ b/net/core/flow.c -@@ -358,6 +358,18 @@ void flow_cache_flush(void) - put_online_cpus(); - } - -+static void flow_cache_flush_task(struct work_struct *work) -+{ -+ flow_cache_flush(); -+} -+ -+static DECLARE_WORK(flow_cache_flush_work, flow_cache_flush_task); -+ -+void flow_cache_flush_deferred(void) -+{ -+ schedule_work(&flow_cache_flush_work); -+} -+ - static int __cpuinit flow_cache_cpu_prepare(struct flow_cache *fc, int cpu) - { - struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, cpu); ---- a/net/xfrm/xfrm_policy.c -+++ b/net/xfrm/xfrm_policy.c -@@ -2276,8 +2276,6 @@ static void __xfrm_garbage_collect(struc - { - struct dst_entry *head, *next; - -- flow_cache_flush(); -- - spin_lock_bh(&xfrm_policy_sk_bundle_lock); - head = xfrm_policy_sk_bundles; - xfrm_policy_sk_bundles = NULL; -@@ -2290,6 +2288,18 @@ static void __xfrm_garbage_collect(struc - } - } - -+static void xfrm_garbage_collect(struct net *net) -+{ -+ flow_cache_flush(); -+ __xfrm_garbage_collect(net); -+} -+ -+static void xfrm_garbage_collect_deferred(struct net *net) -+{ -+ flow_cache_flush_deferred(); -+ __xfrm_garbage_collect(net); -+} -+ - static void xfrm_init_pmtu(struct dst_entry *dst) - { - do { -@@ -2420,7 +2430,7 @@ int xfrm_policy_register_afinfo(struct x - if (likely(dst_ops->neigh_lookup == NULL)) - dst_ops->neigh_lookup = xfrm_neigh_lookup; - if (likely(afinfo->garbage_collect == NULL)) -- afinfo->garbage_collect = __xfrm_garbage_collect; -+ afinfo->garbage_collect = xfrm_garbage_collect_deferred; - xfrm_policy_afinfo[afinfo->family] = afinfo; - } - write_unlock_bh(&xfrm_policy_afinfo_lock); -@@ -2514,7 +2524,7 @@ static int xfrm_dev_event(struct notifie - - switch (event) { - case NETDEV_DOWN: -- __xfrm_garbage_collect(dev_net(dev)); -+ xfrm_garbage_collect(dev_net(dev)); - } - return NOTIFY_DONE; - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/proc-enable-writing-to-proc-pid-mem-revert.patch new/patches.fixes/proc-enable-writing-to-proc-pid-mem-revert.patch --- old/patches.fixes/proc-enable-writing-to-proc-pid-mem-revert.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/proc-enable-writing-to-proc-pid-mem-revert.patch 2012-01-20 17:18:24.000000000 +0100 @@ -0,0 +1,46 @@ +From 198214a7ee50375fa71a65e518341980cfd4b2f0 Mon Sep 17 00:00:00 2001 +From: Stephen Wilson <wilsons@start.ca> +Date: Sun, 13 Mar 2011 15:49:24 -0400 +Subject: [PATCH] proc: enable writing to /proc/pid/mem +Patch-mainline: no fixed by other commit +References: bnc#742279 CVE-2012-0056 + +mhocko: +The issue is fixed by e268337 [proc: clean up and fix /proc/<pid>/mem handling] +but the easier way to fix is just to disable writing as we do not have +to support it anyway. Sle11sp1 didn't enable it and nobody requested this +as a feature. + +With recent changes there is no longer a security hazard with writing to +/proc/pid/mem. Remove the #ifdef. + +Signed-off-by: Stephen Wilson <wilsons@start.ca> +Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> +Acked-by: Michal Hocko <mhocko@suse.cz> +--- + fs/proc/base.c | 5 ----- + 1 files changed, 0 insertions(+), 5 deletions(-) + +Index: linux-3.0-SLE11-SP2/fs/proc/base.c +=================================================================== +--- linux-3.0-SLE11-SP2.orig/fs/proc/base.c ++++ linux-3.0-SLE11-SP2/fs/proc/base.c +@@ -967,6 +967,10 @@ out_no_task: + return ret; + } + ++#define mem_write NULL ++ ++#ifndef mem_write ++/* This is a security hazard */ + static ssize_t mem_write(struct file * file, const char __user *buf, + size_t count, loff_t *ppos) + { +@@ -1025,6 +1029,7 @@ out_task: + out_no_task: + return copied; + } ++#endif + + loff_t mem_lseek(struct file *file, loff_t offset, int orig) + { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash new/patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash --- old/patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash 2011-12-30 15:20:59.000000000 +0100 +++ new/patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -From: Jeff Mahoney <jeffm@suse.com> -Subject: reiserfs: Force inode evictions before umount to avoid crash -References: bnc#610598 bnc#680073 bnc#684112 -Patch-mainline: Submitted to reiserfs-devel Apr 6 2011 - - This patch fixes a crash in reiserfs_delete_xattrs during umount. - - When shrink_dcache_for_umount clears the dcache from - generic_shutdown_super, delayed evictions are forced to disk. If an - evicted inode has extended attributes associated with it, it will - need to walk the xattr tree to locate and remove them. - - But since shrink_dcache_for_umount will BUG if it encounters active - dentries, the xattr tree must be released before it's called or it will - crash during every umount. - - This patch forces the evictions to occur before generic_shutdown_super - by calling shrink_dcache_sb first. The additional evictions caused - by the removal of each associated xattr file and dir will be automatically - handled as they're added to the LRU list. - -Signed-off-by: Jeff Mahoney <jeffm@suse.com> -Acked-by: Jeff Mahoney <jeffm@suse.com> ---- - fs/reiserfs/super.c | 24 ++++++++++++++---------- - 1 file changed, 14 insertions(+), 10 deletions(-) - ---- a/fs/reiserfs/super.c -+++ b/fs/reiserfs/super.c -@@ -453,16 +453,20 @@ int remove_save_link(struct inode *inode - static void reiserfs_kill_sb(struct super_block *s) - { - if (REISERFS_SB(s)) { -- if (REISERFS_SB(s)->xattr_root) { -- d_invalidate(REISERFS_SB(s)->xattr_root); -- dput(REISERFS_SB(s)->xattr_root); -- REISERFS_SB(s)->xattr_root = NULL; -- } -- if (REISERFS_SB(s)->priv_root) { -- d_invalidate(REISERFS_SB(s)->priv_root); -- dput(REISERFS_SB(s)->priv_root); -- REISERFS_SB(s)->priv_root = NULL; -- } -+ /* -+ * Force any pending inode evictions to occur now. Any -+ * inodes to be removed that have extended attributes -+ * associated with them need to clean them up before -+ * we can release the extended attribute root dentries. -+ * shrink_dcache_for_umount will BUG if we don't release -+ * those before it's called so ->put_super is too late. -+ */ -+ shrink_dcache_sb(s); -+ -+ dput(REISERFS_SB(s)->xattr_root); -+ REISERFS_SB(s)->xattr_root = NULL; -+ dput(REISERFS_SB(s)->priv_root); -+ REISERFS_SB(s)->priv_root = NULL; - } - - kill_block_super(s); ++++++ patches.kabi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.kabi/reintroduce-removed-blk_init_allocated_queue_node.patch new/patches.kabi/reintroduce-removed-blk_init_allocated_queue_node.patch --- old/patches.kabi/reintroduce-removed-blk_init_allocated_queue_node.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.kabi/reintroduce-removed-blk_init_allocated_queue_node.patch 2012-01-13 10:06:55.000000000 +0100 @@ -0,0 +1,75 @@ +From: Jiri Slaby <jslaby@suse.cz> +Date: Mon, 9 Jan 2012 11:19:15 +0100 +Subject: Reintroduce removed blk_init_allocated_queue_node +Patch-mainline: never + +This reverts the effect of commit +24b14588aef6226f3bcdf37e78af61cbe9a31fd2 (upstream 5151412dd433) to +the kABI. + +IOW reintroduce removed blk_init_allocated_queue_node. + +Signed-off-by: Jiri Slaby <jslaby@suse.cz> +--- + block/blk-core.c | 14 +++++++++++--- + include/linux/blkdev.h | 3 +++ + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/block/blk-core.c b/block/blk-core.c +index 8fc4ae2..795154e 100644 +--- a/block/blk-core.c ++++ b/block/blk-core.c +@@ -503,7 +502,7 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) + if (!uninit_q) + return NULL; + +- q = blk_init_allocated_queue(uninit_q, rfn, lock); ++ q = blk_init_allocated_queue_node(uninit_q, rfn, lock, node_id); + if (!q) + blk_cleanup_queue(uninit_q); + +@@ -515,9 +514,18 @@ struct request_queue * + blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn, + spinlock_t *lock) + { ++ return blk_init_allocated_queue_node(q, rfn, lock, -1); ++} ++EXPORT_SYMBOL(blk_init_allocated_queue); ++ ++struct request_queue * ++blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn, ++ spinlock_t *lock, int node_id) ++{ + if (!q) + return NULL; + ++ q->node = node_id; + if (blk_init_free_list(q)) + return NULL; + +@@ -547,7 +555,7 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn, + + return NULL; + } +-EXPORT_SYMBOL(blk_init_allocated_queue); ++EXPORT_SYMBOL(blk_init_allocated_queue_node); + + int blk_get_queue(struct request_queue *q) + { +diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h +index 5e30b45..7fbaa91 100644 +--- a/include/linux/blkdev.h ++++ b/include/linux/blkdev.h +@@ -803,6 +803,9 @@ extern void blk_unprep_request(struct request *); + */ + extern struct request_queue *blk_init_queue_node(request_fn_proc *rfn, + spinlock_t *lock, int node_id); ++extern struct request_queue *blk_init_allocated_queue_node(struct request_queue *, ++ request_fn_proc *, ++ spinlock_t *, int node_id); + extern struct request_queue *blk_init_queue(request_fn_proc *, spinlock_t *); + extern struct request_queue *blk_init_allocated_queue(struct request_queue *, + request_fn_proc *, spinlock_t *); +-- +1.7.8 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.kabi/revert-clocksource-Avoid-selecting-mult-values-that-.patch new/patches.kabi/revert-clocksource-Avoid-selecting-mult-values-that-.patch --- old/patches.kabi/revert-clocksource-Avoid-selecting-mult-values-that-.patch 2012-01-02 12:28:47.000000000 +0100 +++ new/patches.kabi/revert-clocksource-Avoid-selecting-mult-values-that-.patch 2012-01-13 10:06:55.000000000 +0100 @@ -1,12 +1,9 @@ -From a3f46156192c77b8b405616afba1ee774cfaa294 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jslaby@suse.cz> -Date: Mon, 2 Jan 2012 12:16:36 +0100 Subject: Revert "clocksource: Avoid selecting mult values that might overflow when adjusted" -Git-commit: a3f46156192c77b8b405616afba1ee774cfaa294 -Patch-mainline: yes +Patch-mainline: never -This reverts commit be80893d309e256fe05a1e55d440bd6188ba2748. +This reverts commit be80893d309 (upstream d65670a78cdbfae). It breaks kABI. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.kabi/revert-inet-add-a-redirect-generation-id-in-inetpeer.patch new/patches.kabi/revert-inet-add-a-redirect-generation-id-in-inetpeer.patch --- old/patches.kabi/revert-inet-add-a-redirect-generation-id-in-inetpeer.patch 2012-01-02 12:28:47.000000000 +0100 +++ new/patches.kabi/revert-inet-add-a-redirect-generation-id-in-inetpeer.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -From 9d0f1778415c926a2834eb01169eea7c96e5381a Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <jslaby@suse.cz> -Date: Mon, 2 Jan 2012 12:01:44 +0100 -Subject: Revert "inet: add a redirect generation id in inetpeer" -Git-commit: 9d0f1778415c926a2834eb01169eea7c96e5381a -Patch-mainline: yes - -This reverts commit 9c8da5125682191090bf32917a6bfba3d711492d. - -It breaks kABI. - -Signed-off-by: Jiri Slaby <jslaby@suse.cz> ---- - include/net/inetpeer.h | 1 - - net/ipv4/route.c | 10 +--------- - 2 files changed, 1 insertions(+), 10 deletions(-) - -diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h -index e9ff3fc..78c83e6 100644 ---- a/include/net/inetpeer.h -+++ b/include/net/inetpeer.h -@@ -35,7 +35,6 @@ struct inet_peer { - - u32 metrics[RTAX_MAX]; - u32 rate_tokens; /* rate limiting for ICMP */ -- int redirect_genid; - unsigned long rate_last; - unsigned long pmtu_expires; - u32 pmtu_orig; -diff --git a/net/ipv4/route.c b/net/ipv4/route.c -index 05ac666c..abfc641 100644 ---- a/net/ipv4/route.c -+++ b/net/ipv4/route.c -@@ -132,7 +132,6 @@ static int ip_rt_mtu_expires __read_mostly = 10 * 60 * HZ; - static int ip_rt_min_pmtu __read_mostly = 512 + 20 + 20; - static int ip_rt_min_advmss __read_mostly = 256; - static int rt_chain_length_max __read_mostly = 20; --static int redirect_genid; - - /* - * Interface to generic destination cache. -@@ -843,7 +842,6 @@ static void rt_cache_invalidate(struct net *net) - - get_random_bytes(&shuffle, sizeof(shuffle)); - atomic_add(shuffle + 1U, &net->ipv4.rt_genid); -- redirect_genid++; - } - - /* -@@ -1396,10 +1394,8 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw, - - peer = rt->peer; - if (peer) { -- if (peer->redirect_learned.a4 != new_gw || -- peer->redirect_genid != redirect_genid) { -+ if (peer->redirect_learned.a4 != new_gw) { - peer->redirect_learned.a4 = new_gw; -- peer->redirect_genid = redirect_genid; - atomic_inc(&__rt_peer_genid); - } - check_peer_redir(&rt->dst, peer); -@@ -1704,8 +1700,6 @@ static void ipv4_validate_peer(struct rtable *rt) - if (peer) { - check_peer_pmtu(&rt->dst, peer); - -- if (peer->redirect_genid != redirect_genid) -- peer->redirect_learned.a4 = 0; - if (peer->redirect_learned.a4 && - peer->redirect_learned.a4 != rt->rt_gateway) - check_peer_redir(&rt->dst, peer); -@@ -1864,8 +1858,6 @@ static void rt_init_metrics(struct rtable *rt, const struct flowi4 *fl4, - dst_init_metrics(&rt->dst, peer->metrics, false); - - check_peer_pmtu(&rt->dst, peer); -- if (peer->redirect_genid != redirect_genid) -- peer->redirect_learned.a4 = 0; - if (peer->redirect_learned.a4 && - peer->redirect_learned.a4 != rt->rt_gateway) { - rt->rt_gateway = peer->redirect_learned.a4; --- -1.7.8 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.kabi/struct-inet_peer-fixup.patch new/patches.kabi/struct-inet_peer-fixup.patch --- old/patches.kabi/struct-inet_peer-fixup.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.kabi/struct-inet_peer-fixup.patch 2012-01-13 10:06:55.000000000 +0100 @@ -0,0 +1,33 @@ +From: Jiri Slaby <jslaby@suse.cz> +Subject: kABI: struct inet_peer fixup +Patch-mainline: never + +Commit 9c8da5125 (upstream de68dca181666) add one entry into inet_peer +struct. This structure may be allcoated only in the network layer. So +we may move the entry at the end of the structure and are all fine. + +Signed-off-by: Jiri Slaby <jslaby@suse.cz> +--- + include/net/inetpeer.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/include/net/inetpeer.h ++++ b/include/net/inetpeer.h +@@ -35,7 +35,6 @@ struct inet_peer { + + u32 metrics[RTAX_MAX]; + u32 rate_tokens; /* rate limiting for ICMP */ +- int redirect_genid; + unsigned long rate_last; + unsigned long pmtu_expires; + u32 pmtu_orig; +@@ -60,6 +59,9 @@ struct inet_peer { + /* following fields might be frequently dirtied */ + __u32 dtime; /* the time of last use of not referenced entries */ + atomic_t refcnt; ++#ifndef __GENKSYMS__ ++ int redirect_genid; ++#endif + }; + + void inet_initpeers(void) __init; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.kabi/struct-urb-fixup.patch new/patches.kabi/struct-urb-fixup.patch --- old/patches.kabi/struct-urb-fixup.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.kabi/struct-urb-fixup.patch 2012-01-13 10:06:55.000000000 +0100 @@ -0,0 +1,32 @@ +From: Jiri Slaby <jslaby@suse.cz> +Subject: kABI: struct urb fixup +Patch-mainline: never + +It should be allocated using usb_alloc_urb. And it cannot be on the +stack as bad things would happen. + +Signed-off-by: Jiri Slaby <jslaby@suse.cz> +--- + include/linux/usb.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/include/linux/usb.h ++++ b/include/linux/usb.h +@@ -1202,7 +1202,6 @@ struct urb { + void *transfer_buffer; /* (in) associated data buffer */ + dma_addr_t transfer_dma; /* (in) dma addr for transfer_buffer */ + struct scatterlist *sg; /* (in) scatter gather buffer list */ +- int num_mapped_sgs; /* (internal) mapped sg entries */ + int num_sgs; /* (in) number of entries in the sg list */ + u32 transfer_buffer_length; /* (in) data buffer length */ + u32 actual_length; /* (return) actual transfer length */ +@@ -1217,6 +1216,9 @@ struct urb { + usb_complete_t complete; /* (in) completion routine */ + struct usb_iso_packet_descriptor iso_frame_desc[0]; + /* (in) ISO ONLY */ ++#ifndef __GENKSYMS__ ++ int num_mapped_sgs; /* (internal) mapped sg entries */ ++#endif + }; + + /* ----------------------------------------------------------------------- */ ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 5679 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.iA0Nd2/_old 2012-01-23 14:54:07.000000000 +0100 +++ /var/tmp/diff_new_pack.iA0Nd2/_new 2012-01-23 14:54:07.000000000 +0100 @@ -34,6 +34,8 @@ patches.kernel.org/patch-3.1.4-5 patches.kernel.org/patch-3.1.5-6 patches.kernel.org/patch-3.1.6-7 + patches.kernel.org/patch-3.1.7-8 + patches.kernel.org/patch-3.1.8-9 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -49,8 +51,10 @@ ######################################################## patches.kabi/jiffies_to_clock_t-kABI_guard.patch patches.kabi/revert-USB-fix-ehci-alignment-error - patches.kabi/revert-inet-add-a-redirect-generation-id-in-inetpeer.patch patches.kabi/revert-clocksource-Avoid-selecting-mult-values-that-.patch + patches.kabi/struct-inet_peer-fixup.patch + patches.kabi/reintroduce-removed-blk_init_allocated_queue_node.patch + patches.kabi/struct-urb-fixup.patch ######################################################## # @@ -187,6 +191,8 @@ patches.suse/readahead-request-tunables.patch patches.fixes/fs-partitions-efi-c-corrupted-guid-partition-tables-can-cause-kernel-oops patches.fixes/mm-Fix-assertion-mapping-nrpages-0-in-end_writeback.patch + patches.fixes/fsnotify-dont-bug-in-fsnotify_destroy_mark.patch + patches.fixes/proc-enable-writing-to-proc-pid-mem-revert.patch ######################################################## # IPC patches @@ -490,7 +496,6 @@ ######################################################## # Reiserfs Patches ######################################################## - patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash +needs_updating-39 patches.suse/reiser4-dependencies ######################################################## @@ -593,7 +598,6 @@ ######################################################## patches.fixes/tulip-quad-NIC-ifdown patches.drivers/ehea-modinfo.patch - patches.fixes/net-Add-a-flow_cache_flush_deferred-function.patch ######################################################## # Wireless Networking @@ -651,6 +655,7 @@ # Sound ########################################################## patches.drivers/alsa-hda-0001-realtek-Fix-missing-volume-controls-with-ALC260 + patches.drivers/alsa-hda-0002-Return-the-error-from-get_wcaps_type-for-in ######################################################## # Char / serial ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.iA0Nd2/_old 2012-01-23 14:54:07.000000000 +0100 +++ /var/tmp/diff_new_pack.iA0Nd2/_new 2012-01-23 14:54:07.000000000 +0100 @@ -1,3 +1,3 @@ -2012-01-05 17:31:19 +0100 -GIT Revision: 8f71365f5dff2261753a18e8e75ecd28de52125d +2012-01-20 17:18:24 +0100 +GIT Revision: a0563d882122ef96bc5e727ed653825fa313f652 GIT Branch: openSUSE-12.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org