Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
  dp83640: free packet queues on remove
  dp83640: use proper function to free transmit time stamping packets
  ipv6: Do not use routes from locally generated RAs
  |PATCH net-next] tg3: add tx_dropped counter
  be2net: don't create multiple RX/TX rings in multi channel mode
  be2net: don't create multiple TXQs in BE2
  be2net: refactor VF setup/teardown code into be_vf_setup/clear()
  be2net: add vlan/rx-mode/flow-control config to be_setup()
  net_sched: cls_flow: use skb_header_pointer()
  ipv4: avoid useless call of the function check_peer_pmtu
  TCP: remove TCP_DEBUG
  net: Fix driver name for mdio-gpio.c
  ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
  rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
  ipv4: fix ipsec forward performance regression
  jme: fix irq storm after suspend/resume
  route: fix ICMP redirect validation
  net: hold sock reference while processing tx timestamps
  tcp: md5: add more const attributes
  Add ethtool -g support to virtio_net
  ...

Fix up conflicts in:
 - drivers/net/Kconfig:
	The split-up generated a trivial conflict with removal of a
	stale reference to Documentation/networking/net-modules.txt.
	Remove it from the new location instead.
 - fs/sysfs/dir.c:
	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
	with Eric Biederman's changes for tagged directories.

3 files changed, 65 insertions, 7 deletions

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 83bb9d1f30aa..0344ee70a47c 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -403,6 +403,13 @@ int __sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)
 {
         struct sysfs_inode_attrs *ps_iattr;
 
+        if (!!sysfs_ns_type(acxt->parent_sd) != !!sd->s_ns) {
+                WARN(1, KERN_WARNING "sysfs: ns %s in '%s' for '%s'\n",
+                        sysfs_ns_type(acxt->parent_sd)? "required": "invalid",
+                        acxt->parent_sd->s_name, sd->s_name);
+                return -EINVAL;
+        }
+
         if (sysfs_find_dirent(acxt->parent_sd, sd->s_ns, sd->s_name))
                 return -EEXIST;
 
@@ -561,6 +568,13 @@ struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd,
         struct rb_node *p = parent_sd->s_dir.name_tree.rb_node;
         struct sysfs_dirent *found = NULL;
 
+        if (!!sysfs_ns_type(parent_sd) != !!ns) {
+                WARN(1, KERN_WARNING "sysfs: ns %s in '%s' for '%s'\n",
+                        sysfs_ns_type(parent_sd)? "required": "invalid",
+                        parent_sd->s_name, name);
+                return NULL;
+        }
+
         while (p) {
                 int c;
 #define node    rb_entry(p, struct sysfs_dirent, name_node)
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 1ad8c93c1b85..d4e6080b4b20 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -466,9 +466,6 @@ void sysfs_notify(struct kobject *k, const char *dir, const char *attr)
         mutex_lock(&sysfs_mutex);
 
         if (sd && dir)
-                /* Only directories are tagged, so no need to pass
-                 * a tag explicitly.
-                 */
                 sd = sysfs_find_dirent(sd, NULL, dir);
         if (sd && attr)
                 sd = sysfs_find_dirent(sd, NULL, attr);
@@ -488,17 +485,56 @@ const struct file_operations sysfs_file_operations = {
         .poll           = sysfs_poll,
 };
 
+int sysfs_attr_ns(struct kobject *kobj, const struct attribute *attr,
+                  const void **pns)
+{
+        struct sysfs_dirent *dir_sd = kobj->sd;
+        const struct sysfs_ops *ops;
+        const void *ns = NULL;
+        int err;
+
+        err = 0;
+        if (!sysfs_ns_type(dir_sd))
+                goto out;
+
+        err = -EINVAL;
+        if (!kobj->ktype)
+                goto out;
+        ops = kobj->ktype->sysfs_ops;
+        if (!ops)
+                goto out;
+        if (!ops->namespace)
+                goto out;
+
+        err = 0;
+        ns = ops->namespace(kobj, attr);
+out:
+        if (err) {
+                WARN(1, KERN_ERR "missing sysfs namespace attribute operation for "
+                     "kobject: %s\n", kobject_name(kobj));
+        }
+        *pns = ns;
+        return err;
+}
+
 int sysfs_add_file_mode(struct sysfs_dirent *dir_sd,
                         const struct attribute *attr, int type, mode_t amode)
 {
         umode_t mode = (amode & S_IALLUGO) | S_IFREG;
         struct sysfs_addrm_cxt acxt;
         struct sysfs_dirent *sd;
+        const void *ns;
         int rc;
 
+        rc = sysfs_attr_ns(dir_sd->s_dir.kobj, attr, &ns);
+        if (rc)
+                return rc;
+
         sd = sysfs_new_dirent(attr->name, mode, type);
         if (!sd)
                 return -ENOMEM;
+
+        sd->s_ns = ns;
         sd->s_attr.attr = (void *)attr;
         sysfs_dirent_init_lockdep(sd);
 
@@ -586,12 +622,17 @@ int sysfs_chmod_file(struct kobject *kobj, const struct attribute *attr,
 {
         struct sysfs_dirent *sd;
         struct iattr newattrs;
+        const void *ns;
         int rc;
 
+        rc = sysfs_attr_ns(kobj, attr, &ns);
+        if (rc)
+                return rc;
+
         mutex_lock(&sysfs_mutex);
 
         rc = -ENOENT;
-        sd = sysfs_find_dirent(kobj->sd, NULL, attr->name);
+        sd = sysfs_find_dirent(kobj->sd, ns, attr->name);
         if (!sd)
                 goto out;
 
@@ -616,7 +657,12 @@ EXPORT_SYMBOL_GPL(sysfs_chmod_file);
 
 void sysfs_remove_file(struct kobject * kobj, const struct attribute * attr)
 {
-        sysfs_hash_and_remove(kobj->sd, NULL, attr->name);
+        const void *ns;
+
+        if (sysfs_attr_ns(kobj, attr, &ns))
+                return;
+
+        sysfs_hash_and_remove(kobj->sd, ns, attr->name);
 }
 
 void sysfs_remove_files(struct kobject * kobj, const struct attribute **ptr)
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 1ee18c81df78..e23f28894a3a 100644
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -324,8 +324,6 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const void *ns, const cha
         sysfs_addrm_start(&acxt, dir_sd);
 
         sd = sysfs_find_dirent(dir_sd, ns, name);
-        if (sd && (sd->s_ns != ns))
-                sd = NULL;
         if (sd)
                 sysfs_remove_one(&acxt, sd);