Hi all,
On Mon, 25 Jan 2021 17:04:26 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
>
> fs/overlayfs/copy_up.c
>
> between commit:
>
> 06896fa3193d ("ovl: skip getxattr of security labels")
>
> from the overlayfs tree and commit:
>
>
Hi all,
On Mon, 25 Jan 2021 17:07:16 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
>
> fs/overlayfs/inode.c
>
> between commit:
>
> 9c09be9e71c4 ("ovl: perform vfs_getxattr() with mounter creds")
>
> from the overlayfs tree and commit:
>
Hi all,
On Mon, 25 Jan 2021 16:23:36 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
>
> fs/ecryptfs/inode.c
>
> between commit:
>
> 176cfe865da6 ("ecryptfs: fix uid translation for setxattr on
> security.capability")
>
> from the
Hi all,
Today's linux-next merge of the pidfd tree got a conflict in:
fs/overlayfs/inode.c
between commit:
9c09be9e71c4 ("ovl: perform vfs_getxattr() with mounter creds")
from the overlayfs tree and commit:
c7c7a1a18af4 ("xattr: handle idmapped mounts")
from the pidfd tree.
I fixed
Hi all,
Today's linux-next merge of the pidfd tree got a conflict in:
fs/overlayfs/copy_up.c
between commit:
06896fa3193d ("ovl: skip getxattr of security labels")
from the overlayfs tree and commit:
c7c7a1a18af4 ("xattr: handle idmapped mounts")
from the pidfd tree.
I fixed it up
Hi all,
Today's linux-next merge of the pidfd tree got a conflict in:
fs/ecryptfs/inode.c
between commit:
176cfe865da6 ("ecryptfs: fix uid translation for setxattr on
security.capability")
from the overlayfs tree and commit:
c7c7a1a18af4 ("xattr: handle idmapped mounts")
from the
6 matches
Mail list logo
