Re: linux-next: manual merge of the notifications tree with Linus' tree

Hi David, On Mon, 21 Dec 2020 12:02:09 +1100 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the notifications tree got conflicts in: > > arch/alpha/kernel/syscalls/syscall.tbl > arch/arm/tools/syscall.tbl > arch/arm64/include/asm/unistd.h > arch/arm64/include/asm/u

linux-next: manual merge of the notifications tree with Linus' tree

Hi all, Today's linux-next merge of the notifications tree got conflicts in: arch/alpha/kernel/syscalls/syscall.tbl arch/arm/tools/syscall.tbl arch/arm64/include/asm/unistd.h arch/arm64/include/asm/unistd32.h arch/ia64/kernel/syscalls/syscall.tbl arch/m68k/kernel/syscalls/syscall.tbl

Re: linux-next: manual merge of the notifications tree with Linus' tree

Hi all, On Wed, 21 Oct 2020 12:47:33 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the notifications tree got conflicts in: > > arch/alpha/kernel/syscalls/syscall.tbl > arch/arm/tools/syscall.tbl > arch/arm64/include/asm/unistd32.h > arch/ia64/kernel/syscalls/syscall.tbl

Re: linux-next: manual merge of the notifications tree with Linus' tree

Stephen Rothwell wrote: > Do you intend to keep this change? If so, will you rebase it? At the moment, I don't know. It needs something like fsinfo() so that you can retrieve the mount change counter in the event of an overrun - but adding it to /proc/self/mountinfo is too heavy and too slow.

Re: linux-next: manual merge of the notifications tree with Linus' tree

Hi David, On Wed, 21 Oct 2020 12:47:33 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the notifications tree got conflicts in: > > arch/alpha/kernel/syscalls/syscall.tbl > arch/arm/tools/syscall.tbl > arch/arm64/include/asm/unistd32.h > arch/ia64/kernel/syscalls/syscall.t

Re: linux-next: manual merge of the notifications tree with Linus' tree

Hi all, On Wed, 21 Oct 2020 18:02:55 +1100 Stephen Rothwell wrote: > > Hi all, > > On Wed, 21 Oct 2020 12:47:33 +1100 Stephen Rothwell > wrote: > > > > diff --cc include/uapi/asm-generic/unistd.h > > index 2056318988f7,fcdca8c7d30a.. > > --- a/include/uapi/asm-generic/unistd.h > >

Re: linux-next: manual merge of the notifications tree with Linus' tree

Hi all, On Wed, 21 Oct 2020 12:47:33 +1100 Stephen Rothwell wrote: > > diff --cc include/uapi/asm-generic/unistd.h > index 2056318988f7,fcdca8c7d30a.. > --- a/include/uapi/asm-generic/unistd.h > +++ b/include/uapi/asm-generic/unistd.h > @@@ -857,8 -857,8 +857,10 @@@ __SYSCALL(__NR_op

linux-next: manual merge of the notifications tree with Linus' tree

Hi all, Today's linux-next merge of the notifications tree got conflicts in: arch/alpha/kernel/syscalls/syscall.tbl arch/arm/tools/syscall.tbl arch/arm64/include/asm/unistd32.h arch/ia64/kernel/syscalls/syscall.tbl arch/m68k/kernel/syscalls/syscall.tbl arch/microblaze/kernel/syscalls/

linux-next: manual merge of the notifications tree with Linus' tree

Hi all, Today's linux-next merge of the notifications tree got a conflict in: fs/io_uring.c between commit: 2fb3e82284fc ("io_uring: punt splice async because of inode mutex") from Linus' tree and commit: 317f078cce34 ("pipe: Add general notification queue support") from the notificati