updates

13 files changed, 276 insertions, 1 deletions

diff --git a/i01.patch b/i01.patch
index 49e788303055f2..728914bc139ddb 100644
--- a/i01.patch
+++ b/i01.patch
@@ -1,4 +1,22 @@
+From foo@baz Sun Oct  6 13:26:44 PDT 2013
+Date: Sun, 06 Oct 2013 13:26:44 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: ide: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead.  This converts the ide bus code to use the
+correct field.
+
+Cc: David S. Miller <davem@davemloft.net>
+Cc: <linux-ide@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
 ---
+
+David, I can take this through my driver-core tree if you don't want to
+take it through yours, just let me know what works best for you.
+
  drivers/ide/ide-sysfs.c |   35 ++++++++++++++++++++++++++---------
  drivers/ide/ide.c       |    2 +-
  include/linux/ide.h     |    2 +-
diff --git a/i02.patch b/i02.patch
index bf333e9fbea1a7..f0864cf6b0a888 100644
--- a/i02.patch
+++ b/i02.patch
@@ -1,4 +1,24 @@
+From foo@baz Sun Oct  6 13:29:07 PDT 2013
+Date: Sun, 06 Oct 2013 13:29:07 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: ipack: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead.  This converts the ipack bus code to use the
+correct field.
+
+Cc: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
+Cc: Jens Taprogge <jens.taprogge@taprogge.org>
+Cc: <industrypack-devel@lists.sourceforge.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
 ---
+
+Samuel and Jens, I can take this through my driver-core tree if you
+don't want to take it through yours, just let me know what works best
+for you.
+
  drivers/ipack/ipack.c |   22 +++++++++++++++-------
  1 file changed, 15 insertions(+), 7 deletions(-)
 
diff --git a/p01.patch b/p01.patch
index 9220c31421eecf..bf93035213f601 100644
--- a/p01.patch
+++ b/p01.patch
@@ -1,3 +1,16 @@
+From foo@baz Sun Oct  6 13:31:35 PDT 2013
+Date: Sun, 06 Oct 2013 13:31:35 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: pci: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead.  This converts the PCI bus code to use the
+correct field.
+
+Cc: Bjorn Helgaas <bhelgaas@google.com>
+Cc: <linux-pci@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  drivers/pci/pci-driver.c |    2 -
  drivers/pci/pci-sysfs.c  |   73 +++++++++++++++++++++++++++++------------------
diff --git a/p02.patch b/p02.patch
index feb394858babd7..956056b882fb58 100644
--- a/p02.patch
+++ b/p02.patch
@@ -1,3 +1,19 @@
+From foo@baz Sun Oct  6 13:31:27 PDT 2013
+Date: Sun, 06 Oct 2013 13:31:27 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: mdio_bus: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead.  This converts the MDIO bus code to use the
+correct field.
+
+Cc: David S. Miller <davem@davemloft.net>
+Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Cc: Nick Bowler <nbowler@elliptictech.com>
+Cc: <netdev@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
 ---
  drivers/net/phy/mdio_bus.c |   10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/p03.patch b/p03.patch
index 4709d871da3dba..b9150be474e934 100644
--- a/p03.patch
+++ b/p03.patch
@@ -1,3 +1,17 @@
+From foo@baz Sun Oct  6 13:34:21 PDT 2013
+Date: Sun, 06 Oct 2013 13:34:21 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: PNP: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead.  This converts the PNP bus code to use the
+correct field.
+
+Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Cc: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
 ---
  drivers/pnp/base.h      |    2 +-
  drivers/pnp/driver.c    |    2 +-
diff --git a/p04.patch b/p04.patch
index c1146aea5f6a41..7cd0a254a74be8 100644
--- a/p04.patch
+++ b/p04.patch
@@ -1,3 +1,20 @@
+From foo@baz Sun Oct  6 13:36:04 PDT 2013
+Date: Sun, 06 Oct 2013 13:36:04 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: MMC: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead.  This converts the MMC bus code to use the
+correct field.
+
+Cc: Chris Ball <cjb@laptop.org>
+Cc: Ulf Hansson <ulf.hansson@linaro.org>
+Cc: Konstantin Dorfman <kdorfman@codeaurora.org>
+Cc: Seungwon Jeon <tgih.jun@samsung.com>
+Cc: <linux-mmc@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
 ---
  drivers/mmc/core/bus.c      |   12 +++++++-----
  drivers/mmc/core/sdio_bus.c |   19 +++++++++++--------
