Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-15 Thread Luis Chamberlain
On Fri, May 15, 2020 at 12:17:52AM +0800, Xiaoming Ni wrote: > On 2020/5/14 14:05, Xiaoming Ni wrote: > > On 2020/5/13 20:50, Luis Chamberlain wrote: > > > On Wed, May 13, 2020 at 12:04:02PM +0800, Xiaoming Ni wrote: > > > > On 2020/5/13 6:03, Luis Chamberlain wrote: > > > > > On Tue, May 12, 2020

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-14 Thread Xiaoming Ni
On 2020/5/14 14:05, Xiaoming Ni wrote: On 2020/5/13 20:50, Luis Chamberlain wrote: On Wed, May 13, 2020 at 12:04:02PM +0800, Xiaoming Ni wrote: On 2020/5/13 6:03, Luis Chamberlain wrote: On Tue, May 12, 2020 at 12:40:55PM -0500, Eric W. Biederman wrote: Luis Chamberlain writes: On Tue,

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-14 Thread Xiaoming Ni
On 2020/5/13 20:50, Luis Chamberlain wrote: On Wed, May 13, 2020 at 12:04:02PM +0800, Xiaoming Ni wrote: On 2020/5/13 6:03, Luis Chamberlain wrote: On Tue, May 12, 2020 at 12:40:55PM -0500, Eric W. Biederman wrote: Luis Chamberlain writes: On Tue, May 12, 2020 at 06:52:35AM -0500, Eric W.

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-13 Thread Luis Chamberlain
On Wed, May 13, 2020 at 09:44:40AM -0500, Eric W. Biederman wrote: > Luis Chamberlain writes: > > > On Wed, May 13, 2020 at 08:42:30AM -0500, Eric W. Biederman wrote: > >> Luis Chamberlain writes: > >> > >> > On Tue, May 12, 2020 at 12:40:55PM -0500, Eric W. Biederman wrote: > >> >> Luis

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-13 Thread Eric W. Biederman
Luis Chamberlain writes: > On Wed, May 13, 2020 at 08:42:30AM -0500, Eric W. Biederman wrote: >> Luis Chamberlain writes: >> >> > On Tue, May 12, 2020 at 12:40:55PM -0500, Eric W. Biederman wrote: >> >> Luis Chamberlain writes: >> >> >> >> > On Tue, May 12, 2020 at 06:52:35AM -0500, Eric W.

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-13 Thread Luis Chamberlain
On Wed, May 13, 2020 at 08:42:30AM -0500, Eric W. Biederman wrote: > Luis Chamberlain writes: > > > On Tue, May 12, 2020 at 12:40:55PM -0500, Eric W. Biederman wrote: > >> Luis Chamberlain writes: > >> > >> > On Tue, May 12, 2020 at 06:52:35AM -0500, Eric W. Biederman wrote: > >> >> Luis

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-13 Thread Eric W. Biederman
Luis Chamberlain writes: > On Tue, May 12, 2020 at 12:40:55PM -0500, Eric W. Biederman wrote: >> Luis Chamberlain writes: >> >> > On Tue, May 12, 2020 at 06:52:35AM -0500, Eric W. Biederman wrote: >> >> Luis Chamberlain writes: >> >> >> >> > +static struct ctl_table fs_base_table[] = { >> >>

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-13 Thread Luis Chamberlain
On Wed, May 13, 2020 at 12:04:02PM +0800, Xiaoming Ni wrote: > On 2020/5/13 6:03, Luis Chamberlain wrote: > > On Tue, May 12, 2020 at 12:40:55PM -0500, Eric W. Biederman wrote: > > > Luis Chamberlain writes: > > > > > > > On Tue, May 12, 2020 at 06:52:35AM -0500, Eric W. Biederman wrote: > > > >

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-12 Thread Xiaoming Ni
On 2020/5/13 6:03, Luis Chamberlain wrote: On Tue, May 12, 2020 at 12:40:55PM -0500, Eric W. Biederman wrote: Luis Chamberlain writes: On Tue, May 12, 2020 at 06:52:35AM -0500, Eric W. Biederman wrote: Luis Chamberlain writes: +static struct ctl_table fs_base_table[] = { + { +

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-12 Thread Luis Chamberlain
On Tue, May 12, 2020 at 12:40:55PM -0500, Eric W. Biederman wrote: > Luis Chamberlain writes: > > > On Tue, May 12, 2020 at 06:52:35AM -0500, Eric W. Biederman wrote: > >> Luis Chamberlain writes: > >> > >> > +static struct ctl_table fs_base_table[] = { > >> > +{ > >> > +

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-12 Thread Eric W. Biederman
Luis Chamberlain writes: > On Tue, May 12, 2020 at 06:52:35AM -0500, Eric W. Biederman wrote: >> Luis Chamberlain writes: >> >> > +static struct ctl_table fs_base_table[] = { >> > + { >> > + .procname = "fs", >> > + .mode = 0555, >> > + .child

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-12 Thread Luis Chamberlain
On Tue, May 12, 2020 at 06:52:35AM -0500, Eric W. Biederman wrote: > Luis Chamberlain writes: > > > On Mon, May 11, 2020 at 09:55:16AM +0800, Xiaoming Ni wrote: > >> On 2020/5/11 9:11, Stephen Rothwell wrote: > >> > Hi all, > >> > > >> > Today's linux-next merge of the vfs tree got a conflict

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-12 Thread Eric W. Biederman
Luis Chamberlain writes: > On Mon, May 11, 2020 at 09:55:16AM +0800, Xiaoming Ni wrote: >> On 2020/5/11 9:11, Stephen Rothwell wrote: >> > Hi all, >> > >> > Today's linux-next merge of the vfs tree got a conflict in: >> > >> >kernel/sysctl.c >> > >> > between commit: >> > >> >

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-11 Thread Luis Chamberlain
On Mon, May 11, 2020 at 10:22:04PM -0700, Kees Cook wrote: > On Tue, May 12, 2020 at 12:33:05AM +, Luis Chamberlain wrote: > > On Mon, May 11, 2020 at 09:55:16AM +0800, Xiaoming Ni wrote: > > > On 2020/5/11 9:11, Stephen Rothwell wrote: > > > > Hi all, > > > > > > > > Today's linux-next merge

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-11 Thread Kees Cook
On Tue, May 12, 2020 at 12:33:05AM +, Luis Chamberlain wrote: > On Mon, May 11, 2020 at 09:55:16AM +0800, Xiaoming Ni wrote: > > On 2020/5/11 9:11, Stephen Rothwell wrote: > > > Hi all, > > > > > > Today's linux-next merge of the vfs tree got a conflict in: > > > > > >kernel/sysctl.c > >

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-11 Thread Luis Chamberlain
On Mon, May 11, 2020 at 09:55:16AM +0800, Xiaoming Ni wrote: > On 2020/5/11 9:11, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the vfs tree got a conflict in: > > > >kernel/sysctl.c > > > > between commit: > > > >b6522fa409cf ("parisc: add sysctl file

Re: linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-10 Thread Xiaoming Ni
On 2020/5/11 9:11, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the vfs tree got a conflict in: kernel/sysctl.c between commit: b6522fa409cf ("parisc: add sysctl file interface panic_on_stackoverflow") from the parisc-hd tree and commit: f461d2dcd511 ("sysctl: avoid

linux-next: manual merge of the vfs tree with the parisc-hd tree

2020-05-10 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the vfs tree got a conflict in: kernel/sysctl.c between commit: b6522fa409cf ("parisc: add sysctl file interface panic_on_stackoverflow") from the parisc-hd tree and commit: f461d2dcd511 ("sysctl: avoid forward declarations") from the vfs tree. I