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

[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 commit:
> 
>   c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")
> 
> from the block tree.

Looks like we stole the same hole! Let's just merge it like this, then
post merge I (or Jeff) can move the member to a better location.

-- 
Jens Axboe