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

2021-02-24 Thread Stephen Rothwell
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

2021-02-14 Thread Stephen Rothwell
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

2021-01-27 Thread Miaohe Lin
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

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

2019-07-12 Thread Joel Fernandes
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

2019-07-12 Thread Christian Brauner
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

2019-07-12 Thread Joel Fernandes
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

2019-07-08 Thread Stephen Rothwell
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

2019-07-07 Thread Stephen Rothwell
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

2019-05-24 Thread Joel Fernandes
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