more .26 patches

diff --git a/queue-2.6.26/iop-adma-fix-platform-driver-hotplug-coldplug.patch b/queue-2.6.26/iop-adma-fix-platform-driver-hotplug-coldplug.patch
new file mode 100644 (file)
index 0000000..ec2f35a
--- /dev/null
+++ b/queue-2.6.26/iop-adma-fix-platform-driver-hotplug-coldplug.patch
@@ -0,0 +1,36 @@
+From stable-bounces@linux.kernel.org Wed Jul 23 12:10:21 2008
+From: Kay Sievers <kay.sievers@vrfy.org>
+Date: Wed, 23 Jul 2008 19:10:09 GMT
+Subject: iop-adma: fix platform driver hotplug/coldplug
+To: jejb@kernel.org, stable@kernel.org
+Message-ID: <200807231910.m6NJA9eE005785@hera.kernel.org>
+
+From: Kay Sievers <kay.sievers@vrfy.org>
+
+commit ebabe2762607147d28aa395ea6df2a0ee7f795a1
+
+Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform
+modalias is prefixed with "platform:". Add MODULE_ALIAS() to most
+of the hotpluggable platform drivers, to re-enable auto loading.
+
+Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
+Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/dma/iop-adma.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/dma/iop-adma.c
++++ b/drivers/dma/iop-adma.c
+@@ -1387,6 +1387,8 @@ static void iop_chan_start_null_xor(stru
+       spin_unlock_bh(&iop_chan->lock);
+ }
+ 
++MODULE_ALIAS("platform:iop-adma");
++
+ static struct platform_driver iop_adma_driver = {
+       .probe          = iop_adma_probe,
+       .remove         = iop_adma_remove,

diff --git a/queue-2.6.26/myri10ge-do-not-forget-to-setup-the-single-slice-pointers.patch b/queue-2.6.26/myri10ge-do-not-forget-to-setup-the-single-slice-pointers.patch
new file mode 100644 (file)
index 0000000..456aab8
--- /dev/null
+++ b/queue-2.6.26/myri10ge-do-not-forget-to-setup-the-single-slice-pointers.patch
@@ -0,0 +1,42 @@
+From stable-bounces@linux.kernel.org Thu Jul 24 08:53:39 2008
+From: Brice Goglin <brice@myri.com>
+Date: Thu, 24 Jul 2008 17:53:28 +0200
+Subject: myri10ge: do not forget to setup the single slice pointers
+To: stable@kernel.org
+Message-ID: <4888A578.4090100@myri.com>
+
+From: Brice Goglin <brice@myri.com>
+
+part of commit 0dcffac1a329be69bab0ac604bf7283737108e68 upstream
+(the upstream multislice patch contains the same fix within
+ myri10ge_alloc_slices() which does this for every slice)
+
+Even if we don't have multiple slices in myri10ge in 2.6.26,
+we already use some multislice-aware routines that need the
+slice state pointers to mgp and dev to be valid.
+
+This patch fixes a regression where configuring the interface up
+would oops in myri10ge_allocate_rings() when using ss->mgp
+(and later when using ss->dev).
+
+Oops reported and patch tested by Lukas Hejtmanek at
+http://lkml.org/lkml/2008/7/23/101
+
+Signed-off-by: Brice Goglin <brice@myri.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/myri10ge/myri10ge.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/net/myri10ge/myri10ge.c
++++ b/drivers/net/myri10ge/myri10ge.c
+@@ -3126,6 +3126,8 @@ static int myri10ge_probe(struct pci_dev
+ 
+       mgp = netdev_priv(netdev);
+       mgp->dev = netdev;
++      mgp->ss.mgp = mgp;
++      mgp->ss.dev = mgp->dev;
+       netif_napi_add(netdev, &mgp->ss.napi, myri10ge_poll, myri10ge_napi_weight);
+       mgp->pdev = pdev;
+       mgp->csum_flag = MXGEFW_FLAGS_CKSUM;

diff --git a/queue-2.6.26/series b/queue-2.6.26/series
index a707c4d4c1ac7d0babc3fa997682e9120026404e..4c952c763faeeed0adfba149c4bf852813daad99 100644 (file)
--- a/queue-2.6.26/series
+++ b/queue-2.6.26/series
@@ -31,3 +31,5 @@ tcp-clear-probes_out-more-aggressively-in-tcp_ack.patch
 sparc64-fix-lockdep-issues-in-ldc-protocol-layer.patch
 sparc64-fix-cpufreq-notifier-registry.patch
 sparc64-do-not-define-bio_vmerge_boundary.patch
+iop-adma-fix-platform-driver-hotplug-coldplug.patch
+myri10ge-do-not-forget-to-setup-the-single-slice-pointers.patch