2.6.17-rc3 resync.

Dropped ndevfs patch, as I really don't want to debug it.
added a pci 64 bit resource patch

3 files changed, 65 insertions, 2 deletions

diff --git a/pci/pci-64-bit-resources-drivers-net-changes.patch b/pci/pci-64-bit-resources-drivers-net-changes.patch
index d1df02ed604e1..e60fd8e8434ba 100644
--- a/pci/pci-64-bit-resources-drivers-net-changes.patch
+++ b/pci/pci-64-bit-resources-drivers-net-changes.patch
@@ -126,7 +126,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if ((dev = skge_devinit(hw, 0, using_dac)) == NULL)
 --- gregkh-2.6.orig/drivers/net/sky2.c
 +++ gregkh-2.6/drivers/net/sky2.c
-@@ -3229,9 +3229,9 @@ static int __devinit sky2_probe(struct p
+@@ -3255,9 +3255,9 @@ static int __devinit sky2_probe(struct p
  	if (err)
  		goto err_out_iounmap;
  
diff --git a/pci/pci-64-bit-resources-fix-pnp-sysfs-interface.patch b/pci/pci-64-bit-resources-fix-pnp-sysfs-interface.patch
new file mode 100644
index 0000000000000..42f6c51ea8321
--- /dev/null
+++ b/pci/pci-64-bit-resources-fix-pnp-sysfs-interface.patch
@@ -0,0 +1,63 @@
+From linux-kernel-owner+greg=40kroah.com-S965040AbWD0Psg@vger.kernel.org  Thu Apr 27 10:05:09 2006
+From: Matthieu CASTET <castet.matthieu@free.fr>
+Subject: PCI: 64 bit resources: fix pnp sysfs interface
+Date: Thu, 27 Apr 2006 17:47:25 +0200
+Message-ID: <pan.2006.04.27.15.47.20.688183@free.fr>
+
+Hi Andrew,
+
+Le Thu, 27 Apr 2006 01:41:41 -0700, Andrew Morton a =E9crit=A0:
+
+> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.17-rc2/2.6.17-rc2-mm1/
+
+64 bit resources core changes in ioport.h break pnp sysfs interface.
+
+A patch like this is needed.
+
+Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr>
+Cc: Adam Belay <ambx1@neo.rr.com>
+Cc: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/pnp/interface.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- gregkh-2.6.orig/drivers/pnp/interface.c
++++ gregkh-2.6/drivers/pnp/interface.c
+@@ -264,7 +264,7 @@ static ssize_t pnp_show_current_resource
+ 			if (pnp_port_flags(dev, i) & IORESOURCE_DISABLED)
+ 				pnp_printf(buffer," disabled\n");
+ 			else
+-				pnp_printf(buffer," 0x%lx-0x%lx\n",
++				pnp_printf(buffer," 0x%llx-0x%llx\n",
+ 						pnp_port_start(dev, i),
+ 						pnp_port_end(dev, i));
+ 		}
+@@ -275,7 +275,7 @@ static ssize_t pnp_show_current_resource
+ 			if (pnp_mem_flags(dev, i) & IORESOURCE_DISABLED)
+ 				pnp_printf(buffer," disabled\n");
+ 			else
+-				pnp_printf(buffer," 0x%lx-0x%lx\n",
++				pnp_printf(buffer," 0x%llx-0x%llx\n",
+ 						pnp_mem_start(dev, i),
+ 						pnp_mem_end(dev, i));
+ 		}
+@@ -286,7 +286,7 @@ static ssize_t pnp_show_current_resource
+ 			if (pnp_irq_flags(dev, i) & IORESOURCE_DISABLED)
+ 				pnp_printf(buffer," disabled\n");
+ 			else
+-				pnp_printf(buffer," %ld\n",
++				pnp_printf(buffer," %lld\n",
+ 						pnp_irq(dev, i));
+ 		}
+ 	}
+@@ -296,7 +296,7 @@ static ssize_t pnp_show_current_resource
+ 			if (pnp_dma_flags(dev, i) & IORESOURCE_DISABLED)
+ 				pnp_printf(buffer," disabled\n");
+ 			else
+-				pnp_printf(buffer," %ld\n",
++				pnp_printf(buffer," %lld\n",
+ 						pnp_dma(dev, i));
+ 		}
+ 	}
diff --git a/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch b/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch
index b7c2bb66a63ba..71a26ba463a1a 100644
--- a/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch
+++ b/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch
@@ -189,7 +189,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		}
  	}
  
-@@ -4574,7 +4585,7 @@ e1000_resume(struct pci_dev *pdev)
+@@ -4575,7 +4586,7 @@ e1000_resume(struct pci_dev *pdev)
  	if (retval)
  		DPRINTK(PROBE, ERR, "Error in setting power state\n");
  	e1000_pci_restore_state(adapter);