Subject: Re: linux-next: manual merge of the block tree with the file-locks
 tree
To: Jeff Layton <jlayton@poochiereds.net>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Al Viro <viro@zeniv.linux.org.uk>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
References: <20170628115721.3e594e2c@canb.auug.org.au>
 <4feec680-6d4f-abbe-c025-61b462612dde@kernel.dk>
 <1498643640.4644.1.camel@poochiereds.net>
From: Jens Axboe <axboe@kernel.dk>
Message-ID: <88c5406c-5380-436e-7b5d-e5037195c177@kernel.dk>
Date: Wed, 28 Jun 2017 06:44:04 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.1.1
MIME-Version: 1.0
In-Reply-To: <1498643640.4644.1.camel@poochiereds.net>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1094
Lines: 37

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:
>>>
>>>   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.
>>
> 
> (cc'ing Al since he might pick these up...)
> 
> Indeed!
> 
> I'll plan to move f_wb_err to the end of the struct.
> 
> I have some later patches that add a second 32-bit errseq_t field to
> struct file for tracking metadata writeback errors. That would make them
> adjacent to one another which at least looks a little cleaner.

OK perfect, I'll just ignore the issue then :-)

-- 
Jens Axboe