From: Thierry Reding <thierry.reding@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Tejun Heo <tj@kernel.org>,
"David S. Miller" <davem@davemloft.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the driver-core tree
Date: Tue, 1 Oct 2013 13:07:20 +0200 [thread overview]
Message-ID: <1380625644-11331-4-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <20131001110344.GA20249@ulmo.nvidia.com>
Today's linux-next merge of the driver-core tree got conflicts in
include/linux/netdevice.h
I fixed it up (see below). Please check if the resolution looks correct.
Thanks,
Thierry
---
diff --cc drivers/mtd/nand/atmel_nand.c
index ef9c9f5,bd1ce7d..2dbd913
--- a/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 e06c644,ec9b646..6f5f413
--- a/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 f5cd464,42421ed..51fdaf6
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -2893,8 -2873,20 +2893,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;
next prev parent reply other threads:[~2013-10-01 11:09 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the bcon tree Thierry Reding
2013-10-01 14:26 ` Jörn Engel
2013-10-01 11:07 ` linux-next: manual merge of the block tree Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the cgroup tree Thierry Reding
2013-10-01 11:07 ` Thierry Reding [this message]
2013-10-01 13:54 ` linux-next: manual merge of the driver-core tree Greg Kroah-Hartman
2013-10-01 11:07 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the random tree Thierry Reding
2013-10-01 11:29 ` Theodore Ts'o
2013-10-01 11:07 ` linux-next: manual merge of the sh tree Thierry Reding
2013-10-01 13:53 ` Greg Kroah-Hartman
2013-10-01 11:07 ` linux-next: manual merge of the vfs tree Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2008-12-03 23:44 linux-next: manual merge of the driver-core tree Stephen Rothwell
2008-12-04 4:21 ` Greg KH
2008-12-04 10:42 ` Paul Mackerras
2008-12-04 18:00 ` Greg KH
2009-01-04 23:28 ` Stephen Rothwell
2009-01-05 4:36 ` Greg KH
2009-01-05 5:57 ` Stephen Rothwell
2008-12-01 0:15 Stephen Rothwell
2008-12-01 9:23 ` Russell King
2008-12-01 11:17 ` Catalin Marinas
2008-12-01 17:32 ` Catalin Marinas
2008-12-01 23:31 ` Stephen Rothwell
2008-10-14 3:09 Stephen Rothwell
2008-10-14 3:05 Stephen Rothwell
2008-10-14 3:02 Stephen Rothwell
2008-10-14 2:57 Stephen Rothwell
2008-10-14 2:50 Stephen Rothwell
2008-10-14 3:51 ` Greg KH
2008-07-23 1:31 Stephen Rothwell
2008-07-23 4:21 ` Greg KH
2008-07-23 8:09 ` Stephen Rothwell
2008-07-23 14:04 ` Greg KH
2008-07-22 0:56 Stephen Rothwell
2008-07-22 3:14 ` Greg KH
2008-07-18 1:02 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380625644-11331-4-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail.com \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).