11 files changed, 29 insertions, 28 deletions
diff --git a/driver-core/bus_id-swiotlb.patch b/driver-core/bus_id-swiotlb.patch
index c6b1c416fa9901..55ac863c1de3fe 100644
--- a/driver-core/bus_id-swiotlb.patch
+++ b/driver-core/bus_id-swiotlb.patch
@@ -9,7 +9,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- a/lib/swiotlb.c
 +++ b/lib/swiotlb.c
-@@ -648,7 +648,7 @@ swiotlb_full(struct device *dev, size_t 
+@@ -647,7 +647,7 @@ swiotlb_full(struct device *dev, size_t 
  	 * the damage, or panic when the transfer is too big.
  	 */
  	printk(KERN_ERR "DMA: Out of SW-IOMMU space for %zu bytes at "
diff --git a/driver-core/s390-remove-s390_root_dev_.patch b/driver-core/s390-remove-s390_root_dev_.patch
index 363ba8a93ed941..d9bdd0048d8593 100644
--- a/driver-core/s390-remove-s390_root_dev_.patch
+++ b/driver-core/s390-remove-s390_root_dev_.patch
@@ -213,7 +213,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  #include "qeth_core.h"
  #include "qeth_core_offl.h"
-@@ -4496,7 +4495,7 @@ static int __init qeth_core_init(void)
+@@ -4525,7 +4524,7 @@ static int __init qeth_core_init(void)
  				&driver_attr_group);
  	if (rc)
  		goto driver_err;
@@ -222,7 +222,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	rc = IS_ERR(qeth_core_root_dev) ? PTR_ERR(qeth_core_root_dev) : 0;
  	if (rc)
  		goto register_err;
-@@ -4510,7 +4509,7 @@ static int __init qeth_core_init(void)
+@@ -4539,7 +4538,7 @@ static int __init qeth_core_init(void)
  
  	return 0;
  slab_err:
@@ -231,7 +231,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  register_err:
  	driver_remove_file(&qeth_core_ccwgroup_driver.driver,
  			   &driver_attr_group);
-@@ -4528,7 +4527,7 @@ out_err:
+@@ -4557,7 +4556,7 @@ out_err:
  
  static void __exit qeth_core_exit(void)
  {
@@ -326,7 +326,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <asm/smp.h>
  
  /*
-@@ -1692,7 +1691,7 @@ static int __init iucv_init(void)
+@@ -1696,7 +1695,7 @@ static int __init iucv_init(void)
  	rc = register_external_interrupt(0x4000, iucv_external_interrupt);
  	if (rc)
  		goto out;
@@ -335,7 +335,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if (IS_ERR(iucv_root)) {
  		rc = PTR_ERR(iucv_root);
  		goto out_int;
-@@ -1736,7 +1735,7 @@ out_free:
+@@ -1740,7 +1739,7 @@ out_free:
  		kfree(iucv_irq_data[cpu]);
  		iucv_irq_data[cpu] = NULL;
  	}
@@ -344,7 +344,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  out_int:
  	unregister_external_interrupt(0x4000, iucv_external_interrupt);
  out:
-@@ -1766,7 +1765,7 @@ static void __exit iucv_exit(void)
+@@ -1770,7 +1769,7 @@ static void __exit iucv_exit(void)
  		kfree(iucv_irq_data[cpu]);
  		iucv_irq_data[cpu] = NULL;
  	}
diff --git a/series b/series
index 0a0bb3aa3c51b1..cf7cf1a01b20a7 100644
--- a/series
+++ b/series
@@ -196,6 +196,10 @@ usb/usb-emi26-fix-oops-on-load.patch
 usb/usb-add-new-opticon-serial-driver.patch
 usb/usb-add-siemens_mpi-usb-serial-stub-driver.patch
 
+# finally!
+usb/usb-remove-warn-macro-from-usb.h.patch
+usb/usb-remove-info-macro-from-usb.h.patch
+
 # wimax stack
 usb/debugfs-add-helpers-for-exporting-a-size_t-simple-value.patch
 usb/wimax-documentation-for-the-stack.patch
@@ -227,10 +231,7 @@ usb/i2400m-makefile-and-kconfig.patch
 usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch
 usb/wimax-i2400m-add-credits-and-maintainers-entries.patch
 
-
 # stuff I want in my tree, but not to go into -next
-gregkh.post/usb-remove-warn-macro-from-usb.h.patch
-gregkh.post/usb-remove-info-macro-from-usb.h.patch
 gregkh.post/usb-gotemp.patch
 
 #################################
diff --git a/usb/usb-g_file_storage-add-cd-rom-emulation.patch b/usb/usb-g_file_storage-add-cd-rom-emulation.patch
index e1266cc9ede6a2..527f0ca73ddc72 100644
--- a/usb/usb-g_file_storage-add-cd-rom-emulation.patch
+++ b/usb/usb-g_file_storage-add-cd-rom-emulation.patch
@@ -152,7 +152,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #define SC_RELEASE			0x17
  #define SC_REQUEST_SENSE		0x03
  #define SC_RESERVE			0x16
-@@ -2022,23 +2042,28 @@ static int do_inquiry(struct fsg_dev *fs
+@@ -2006,23 +2026,28 @@ static int do_inquiry(struct fsg_dev *fs
  	u8	*buf = (u8 *) bh->buf;
  
  	static char vendor_id[] = "Linux   ";
@@ -184,7 +184,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			mod_data.release);
  	return 36;
  }
-@@ -2117,6 +2142,75 @@ static int do_read_capacity(struct fsg_d
+@@ -2101,6 +2126,75 @@ static int do_read_capacity(struct fsg_d
  }
  
  
@@ -260,7 +260,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static int do_mode_sense(struct fsg_dev *fsg, struct fsg_buffhd *bh)
  {
  	struct lun	*curlun = fsg->curlun;
-@@ -2864,6 +2958,26 @@ static int do_scsi_command(struct fsg_de
+@@ -2848,6 +2942,26 @@ static int do_scsi_command(struct fsg_de
  			reply = do_read_capacity(fsg, bh);
  		break;
  
@@ -287,7 +287,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	case SC_READ_FORMAT_CAPACITIES:
  		fsg->data_size_from_cmnd = get_be16(&fsg->cmnd[7]);
  		if ((reply = check_command(fsg, 10, DATA_DIR_TO_HOST,
-@@ -2949,6 +3063,7 @@ static int do_scsi_command(struct fsg_de
+@@ -2933,6 +3047,7 @@ static int do_scsi_command(struct fsg_de
  		// Fall through
  
  	default:
@@ -295,7 +295,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		fsg->data_size_from_cmnd = 0;
  		sprintf(unknown, "Unknown x%02x", fsg->cmnd[0]);
  		if ((reply = check_command(fsg, fsg->cmnd_size,
-@@ -3514,6 +3629,7 @@ static int open_backing_file(struct lun 
+@@ -3498,6 +3613,7 @@ static int open_backing_file(struct lun 
  	struct inode			*inode = NULL;
  	loff_t				size;
  	loff_t				num_sectors;
@@ -303,7 +303,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	/* R/W if we can, R/O if we must */
  	ro = curlun->ro;
-@@ -3557,8 +3673,19 @@ static int open_backing_file(struct lun 
+@@ -3541,8 +3657,19 @@ static int open_backing_file(struct lun 
  		rc = (int) size;
  		goto out;
  	}
@@ -325,7 +325,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		LINFO(curlun, "file too small: %s\n", filename);
  		rc = -ETOOSMALL;
  		goto out;
-@@ -3861,9 +3988,12 @@ static int __init fsg_bind(struct usb_ga
+@@ -3845,9 +3972,12 @@ static int __init fsg_bind(struct usb_ga
  		goto out;
  
  	if (mod_data.removable) {	// Enable the store_xxx attributes
@@ -340,7 +340,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	}
  
  	/* Find out how many LUNs there should be */
-@@ -3888,6 +4018,8 @@ static int __init fsg_bind(struct usb_ga
+@@ -3872,6 +4002,8 @@ static int __init fsg_bind(struct usb_ga
  	for (i = 0; i < fsg->nluns; ++i) {
  		curlun = &fsg->luns[i];
  		curlun->ro = mod_data.ro[i];
@@ -349,7 +349,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		curlun->dev.release = lun_release;
  		curlun->dev.parent = &gadget->dev;
  		curlun->dev.driver = &fsg_driver.driver;
-@@ -4047,9 +4179,9 @@ static int __init fsg_bind(struct usb_ga
+@@ -4031,9 +4163,9 @@ static int __init fsg_bind(struct usb_ga
  			mod_data.protocol_name, mod_data.protocol_type);
  	DBG(fsg, "VendorID=x%04x, ProductID=x%04x, Release=x%04x\n",
  			mod_data.vendor, mod_data.product, mod_data.release);
diff --git a/usb/usb-gadget-don-t-wait-for-completion-twice.patch b/usb/usb-gadget-don-t-wait-for-completion-twice.patch
index f71c51c5e678be..a3980e1538a2b8 100644
--- a/usb/usb-gadget-don-t-wait-for-completion-twice.patch
+++ b/usb/usb-gadget-don-t-wait-for-completion-twice.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- a/drivers/usb/gadget/file_storage.c
 +++ b/drivers/usb/gadget/file_storage.c
-@@ -4198,6 +4198,7 @@ out:
+@@ -4182,6 +4182,7 @@ out:
  	fsg->state = FSG_STATE_TERMINATED;	// The thread is dead
  	fsg_unbind(gadget);
  	close_all_backing_files(fsg);
diff --git a/usb/usb-move-isp1301_omap-to-drivers-usb-otg.patch b/usb/usb-move-isp1301_omap-to-drivers-usb-otg.patch
index 5c2f38c11f62f0..b8ef48f821646e 100644
--- a/usb/usb-move-isp1301_omap-to-drivers-usb-otg.patch
+++ b/usb/usb-move-isp1301_omap-to-drivers-usb-otg.patch
@@ -1737,9 +1737,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -	  This driver can also be built as a module.  If so, the module
 -	  will be called isp1301_omap.
 -
- config TPS65010
- 	tristate "TPS6501x Power Management chips"
- 	depends on GPIOLIB
+ config SENSORS_MAX6875
+ 	tristate "Maxim MAX6875 Power supply supervisor"
+ 	depends on EXPERIMENTAL
 --- a/drivers/i2c/chips/Makefile
 +++ b/drivers/i2c/chips/Makefile
 @@ -18,7 +18,6 @@ obj-$(CONFIG_SENSORS_PCA9539)	+= pca9539
@@ -1747,9 +1747,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  obj-$(CONFIG_PCF8575)		+= pcf8575.o
  obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
 -obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o
- obj-$(CONFIG_TPS65010)		+= tps65010.o
- obj-$(CONFIG_MENELAUS)		+= menelaus.o
  obj-$(CONFIG_SENSORS_TSL2550)	+= tsl2550.o
+ obj-$(CONFIG_MCU_MPC8349EMITX)	+= mcu_mpc8349emitx.o
+ 
 --- a/drivers/Makefile
 +++ b/drivers/Makefile
 @@ -57,6 +57,7 @@ obj-$(CONFIG_ATA_OVER_ETH)	+= block/aoe/
diff --git a/gregkh.post/usb-remove-info-macro-from-usb.h.patch b/usb/usb-remove-info-macro-from-usb.h.patch
index dcb7cf0cd7dfd3..dcb7cf0cd7dfd3 100644
--- a/gregkh.post/usb-remove-info-macro-from-usb.h.patch
+++ b/usb/usb-remove-info-macro-from-usb.h.patch
diff --git a/gregkh.post/usb-remove-warn-macro-from-usb.h.patch b/usb/usb-remove-warn-macro-from-usb.h.patch
index f4d27b881b4b38..f4d27b881b4b38 100644
--- a/gregkh.post/usb-remove-warn-macro-from-usb.h.patch
+++ b/usb/usb-remove-warn-macro-from-usb.h.patch
diff --git a/usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch b/usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch
index 7914d7b5d9a3ae..d99a50de4e4532 100644
--- a/usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch
+++ b/usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch
@@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- a/include/linux/Kbuild
 +++ b/include/linux/Kbuild
-@@ -376,3 +376,5 @@ unifdef-y += xattr.h
+@@ -372,3 +372,5 @@ unifdef-y += xattr.h
  unifdef-y += xfrm.h
  
  objhdr-y += version.h
diff --git a/usb/wimax-i2400m-add-credits-and-maintainers-entries.patch b/usb/wimax-i2400m-add-credits-and-maintainers-entries.patch
index a6171c780ad74f..81f0300f1b48d2 100644
--- a/usb/wimax-i2400m-add-credits-and-maintainers-entries.patch
+++ b/usb/wimax-i2400m-add-credits-and-maintainers-entries.patch
@@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  INTEL WIRELESS WIFI LINK (iwlwifi)
  P:	Zhu Yi
  M:	yi.zhu@intel.com
-@@ -4741,6 +4749,14 @@ M:	zaga@fly.cc.fer.hr
+@@ -4736,6 +4744,14 @@ M:	zaga@fly.cc.fer.hr
  L:	linux-scsi@vger.kernel.org
  S:	Maintained
  
diff --git a/version b/version
index a7b0f17f5a5cd1..54003b5874df10 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.28-git7
+2.6.28-git8