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

Hi all, On Fri, 3 May 2019 11:15:10 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the vfs tree got a conflict in: > > fs/orangefs/super.c > > between commit: > > 77becb76042a ("orangefs: implement xattr cache") > > from the orangefs tree and commit: > > f276ae0dd6d0 ("

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

Hi Mike, On Fri, 3 May 2019 13:34:49 -0400 Mike Marshall wrote: > > I noticed the conflict too when I added Al's patch series to the orangefs > tree we have on next. I understood Linus to say he'd fix the conflict the > way you did during the merge window. I guess that means you'll have to > keep

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

Hi Stephen... I noticed the conflict too when I added Al's patch series to the orangefs tree we have on next. I understood Linus to say he'd fix the conflict the way you did during the merge window. I guess that means you'll have to keep fixing it on next until then... I hate causing trouble, let