1 files changed, 0 insertions, 199 deletions
diff --git a/f2.patch b/f2.patch
deleted file mode 100644
index d8eb2ce1a8b842..00000000000000
--- a/f2.patch
+++ /dev/null
@@ -1,199 +0,0 @@
----
- arch/powerpc/kernel/ibmebus.c  |   12 +++++++-----
- drivers/block/rbd.c            |   14 +++++++++-----
- drivers/pci/pci-driver.c       |    2 +-
- drivers/pci/pci-sysfs.c        |   16 +++++++++++++---
- drivers/pci/pci.h              |    2 +-
- drivers/rapidio/rio-driver.c   |    2 +-
- drivers/rapidio/rio-sysfs.c    |   16 +++++++++++++---
- drivers/rapidio/rio.h          |    2 +-
- drivers/scsi/fcoe/fcoe_sysfs.c |   14 +++++++++-----
- 9 files changed, 55 insertions(+), 25 deletions(-)
-
---- a/arch/powerpc/kernel/ibmebus.c
-+++ b/arch/powerpc/kernel/ibmebus.c
-@@ -292,6 +292,7 @@ out:
- 		return rc;
- 	return count;
- }
-+static BUS_ATTR(remove, S_IWUSR, NULL, ibmebus_store_remove);
- 
- static ssize_t ibmebus_store_remove(struct bus_type *bus,
- 				    const char *buf, size_t count)
-@@ -317,13 +318,14 @@ static ssize_t ibmebus_store_remove(stru
- 		return -ENODEV;
- 	}
- }
--
-+static BUS_ATTR(remove, S_IWUSR, NULL, ibmebus_store_remove);
- 
- static struct bus_attribute ibmebus_bus_attrs[] = {
--	__ATTR(probe, S_IWUSR, NULL, ibmebus_store_probe),
--	__ATTR(remove, S_IWUSR, NULL, ibmebus_store_remove),
--	__ATTR_NULL
-+	&bus_attr_probe.attr,
-+	&bus_attr_probe.remove,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(ibmbus_bus);
- 
- static int ibmebus_bus_bus_match(struct device *dev, struct device_driver *drv)
- {
-@@ -713,7 +715,7 @@ static struct dev_pm_ops ibmebus_bus_dev
- struct bus_type ibmebus_bus_type = {
- 	.name      = "ibmebus",
- 	.uevent    = of_device_uevent_modalias,
--	.bus_attrs = ibmebus_bus_attrs,
-+	.bus_groups = ibmbus_bus_groups,
- 	.match     = ibmebus_bus_bus_match,
- 	.probe     = ibmebus_bus_device_probe,
- 	.remove    = ibmebus_bus_device_remove,
---- a/drivers/block/rbd.c
-+++ b/drivers/block/rbd.c
-@@ -397,15 +397,19 @@ static ssize_t rbd_remove(struct bus_typ
- static int rbd_dev_image_probe(struct rbd_device *rbd_dev, bool mapping);
- static void rbd_spec_put(struct rbd_spec *spec);
- 
--static struct bus_attribute rbd_bus_attrs[] = {
--	__ATTR(add, S_IWUSR, NULL, rbd_add),
--	__ATTR(remove, S_IWUSR, NULL, rbd_remove),
--	__ATTR_NULL
-+static BUS_ATTR(add, S_IWUSR, NULL, rbd_add);
-+static BUS_ATTR(remove, S_IWUSR, NULL, rbd_remove);
-+
-+static struct attribute *rbd_bus_attrs[] = {
-+	&bus_attr_add.attr,
-+	&bus_attr_remove.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(rbd_bus);
- 
- static struct bus_type rbd_bus_type = {
- 	.name		= "rbd",
--	.bus_attrs	= rbd_bus_attrs,
-+	.bus_groups	= rbd_bus_groups,
- };
- 
- static void rbd_root_dev_release(struct device *dev)
---- a/drivers/pci/pci-driver.c
-+++ b/drivers/pci/pci-driver.c
-@@ -1274,7 +1274,7 @@ struct bus_type pci_bus_type = {
- 	.remove		= pci_device_remove,
- 	.shutdown	= pci_device_shutdown,
- 	.dev_attrs	= pci_dev_attrs,
--	.bus_attrs	= pci_bus_attrs,
-+	.bus_groups	= pci_bus_groups,
- 	.drv_attrs	= pci_drv_attrs,
- 	.pm		= PCI_PM_OPS_PTR,
- };
---- a/drivers/pci/pci-sysfs.c
-+++ b/drivers/pci/pci-sysfs.c
-@@ -302,10 +302,20 @@ static ssize_t bus_rescan_store(struct b
- 	}
- 	return count;
- }
-+static BUS_ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, bus_rescan_store);
- 
--struct bus_attribute pci_bus_attrs[] = {
--	__ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, bus_rescan_store),
--	__ATTR_NULL
-+struct attribute *pci_bus_attrs[] = {
-+	&bus_attr_rescan.attr,
-+	NULL,
-+};
-+
-+static const struct attribute_group pci_bus_group = {
-+	.attrs = pci_bus_attrs,
-+};
-+
-+const struct attribute_group *pci_bus_groups[] = {
-+	&pci_bus_group,
-+	NULL,
- };
- 
- static ssize_t
---- a/drivers/pci/pci.h
-+++ b/drivers/pci/pci.h
-@@ -153,7 +153,7 @@ static inline int pci_no_d1d2(struct pci
- extern struct device_attribute pci_dev_attrs[];
- extern const struct attribute_group *pcibus_groups[];
- extern struct device_type pci_dev_type;
--extern struct bus_attribute pci_bus_attrs[];
-+extern const struct attribute_group *pci_bus_groups[];
- 
- 
- /**
---- a/drivers/rapidio/rio-driver.c
-+++ b/drivers/rapidio/rio-driver.c
-@@ -224,7 +224,7 @@ struct bus_type rio_bus_type = {
- 	.name = "rapidio",
- 	.match = rio_match_bus,
- 	.dev_attrs = rio_dev_attrs,
--	.bus_attrs = rio_bus_attrs,
-+	.bus_groups = rio_bus_groups,
- 	.probe = rio_device_probe,
- 	.remove = rio_device_remove,
- 	.uevent	= rio_uevent,
---- a/drivers/rapidio/rio-sysfs.c
-+++ b/drivers/rapidio/rio-sysfs.c
-@@ -316,8 +316,18 @@ exit:
- 
- 	return rc;
- }
-+static BUS_ATTR(scan, (S_IWUSR|S_IWGRP), NULL, bus_scan_store);
- 
--struct bus_attribute rio_bus_attrs[] = {
--	__ATTR(scan, (S_IWUSR|S_IWGRP), NULL, bus_scan_store),
--	__ATTR_NULL
-+static struct bus_attribute rio_bus_attrs[] = {
-+	&bus_attr_scan.attr,
-+	NULL,
-+};
-+
-+static const struct attribute_group rio_bus_group = {
-+	.attrs = rio_bus_attrs,
-+};
-+
-+const struct attribute_group *rio_bus_groups[] = {
-+	&rio_bus_group,
-+	NULL,
- };
---- a/drivers/rapidio/rio.h
-+++ b/drivers/rapidio/rio.h
-@@ -49,7 +49,7 @@ extern int rio_mport_scan(int mport_id);
- 
- /* Structures internal to the RIO core code */
- extern struct device_attribute rio_dev_attrs[];
--extern struct bus_attribute rio_bus_attrs[];
-+extern const struct attribute_group *rio_bus_groups[];
- 
- #define RIO_GET_DID(size, x)	(size ? (x & 0xffff) : ((x & 0x00ff0000) >> 16))
- #define RIO_SET_DID(size, x)	(size ? (x & 0xffff) : ((x & 0x000000ff) << 16))
---- a/drivers/scsi/fcoe/fcoe_sysfs.c
-+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
-@@ -553,16 +553,20 @@ static struct device_type fcoe_fcf_devic
- 	.release = fcoe_fcf_device_release,
- };
- 
--static struct bus_attribute fcoe_bus_attr_group[] = {
--	__ATTR(ctlr_create, S_IWUSR, NULL, fcoe_ctlr_create_store),
--	__ATTR(ctlr_destroy, S_IWUSR, NULL, fcoe_ctlr_destroy_store),
--	__ATTR_NULL
-+static BUS_ATTR(ctlr_create, S_IWUSR, NULL, fcoe_ctlr_create_store);
-+static BUS_ATTR(ctlr_destroy, S_IWUSR, NULL, fcoe_ctlr_destroy_store);
-+
-+static struct attribute *fcoe_bus_attrs[] = {
-+	&bus_attr_ctlr_create.attr,
-+	&bus_attr_ctrl_destroy.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(fcoe_bus);
- 
- static struct bus_type fcoe_bus_type = {
- 	.name = "fcoe",
- 	.match = &fcoe_bus_match,
--	.bus_attrs = fcoe_bus_attr_group,
-+	.bus_groups = fcoe_bus_groups,
- };
- 
- /**