The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/overlayfs/copy_up.c | 4 ----
fs/overlayfs/inode.c | 4 ----
2 files changed, 8 deletions(-)
--- a/fs/overlayfs/inode.c~linux-next-git-rejects
+++ a/fs/overlayfs/inode.c
@@ -355,11 +355,7 @@ int ovl_xattr_set(struct dentry *dentry,
if (!value && !upperdentry) {
old_cred = ovl_override_creds(dentry->d_sb);
-<<<<<<< HEAD
- err = vfs_getxattr(realdentry, name, NULL, 0);
-=======
err = vfs_getxattr(&init_user_ns, realdentry, name, NULL, 0);
->>>>>>> linux-next/akpm-base
revert_creds(old_cred);
if (err < 0)
goto out_drop_write;
--- a/fs/overlayfs/copy_up.c~linux-next-git-rejects
+++ a/fs/overlayfs/copy_up.c
@@ -115,11 +115,7 @@ retry:
goto retry;
}
-<<<<<<< HEAD
- error = vfs_setxattr(new, name, value, size, 0);
-=======
error = vfs_setxattr(&init_user_ns, new, name, value, size, 0);
->>>>>>> linux-next/akpm-base
if (error) {
if (error != -EOPNOTSUPP || ovl_must_copy_xattr(name))
break;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm.patch
mm-memcg-slab-pre-allocate-obj_cgroups-for-slab-caches-with-slab_account-fix.patch
mm-memcontrol-optimize-per-lruvec-stats-counter-memory-usage-checkpatch-fixes.patch
mm-memcg-add-swapcache-stat-for-memcg-v2-fix.patch
kasan-add-match-all-tag-tests-fix-fix.patch
mm-cma-allocate-cma-areas-bottom-up-fix-3-fix.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
bdi-use-might_alloc-fix.patch
kfence-kasan-make-kfence-compatible-with-kasan-fix.patch
lib-stackdepot-add-support-to-disable-stack-depot-fix.patch
initramfs-panic-with-memory-information-fix.patch
linux-next-rejects.patch
fs-ramfs-inodec-update-inode_operationstmpfile.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
