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

Sync to Linux 4.19-rc2 for downstream developers.

diff --git a/security/commoncap.c b/security/commoncap.c
index 2e489d6a3ac810459fec065783fad855a8738216..18a4fdf6f6eb27d3ab56912cf68ee19e24f386a1 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -684,9 +684,6 @@ static int get_file_caps(struct linux_binprm *bprm, bool *effective, bool *has_f
        }
 
        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)