diff --git a/p05.patch b/p05.patch
index a7760fe0fedc28..362f00870ae6df 100644
--- a/p05.patch
+++ b/p05.patch
@@ -1,3 +1,16 @@
+From foo@baz Sun Oct  6 13:37:35 PDT 2013
+Date: Sun, 06 Oct 2013 13:37:35 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: uwb: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead.  This converts the uwb bus code to use the
+correct field.
+
+Cc: Bruno Morelli <bruno@evidence.eu.com>
+Cc: <linux-usb@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  drivers/uwb/umc-bus.c |   13 ++++++++-----
  1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/p06.patch b/p06.patch
index 983028cd548547..d5bfcb5438b56c 100644
--- a/p06.patch
+++ b/p06.patch
@@ -1,3 +1,16 @@
+From foo@baz Sun Oct  6 13:38:32 PDT 2013
+Date: Sun, 06 Oct 2013 13:38:32 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: bcma: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead.  This converts the bcma bus code to use the
+correct field.
+
+Cc: Rafał Miłecki <zajec5@gmail.com>
+Cc: <linux-wireless@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  drivers/bcma/main.c |   23 ++++++++++++++++-------
  1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/p07.patch b/p07.patch
index a04b2c093314a7..9842fc2c16ccd6 100644
--- a/p07.patch
+++ b/p07.patch
@@ -1,3 +1,17 @@
+From foo@baz Sun Oct  6 13:39:27 PDT 2013
+Date: Sun, 06 Oct 2013 13:39:27 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: pcmcia: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead.  This converts the pcmcia bus code to use the
+correct field.
+
+Cc: Bill Pemberton <wfp5p@virginia.edu>
+Cc: <linux-pcmcia@lists.infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
 ---
  drivers/pcmcia/ds.c |   63 +++++++++++++++++++++++++++++++---------------------
  1 file changed, 38 insertions(+), 25 deletions(-)
diff --git a/p08.patch b/p08.patch
index a59cf69031439d..9947c9df405f0b 100644
--- a/p08.patch
+++ b/p08.patch
@@ -1,3 +1,17 @@
+From foo@baz Sun Oct  6 13:52:56 PDT 2013
+Date: Sun, 06 Oct 2013 13:52:56 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: rapidio: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead.  This converts the rapidio bus code to use the
+correct field.
+
+Cc: Matt Porter <mporter@kernel.crashing.org>
+Cc: Alexandre Bounine <alexandre.bounine@idt.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
 ---
  drivers/rapidio/rio-driver.c |    2 +-
  drivers/rapidio/rio-sysfs.c  |   38 ++++++++++++++++++++++++--------------
diff --git a/p09.patch b/p09.patch
index 96de9b4ed3484a..c6358f0b2098ae 100644
--- a/p09.patch
+++ b/p09.patch
@@ -1,3 +1,17 @@
+From foo@baz Sun Oct  6 13:53:48 PDT 2013
+Date: Sun, 06 Oct 2013 13:53:48 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: ssb: convert bus code to use dev_groups
+
+The dev_attrs field of struct bus_type is going away soon, dev_groups
+should be used instead.  This converts the ssb bus code to use the
+correct field.
+
+Cc: Michael Buesch <m@bues.ch>
+Cc: <netdev@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
 ---
  drivers/ssb/main.c |   23 +++++++++++++----------
  1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/p29.patch b/p29.patch
