Merge tag 'v4.19-rc2' into next-general

Sync to Linux 4.19-rc2 for downstream developers.

diff --combined security/commoncap.c
index 6012f0cd8157b36c2dde87933f4987319449001f,2e489d6a3ac810459fec065783fad855a8738216..18a4fdf6f6eb27d3ab56912cf68ee19e24f386a1
--- 1/security/commoncap.c
--- 2/security/commoncap.c
+++ b/security/commoncap.c
@@@ -388,7 -388,7 +388,7 @@@ int cap_inode_getsecurity(struct inode 
        if (strcmp(name, "capability") != 0)
                return -EOPNOTSUPP;
  
-       dentry = d_find_alias(inode);
+       dentry = d_find_any_alias(inode);
        if (!dentry)
                return -EINVAL;
  
@@@ -684,6 -684,9 +684,6 @@@ static int get_file_caps(struct linux_b
        }
  
        rc = bprm_caps_from_vfs_caps(&vcaps, bprm, effective, has_fcap);
 -      if (rc == -EINVAL)
 -              printk(KERN_NOTICE "%s: cap_from_disk returned %d for %s\n",
 -                     __func__, rc, bprm->filename);
  
  out:
        if (rc)