From: Jens Axboe <axboe@kernel.dk>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Jeff Layton <jlayton@poochiereds.net>
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: Tue, 27 Jun 2017 20:01:56 -0600 [thread overview]
Message-ID: <4feec680-6d4f-abbe-c025-61b462612dde@kernel.dk> (raw)
In-Reply-To: <20170628115721.3e594e2c@canb.auug.org.au>
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
next prev parent reply other threads:[~2017-06-28 2:02 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 [this message]
2017-06-28 9:54 ` Jeff Layton
2017-06-28 12:44 ` Jens Axboe
-- 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=4feec680-6d4f-abbe-c025-61b462612dde@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 \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox