Re: linux-next: manual merge of the akpm tree with the wberr tree

2017-08-01 Thread Andrew Morton
On Tue, 01 Aug 2017 07:31:33 -0400 Jeff Layton wrote: > On Tue, 2017-08-01 at 06:59 -0400, Jeff Layton wrote: > > On Tue, 2017-08-01 at 15:46 +1000, Stephen Rothwell wrote: > > > Hi Andrew, > > > > > > Today's linux-next merge of the akpm-current tree got a conflict in: > > > > > > include/li

Re: linux-next: manual merge of the akpm tree with the wberr tree

2017-08-01 Thread Jeff Layton
On Tue, 2017-08-01 at 06:59 -0400, Jeff Layton wrote: > On Tue, 2017-08-01 at 15:46 +1000, Stephen Rothwell wrote: > > Hi Andrew, > > > > Today's linux-next merge of the akpm-current tree got a conflict in: > > > > include/linux/fs.h > > > > between commit: > > > > 9dcc0577f2a4 ("mm: remove

Re: linux-next: manual merge of the akpm tree with the wberr tree

2017-08-01 Thread Jeff Layton
On Tue, 2017-08-01 at 15:46 +1000, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > include/linux/fs.h > > between commit: > > 9dcc0577f2a4 ("mm: remove optimizations based on i_size in mapping > writeback waits") > > from t

linux-next: manual merge of the akpm tree with the wberr tree

2017-07-31 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/fs.h between commit: 9dcc0577f2a4 ("mm: remove optimizations based on i_size in mapping writeback waits") from the wberr tree and patch: "mm: remove optimizations based on i_size in mapping wr