From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 5 Feb 2010 16:49:31 +0000 (-0800)
Subject: fix a .32 bug
X-Git-Tag: v2.6.32.8~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1076aa372b195e9b739be0934cfe6aea66a02218;p=thirdparty%2Fkernel%2Fstable-queue.git

fix a .32 bug
---

diff --git a/queue-2.6.32/mx3fb-some-debug-and-initialisation-fixes.patch b/queue-2.6.32/mx3fb-some-debug-and-initialisation-fixes.patch
index 4c91dfa8148..a473e492078 100644
--- a/queue-2.6.32/mx3fb-some-debug-and-initialisation-fixes.patch
+++ b/queue-2.6.32/mx3fb-some-debug-and-initialisation-fixes.patch
@@ -15,7 +15,7 @@ sdc_set_brightness(mx3fb, mx3fb->backlight_level) that will shut down the
 CONTRAST PWM output.
 
 Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
-Acked-by: Guennadi Liakhovetski <g.liakhovetski <at> gmx.de>
+Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 Cc: Sascha Hauer <s.hauer@pengutronix.de>
 Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/queue-2.6.32/net-fix-oops-at-bootime-in-sysctl-code.patch b/queue-2.6.32/net-fix-oops-at-bootime-in-sysctl-code.patch
new file mode 100644
index 00000000000..e8bdd9bd71d
--- /dev/null
+++ b/queue-2.6.32/net-fix-oops-at-bootime-in-sysctl-code.patch
@@ -0,0 +1,30 @@
+From hadi@cyberus.ca  Fri Feb  5 08:47:17 2010
+From: jamal <hadi@cyberus.ca>
+Date: Thu, 04 Feb 2010 14:50:56 -0500
+Subject: NET: fix oops at bootime in sysctl code
+To: Stefan Lippers-Hollmann <s.L-H@gmx.de>
+Cc: stable@kernel.org, gregkh@suse.de, linux-kernel@vger.kernel.org, davem@davemloft.net
+Message-ID: <1265313056.4651.18.camel@bigi>
+
+This fixes the boot time oops on the 2.6.32-stable tree.  It is needed
+only in this tree due to the divergance from upstream.
+
+From: jamal <hadi@cyberus.ca>
+Acked-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ kernel/sysctl_check.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/kernel/sysctl_check.c
++++ b/kernel/sysctl_check.c
+@@ -220,6 +220,7 @@ static const struct trans_ctl_table tran
+ 	{ NET_IPV4_CONF_PROMOTE_SECONDARIES,	"promote_secondaries" },
+ 	{ NET_IPV4_CONF_ARP_ACCEPT,		"arp_accept" },
+ 	{ NET_IPV4_CONF_ARP_NOTIFY,		"arp_notify" },
++	{ NET_IPV4_CONF_SRC_VMARK,		"src_valid_mark" },
+ 	{}
+ };
+ 
diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index 0c3d2bf662f..084cd118fe6 100644
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -72,3 +72,4 @@ pktcdvd-removing-device-does-not-remove-its-sysfs-dir.patch
 ath9k-fix-eeprom-ini-values-override-for-2ghz-only-cards.patch
 ath9k-fix-beacon-slot-buffer-leak.patch
 powerpc-tif_abi_pending-bit-removal.patch
+net-fix-oops-at-bootime-in-sysctl-code.patch
diff --git a/queue-2.6.32/x86-disable-hpet-msi-on-ati-sb700-sb800.patch b/queue-2.6.32/x86-disable-hpet-msi-on-ati-sb700-sb800.patch
index 161e0e6c4ff..e013326151c 100644
--- a/queue-2.6.32/x86-disable-hpet-msi-on-ati-sb700-sb800.patch
+++ b/queue-2.6.32/x86-disable-hpet-msi-on-ati-sb700-sb800.patch
@@ -3,7 +3,7 @@ From: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
 Date: Fri, 29 Jan 2010 11:27:31 -0800
 Subject: x86: Disable HPET MSI on ATI SB700/SB800
 To: Greg KH <greg@kroah.com>
-Cc: "Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>, Mark Hounschell <markh@compro.net>, "H. Peter Anvin" <hpa@zytor.com>, "stable@kernel.org" <stable@kernel.org>
+Cc: <venkatesh.pallipadi@intel.com>, Mark Hounschell <markh@compro.net>, "H. Peter Anvin" <hpa@zytor.com>, "stable@kernel.org" <stable@kernel.org>
 Message-ID: <20100129192731.GA11626@linux-os.sc.intel.com>
 Content-Disposition: inline