Re: linux-next: manual merge of the kspp tree with the file-locks tree

Hi Jeff, On Mon, 03 Jul 2017 06:27:27 -0400 Jeff Layton wrote: > > I think this is fairly trivial conflict -- Kees is adding the > __randomize_layout attribute here, and I'm just adding a field to each > of these structs. Yep, nothing too tricky here. > The main catch is that both of these bran

Re: linux-next: manual merge of the kspp tree with the file-locks tree

On Mon, 2017-07-03 at 11:48 +1000, Stephen Rothwell wrote: > Hi all, > > With the merge window opening, just a reminder that this conflict still > exists. > > On Wed, 21 Jun 2017 16:32:11 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the kspp tree got a conflict in: > >

Re: linux-next: manual merge of the kspp tree with the file-locks tree

Hi all, With the merge window opening, just a reminder that this conflict still exists. On Wed, 21 Jun 2017 16:32:11 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the kspp tree got a conflict in: > > include/linux/fs.h > > between commits: > > 7356fd927059 ("fs: new infra