new file mode 100644
index 00000000000000..8081712d15e478
--- /dev/null
+++ b/p29.patch
@@ -0,0 +1,107 @@
+---
+ arch/powerpc/kernel/vio.c |   50 ++++++++++++++++++++++++++--------------------
+ 1 file changed, 29 insertions(+), 21 deletions(-)
+
+--- a/arch/powerpc/kernel/vio.c
++++ b/arch/powerpc/kernel/vio.c
+@@ -936,7 +936,7 @@ static void vio_cmo_bus_init(void)
+ /* sysfs device functions and data structures for CMO */
+ 
+ #define viodev_cmo_rd_attr(name)                                        \
+-static ssize_t viodev_cmo_##name##_show(struct device *dev,             \
++static ssize_t cmo_##name##_show(struct device *dev,                    \
+                                         struct device_attribute *attr,  \
+                                          char *buf)                     \
+ {                                                                       \
+@@ -950,7 +950,7 @@ static ssize_t viodev_cmo_allocs_failed_
+ 	return sprintf(buf, "%d\n", atomic_read(&viodev->cmo.allocs_failed));
+ }
+ 
+-static ssize_t viodev_cmo_allocs_failed_reset(struct device *dev,
++static ssize_t cmo_allocs_failed_store(struct device *dev,
+ 		struct device_attribute *attr, const char *buf, size_t count)
+ {
+ 	struct vio_dev *viodev = to_vio_dev(dev);
+@@ -958,7 +958,7 @@ static ssize_t viodev_cmo_allocs_failed_
+ 	return count;
+ }
+ 
+-static ssize_t viodev_cmo_desired_set(struct device *dev,
++static ssize_t cmo_desired_store(struct device *dev,
+ 		struct device_attribute *attr, const char *buf, size_t count)
+ {
+ 	struct vio_dev *viodev = to_vio_dev(dev);
+@@ -981,18 +981,25 @@ static ssize_t name_show(struct device *
+ static ssize_t devspec_show(struct device *, struct device_attribute *, char *);
+ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
+ 			     char *buf);
+-static struct device_attribute vio_cmo_dev_attrs[] = {
+-	__ATTR_RO(name),
+-	__ATTR_RO(devspec),
+-	__ATTR_RO(modalias),
+-	__ATTR(cmo_desired,       S_IWUSR|S_IRUSR|S_IWGRP|S_IRGRP|S_IROTH,
+-	       viodev_cmo_desired_show, viodev_cmo_desired_set),
+-	__ATTR(cmo_entitled,      S_IRUGO, viodev_cmo_entitled_show,      NULL),
+-	__ATTR(cmo_allocated,     S_IRUGO, viodev_cmo_allocated_show,     NULL),
+-	__ATTR(cmo_allocs_failed, S_IWUSR|S_IRUSR|S_IWGRP|S_IRGRP|S_IROTH,
+-	       viodev_cmo_allocs_failed_show, viodev_cmo_allocs_failed_reset),
+-	__ATTR_NULL
++static DEVICE_ATTR_RO(name);
++static DEVICE_ATTR_RO(devspec);
++static DEVICE_ATTR_RO(modalias);
++static DEVICE_ATTR_RO(cmo_entitled);
++static DEVICE_ATTR_RO(cmo_allocated);
++static DEVICE_ATTR_RW(cmo_desired);
++static DEVICE_ATTR_RW(cmo_allocs_failed);
++
++static struct attribute *vio_cmo_dev_attrs[] = {
++	&dev_attr_name.attr,
++	&dev_attr_devspec.attr,
++	&dev_attr_modalias.attr,
++	&dev_attr_cmo_entitled.attr,
++	&dev_attr_cmo_allocated.attr,
++	&dev_attr_cmo_desired.attr,
++	&dev_attr_cmo_allocs_failed.attr,
++	NULL,
+ };
++ATTRIBUTE_GROUPS(vio_cmo_dev);
+ 
+ /* sysfs bus functions and data structures for CMO */
+ 
+@@ -1054,7 +1061,7 @@ ATTRIBUTE_GROUPS(vio_bus);
+ 
+ static void vio_cmo_sysfs_init(void)
+ {
+-	vio_bus_type.dev_attrs = vio_cmo_dev_attrs;
++	vio_bus_type.dev_groups = vio_cmo_dev_groups;
+ 	vio_bus_type.bus_groups = vio_bus_groups;
+ }
+ #else /* CONFIG_PPC_SMLPAR */
+@@ -1549,12 +1556,13 @@ static ssize_t modalias_show(struct devi
+ 	return sprintf(buf, "vio:T%sS%s\n", vio_dev->type, cp);
+ }
+ 
+-static struct device_attribute vio_dev_attrs[] = {
+-	__ATTR_RO(name),
+-	__ATTR_RO(devspec),
+-	__ATTR_RO(modalias),
+-	__ATTR_NULL
++static struct attribute *vio_dev_attrs[] = {
++	&dev_attr_name.attr,
++	&dev_attr_devspec.attr,
++	&dev_attr_modalias.attr,
++	NULL,
+ };
++ATTRIBUTE_GROUPS(vio_dev);
+ 
+ void vio_unregister_device(struct vio_dev *viodev)
+ {
+@@ -1590,7 +1598,7 @@ static int vio_hotplug(struct device *de
+ 
+ struct bus_type vio_bus_type = {
+ 	.name = "vio",
+-	.dev_attrs = vio_dev_attrs,
++	.dev_groups = vio_dev_groups,
+ 	.uevent = vio_hotplug,
+ 	.match = vio_bus_match,
+ 	.probe = vio_bus_probe,
diff --git a/series b/series
index 59967e352ac694..2d496ff76d9599 100644
--- a/series
+++ b/series
@@ -62,7 +62,6 @@ p02.patch
 p03.patch
 p04.patch
 p05.patch
-qlcnic_sysfs.patch
 p06.patch
 p07.patch
 p08.patch
@@ -87,3 +86,6 @@ p26.patch
 p27.patch
 p28.patch
 p29.patch
+
+qlcnic_sysfs.patch
+