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

There were quite a few overlapping sets of changes here.

Daniel's bug fix for off-by-ones in the new BPF branch instructions,
along with the added allowances for "data_end > ptr + x" forms
collided with the metadata additions.

Along with those three changes came veritifer test cases, which in
their final form I tried to group together properly.  If I had just
trimmed GIT's conflict tags as-is, this would have split up the
meta tests unnecessarily.

In the socketmap code, a set of preemption disabling changes
overlapped with the rename of bpf_compute_data_end() to
bpf_compute_data_pointers().

Changes were made to the mv88e6060.c driver set addr method
which got removed in net-next.

The hyperv transport socket layer had a locking change in 'net'
which overlapped with a change of socket state macro usage
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 1 deletions

diff --git a/security/commoncap.c b/security/commoncap.c
index c25e0d27537f..fc46f5b85251 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -585,13 +585,14 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
         struct vfs_ns_cap_data data, *nscaps = &data;
         struct vfs_cap_data *caps = (struct vfs_cap_data *) &data;
         kuid_t rootkuid;
-        struct user_namespace *fs_ns = inode->i_sb->s_user_ns;
+        struct user_namespace *fs_ns;
 
         memset(cpu_caps, 0, sizeof(struct cpu_vfs_cap_data));
 
         if (!inode)
                 return -ENODATA;
 
+        fs_ns = inode->i_sb->s_user_ns;
         size = __vfs_getxattr((struct dentry *)dentry, inode,
                               XATTR_NAME_CAPS, &data, XATTR_CAPS_SZ);
         if (size == -ENODATA || size == -EOPNOTSUPP)