.27 patches

diff --git a/queue-2.6.27/arcnet-limit-com20020-pci-id-matches-for-sohard-cards.patch b/queue-2.6.27/arcnet-limit-com20020-pci-id-matches-for-sohard-cards.patch
new file mode 100644 (file)
index 0000000..8d36c0e
--- /dev/null
+++ b/queue-2.6.27/arcnet-limit-com20020-pci-id-matches-for-sohard-cards.patch
@@ -0,0 +1,38 @@
+From e7971c80a8e0299f91272ad8e8ac4167623e1862 Mon Sep 17 00:00:00 2001
+From: Andreas Bombe <aeb@debian.org>
+Date: Mon, 17 May 2010 23:12:46 -0700
+Subject: ARCNET: Limit com20020 PCI ID matches for SOHARD cards
+
+From: Andreas Bombe <aeb@debian.org>
+
+commit e7971c80a8e0299f91272ad8e8ac4167623e1862 upstream.
+
+The SH SOHARD ARCNET cards are implemented using generic PLX Technology
+PCI<->IOBus bridges. Subvendor and subdevice IDs were not specified,
+causing the driver to attach to any such bridge and likely crash the
+system by attempting to initialize an unrelated device.
+
+Fix by specifying subvendor and subdevice according to the values found
+in the PCI-ID Repository at http://pci-ids.ucw.cz/ .
+
+Signed-off-by: Andreas Bombe <aeb@debian.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/arcnet/com20020-pci.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/arcnet/com20020-pci.c
++++ b/drivers/net/arcnet/com20020-pci.c
+@@ -162,8 +162,8 @@ static struct pci_device_id com20020pci_
+       { 0x1571, 0xa204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+       { 0x1571, 0xa205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+       { 0x1571, 0xa206, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+-      { 0x10B5, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+-      { 0x10B5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
++      { 0x10B5, 0x9030, 0x10B5,     0x2978,     0, 0, ARC_CAN_10MBIT },
++      { 0x10B5, 0x9050, 0x10B5,     0x2273,     0, 0, ARC_CAN_10MBIT },
+       { 0x14BA, 0x6000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+       { 0x10B5, 0x2200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+       {0,}

diff --git a/queue-2.6.27/nfsd-don-t-report-compiled-out-versions-as-present.patch b/queue-2.6.27/nfsd-don-t-report-compiled-out-versions-as-present.patch
new file mode 100644 (file)
index 0000000..d52f0db
--- /dev/null
+++ b/queue-2.6.27/nfsd-don-t-report-compiled-out-versions-as-present.patch
@@ -0,0 +1,39 @@
+From 15ddb4aec54422ead137b03ea4e9b3f5db3f7cc2 Mon Sep 17 00:00:00 2001
+From: Pavel Emelyanov <xemul@openvz.org>
+Date: Fri, 14 May 2010 15:33:36 +0400
+Subject: NFSD: don't report compiled-out versions as present
+
+From: Pavel Emelyanov <xemul@openvz.org>
+
+commit 15ddb4aec54422ead137b03ea4e9b3f5db3f7cc2 upstream.
+
+The /proc/fs/nfsd/versions file calls nfsd_vers() to check whether
+the particular nfsd version is present/available. The problem is
+that once I turn off e.g. NFSD-V4 this call returns -1 which is
+true from the callers POV which is wrong.
+
+The proposal is to report false in that case.
+
+The bug has existed since 6658d3a7bbfd1768 "[PATCH] knfsd: remove
+nfsd_versbits as intermediate storage for desired versions".
+
+Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
+Acked-by: NeilBrown <neilb@suse.de>
+Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/nfsd/nfssvc.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/nfsd/nfssvc.c
++++ b/fs/nfsd/nfssvc.c
+@@ -126,7 +126,7 @@ struct svc_program         nfsd_program = {
+ int nfsd_vers(int vers, enum vers_op change)
+ {
+       if (vers < NFSD_MINVERS || vers >= NFSD_NRVERS)
+-              return -1;
++              return 0;
+       switch(change) {
+       case NFSD_SET:
+               nfsd_versions[vers] = nfsd_version[vers];

diff --git a/queue-2.6.27/series b/queue-2.6.27/series
index 01c71a2a624280be254b64ac80f4d8774bbfc106..44ec4429461c5fda8fd701d8da18e82e391d70a6 100644 (file)
--- a/queue-2.6.27/series
+++ b/queue-2.6.27/series
@@ -1 +1,3 @@
 libata-disable-atapi-an-by-default.patch
+nfsd-don-t-report-compiled-out-versions-as-present.patch
+arcnet-limit-com20020-pci-id-matches-for-sohard-cards.patch