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

2017-06-28 Thread Jens Axboe
On 06/28/2017 03:54 AM, Jeff Layton wrote: > On Tue, 2017-06-27 at 20:01 -0600, Jens Axboe wrote: >> On 06/27/2017 07:57 PM, Stephen Rothwell wrote: >>> Hi Jens, >>> >>> Today's linux-next merge of the block tree got a conflict in: >>> >>> include/linux/fs.h >>> >>> between commit: >>> >>> 3f64

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

2017-06-28 Thread Jeff Layton
On Tue, 2017-06-27 at 20:01 -0600, Jens Axboe wrote: > On 06/27/2017 07:57 PM, Stephen Rothwell wrote: > > Hi Jens, > > > > Today's linux-next merge of the block tree got a conflict in: > > > > include/linux/fs.h > > > > between commit: > > > > 3f64df8a51ce ("fs: new infrastructure for writ

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

2017-06-27 Thread Jens Axboe
On 06/27/2017 07:57 PM, Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in: > > include/linux/fs.h > > between commit: > > 3f64df8a51ce ("fs: new infrastructure for writeback error handling and > reporting") > > from the file-locks tree and