incoming merge conflict to linux-next

2016-05-18 Thread Chris Mason
Hi Stephen, Dave Sterba's tree in linux-next has a few btrfs patches that we're not sending yet into Linus. We've got an update for Josef's enospc work that'll get sent in next week. So he prepped a pull for me that merged up a number of his branches but didn't include Josef's new code. It has

Re: incoming merge conflict to linux-next

2016-05-18 Thread David Sterba
On Wed, May 18, 2016 at 05:10:43PM -0400, Chris Mason wrote: > Dave Sterba's tree in linux-next has a few btrfs patches that we're not > sending yet into Linus. We've got an update for Josef's enospc work > that'll get sent in next week. > > So he prepped a pull for me that merged up a number of

Re: incoming merge conflict to linux-next

2016-05-18 Thread Stephen Rothwell
Hi Chris, On Wed, 18 May 2016 17:10:43 -0400 Chris Mason wrote: > > Dave Sterba's tree in linux-next has a few btrfs patches that we're not > sending yet into Linus. We've got an update for Josef's enospc work > that'll get sent in next week. > > So he prepped a pull for me that merged up a num