Re: linux-next: manual merge of the pidfd tree with the f2fs tree

Hi all, On Mon, 15 Feb 2021 08:01:44 +1100 Stephen Rothwell wrote: > > On Mon, 25 Jan 2021 16:48:06 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > fs/f2fs/file.c > > > > between commits: > > > > 19bb7075d1a9 ("f2fs: fix out

Re: linux-next: manual merge of the pidfd tree with the f2fs tree

Hi all, On Mon, 15 Feb 2021 07:58:06 +1100 Stephen Rothwell wrote: > > Hi all, > > On Mon, 25 Jan 2021 16:32:55 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > fs/f2fs/acl.c > > > > between commit: > > > > 7cf2e6173b2d ("f2

Re: linux-next: manual merge of the pidfd tree with the f2fs tree

Hi all, On Mon, 25 Jan 2021 16:48:06 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the pidfd tree got a conflict in: > > fs/f2fs/file.c > > between commits: > > 19bb7075d1a9 ("f2fs: fix out-of-repair __setattr_copy()") > 7cf2e6173b2d ("f2fs: enhance to update i_mode and

Re: linux-next: manual merge of the pidfd tree with the f2fs tree

Hi all, On Mon, 25 Jan 2021 16:32:55 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the pidfd tree got a conflict in: > > fs/f2fs/acl.c > > between commit: > > 7cf2e6173b2d ("f2fs: enhance to update i_mode and acl atomically in > f2fs_setattr()") > > from the f2fs tree a

linux-next: manual merge of the pidfd tree with the f2fs tree

Hi all, Today's linux-next merge of the pidfd tree got a conflict in: fs/f2fs/file.c between commits: 19bb7075d1a9 ("f2fs: fix out-of-repair __setattr_copy()") 7cf2e6173b2d ("f2fs: enhance to update i_mode and acl atomically in f2fs_setattr()") from the f2fs tree and commit: 2f221d6f

linux-next: manual merge of the pidfd tree with the f2fs tree

Hi all, Today's linux-next merge of the pidfd tree got a conflict in: fs/f2fs/acl.c between commit: 7cf2e6173b2d ("f2fs: enhance to update i_mode and acl atomically in f2fs_setattr()") from the f2fs tree and commit: e65ce2a50cf6 ("acl: handle idmapped mounts") from the pidfd tree. I