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

2019-01-14 Thread Stephen Rothwell
Hi Daniel, On Mon, 14 Jan 2019 14:54:12 -0800 Daniel Walker wrote: > > I did a rebase after your original made this. I'm not sure it's needed any > longer. However, I was planning to rebase my tree again on top of the latest > Linus tree. How would you like to proceed ? I still get the conflict

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

2019-01-14 Thread Daniel Walker
On Tue, Jan 15, 2019 at 09:33:30AM +1100, Stephen Rothwell wrote: > Hi Daniel, > > On Tue, 2 Oct 2018 16:29:23 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the cisco tree got a conflict in: > > > > arch/x86/kernel/setup.c > > > > between commit: > > > > dcf8001d292b

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

2019-01-14 Thread Stephen Rothwell
Hi Daniel, On Tue, 2 Oct 2018 16:29:23 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the cisco tree got a conflict in: > > arch/x86/kernel/setup.c > > between commit: > > dcf8001d292b ("vfs: Suppress MS_* flag defs within the kernel unless > explicitly enabled") > > from