Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
	include/linux/netdevice.h

diff --cc arch/powerpc/kernel/vio.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/mmc/core/bus.c
Simple merge

diff --cc drivers/mmc/host/mvsdio.c
Simple merge

diff --cc drivers/mtd/nand/atmel_nand.c
index ef9c9f547c01fffe391235e3a6d9dffe95944321,bd1ce7d137023fed1f42bc606166a111946466c1..2dbd9133c395c98c4d1bb124c83a532358946215
--- 1/drivers/mtd/nand/atmel_nand.c
--- 2/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@@ -1511,8 -1540,15 +1511,8 @@@ static int atmel_of_init_port(struct at
  
        return 0;
  }
 -#else
 -static int atmel_of_init_port(struct atmel_nand_host *host,
 -                            struct device_node *np)
 -{
 -      return -EINVAL;
 -}
 -#endif
  
- static int __init atmel_hw_nand_init_params(struct platform_device *pdev,
+ static int atmel_hw_nand_init_params(struct platform_device *pdev,
                                         struct atmel_nand_host *host)
  {
        struct mtd_info *mtd = &host->mtd;

diff --cc drivers/net/bonding/bond_sysfs.c
index 47749c970a01a67c189188767c41e94e2ff1fbd1,ec9b6460a38dd0549b5b69f281b36f6cce0a3e7d..b9d8f1175ff500bd5cc290e676c5f1322fd7c72b
--- 1/drivers/net/bonding/bond_sysfs.c
--- 2/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@@ -165,9 -157,43 +157,8 @@@ static const struct class_attribute cla
        },
        .show = bonding_show_bonds,
        .store = bonding_store_bonds,
-       .namespace = bonding_namespace,
  };
  
 -int bond_create_slave_symlinks(struct net_device *master,
 -                             struct net_device *slave)
 -{
 -      char linkname[IFNAMSIZ+7];
 -      int ret = 0;
 -
 -      /* first, create a link from the slave back to the master */
 -      ret = sysfs_create_link(&(slave->dev.kobj), &(master->dev.kobj),
 -                              "master");
 -      if (ret)
 -              return ret;
 -      /* next, create a link from the master to the slave */
 -      sprintf(linkname, "slave_%s", slave->name);
 -      ret = sysfs_create_link(&(master->dev.kobj), &(slave->dev.kobj),
 -                              linkname);
 -
 -      /* free the master link created earlier in case of error */
 -      if (ret)
 -              sysfs_remove_link(&(slave->dev.kobj), "master");
 -
 -      return ret;
 -
 -}
 -
 -void bond_destroy_slave_symlinks(struct net_device *master,
 -                               struct net_device *slave)
 -{
 -      char linkname[IFNAMSIZ+7];
 -
 -      sysfs_remove_link(&(slave->dev.kobj), "master");
 -      sprintf(linkname, "slave_%s", slave->name);
 -      sysfs_remove_link(&(master->dev.kobj), linkname);
 -}
 -
 -
  /*
   * Show the slaves in the current bond.
   */

diff --cc include/linux/netdevice.h
index c893f2295f496ffb7785b24ad27f4123e41251cb,42421ed49a4739f738f6edd6ed97aeee3ffe5df5..809afccf7a60b11e3807ec485b4ea9d7b633d73a
--- 1/include/linux/netdevice.h
--- 2/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -2894,8 -2873,20 +2894,20 @@@ int __init dev_proc_init(void)
  #define dev_proc_init() 0
  #endif
  
- int netdev_class_create_file(struct class_attribute *class_attr);
- void netdev_class_remove_file(struct class_attribute *class_attr);
 -extern int netdev_class_create_file_ns(struct class_attribute *class_attr,
 -                                     const void *ns);
 -extern void netdev_class_remove_file_ns(struct class_attribute *class_attr,
 -                                      const void *ns);
++int netdev_class_create_file_ns(struct class_attribute *class_attr,
++                              const void *ns);
++void netdev_class_remove_file_ns(struct class_attribute *class_attr,
++                               const void *ns);
+ 
+ static inline int netdev_class_create_file(struct class_attribute *class_attr)
+ {
+       return netdev_class_create_file_ns(class_attr, NULL);
+ }
+ 
+ static inline void netdev_class_remove_file(struct class_attribute *class_attr)
+ {
+       netdev_class_remove_file_ns(class_attr, NULL);
+ }
  
  extern struct kobj_ns_type_operations net_ns_type_operations;
  

diff --cc kernel/events/core.c
Simple merge