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

Hi all, On Mon, 15 Feb 2021 08:54:41 +1100 Stephen Rothwell wrote: > > On Wed, 27 Jan 2021 22:43:51 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the akpm-current tree got a conflict in: > > > > fs/hugetlbfs/inode.c > > > > between commit: > > > > 2f221d6f7b88 ("

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

Hi all, On Wed, 27 Jan 2021 22:43:51 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > fs/hugetlbfs/inode.c > > between commit: > > 2f221d6f7b88 ("attr: handle idmapped mounts") > > from the pidfd tree and commit: > > 57d3629b7

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

Hi: On 2021/1/27 19:43, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > fs/hugetlbfs/inode.c > > between commit: > > 2f221d6f7b88 ("attr: handle idmapped mounts") > > from the pidfd tree and commit: > > 57d3629b7a9a ("hugetl

linux-next: manual merge of the akpm-current tree with the pidfd tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: fs/hugetlbfs/inode.c between commit: 2f221d6f7b88 ("attr: handle idmapped mounts") from the pidfd tree and commit: 57d3629b7a9a ("hugetlbfs: remove useless BUG_ON(!inode) in hugetlbfs_setattr()") from the akp

linux-next: manual merge of the akpm-current tree with the pidfd tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: kernel/exit.c between commit: ba7d25f3dff6 ("exit: support non-blocking pidfds") from the pidfd tree and patch: "pid: move pidfd_get_pid() to pid.c" from the akpm-current tree. I fixed it up (I made the chang

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

On Fri, Jul 12, 2019 at 03:02:36PM +0200, Christian Brauner wrote: > On Fri, Jul 12, 2019 at 08:53:04AM -0400, Joel Fernandes wrote: > > On Mon, Jul 08, 2019 at 12:01:14PM +1000, Stephen Rothwell wrote: > > > Hi all, > > > > > > On Wed, 15 May 2019 13:16:29 +1000 Stephen Rothwell > > > wrote: >

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

On Fri, Jul 12, 2019 at 08:53:04AM -0400, Joel Fernandes wrote: > On Mon, Jul 08, 2019 at 12:01:14PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > On Wed, 15 May 2019 13:16:29 +1000 Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of the akpm-current tree got a conflict in:

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

On Mon, Jul 08, 2019 at 12:01:14PM +1000, Stephen Rothwell wrote: > Hi all, > > On Wed, 15 May 2019 13:16:29 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the akpm-current tree got a conflict in: > > > > include/linux/pid.h > > > > between commit: > > > > 51f1b521a51

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

Hi all, On Wed, 22 May 2019 11:43:14 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > kernel/pid.c > > between commit: > > 99e9da7f2796 ("pid: add pidfd_open()") > > from the pidfd tree and commit: > > 51c59c914840 ("kernel/pid

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

Hi all, On Wed, 15 May 2019 13:16:29 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > include/linux/pid.h > > between commit: > > 51f1b521a515 ("pidfd: add polling support") > > from the pidfd tree and commit: > > c02e28a1bb18

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

On Wed, May 22, 2019 at 4:43 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > kernel/pid.c > > between commit: > > 99e9da7f2796 ("pid: add pidfd_open()") Fix LGTM. Thank you. > > from the pidfd tree and commit: > > 51c59c9

linux-next: manual merge of the akpm-current tree with the pidfd tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: kernel/pid.c between commit: 99e9da7f2796 ("pid: add pidfd_open()") from the pidfd tree and commit: 51c59c914840 ("kernel/pid.c: convert struct pid:count to refcount_t") from the akpm-current tree. I fixed it

linux-next: manual merge of the akpm-current tree with the pidfd tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/pid.h between commit: 51f1b521a515 ("pidfd: add polling support") from the pidfd tree and commit: c02e28a1bb18 ("kernel/pid.c: convert struct pid:count to refcount_t") from the akpm-current tree.

linux-next: manual merge of the akpm-current tree with the pidfd tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: kernel/fork.c between commit: 2897d468ea48 ("clone: add CLONE_PIDFD") from the pidfd tree and commit: 83e1afab81ac ("userfaultfd: use RCU to free the task struct when fork fails") from the akpm-current tree.