From: Jens Axboe <axboe@kernel.dk>
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>
Subject: Re: linux-next: manual merge of the block tree with the file-locks tree
Date: Wed, 28 Jun 2017 06:44:04 -0600 [thread overview]
Message-ID: <88c5406c-5380-436e-7b5d-e5037195c177@kernel.dk> (raw)
In-Reply-To: <1498643640.4644.1.camel@poochiereds.net>
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
next prev parent reply other threads:[~2017-06-28 12:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-28 1:57 linux-next: manual merge of the block tree with the file-locks tree Stephen Rothwell
2017-06-28 2:01 ` Jens Axboe
2017-06-28 9:54 ` Jeff Layton
2017-06-28 12:44 ` Jens Axboe [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-21 3:17 Stephen Rothwell
2017-06-21 2:48 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=88c5406c-5380-436e-7b5d-e5037195c177@kernel.dk \
--to=axboe@kernel.dk \
--cc=jlayton@poochiereds.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.