From: Jens Axboe <axboe@kernel•dk>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Al Viro <viro@ZenIV•linux.org.uk>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Aleksa Sarai <cyphar@cyphar•com>
Subject: Re: linux-next: manual merge of the block tree with the vfs tree
Date: Sun, 19 Jan 2020 19:45:32 -0700 [thread overview]
Message-ID: <e0af609c-aa1b-5a8b-89d4-ea6aff779c67@kernel.dk> (raw)
In-Reply-To: <20200120124051.2fdcfc61@canb.auug.org.au>
On 1/19/20 6:40 PM, Stephen Rothwell wrote:
> Hi Jens,
>
> On Thu, 19 Dec 2019 22:34:59 -0700 Jens Axboe <axboe@kernel•dk> wrote:
>>
>> On 12/19/19 6:36 PM, Stephen Rothwell wrote:
>>>
>>> Today's linux-next merge of the block tree got a conflict in:
>>>
>>> fs/open.c
>>>
>>> between commit:
>>>
>>> 0a51692d49ec ("open: introduce openat2(2) syscall")
>>>
>>> from the vfs tree and commit:
>>>
>>> 252270311374 ("fs: make build_open_flags() available internally")
>>>
>>> from the block tree.
>>>
>>> I fixed it up (see at end, plus the merge fix patch below) and can
>>> carry the fix as necessary. This is now fixed as far as linux-next is
>>> concerned, but any non trivial conflicts should be mentioned to your
>>> upstream maintainer when your tree is submitted for merging. You may
>>> also want to consider cooperating with the maintainer of the
>>> conflicting tree to minimise any particularly complex conflicts.
>>
>> Thanks Stephen, I may just pull in the vfs tree to avoid this conflict.
>
> I looks like Al has rewritten the branch you merged from his tree and
> caused various conflicts in my merge of the block tree today. I used
> Al's new versions of the conflicting files.
That's a bummer. I guess I'll have to rebase on top of the new one. Al,
is the new one going to be persistent?
--
Jens Axboe
next prev parent reply other threads:[~2020-01-20 2:45 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-20 1:36 linux-next: manual merge of the block tree with the vfs tree Stephen Rothwell
2019-12-20 5:34 ` Jens Axboe
2020-01-20 1:40 ` Stephen Rothwell
2020-01-20 2:45 ` Jens Axboe [this message]
2020-01-20 2:57 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2024-05-10 2:34 Stephen Rothwell
2024-05-14 1:32 ` Stephen Rothwell
2022-11-28 0:20 Stephen Rothwell
2022-07-15 3:09 Stephen Rothwell
2022-07-14 2:08 Stephen Rothwell
2022-07-14 16:36 ` Jens Axboe
2022-07-15 0:52 ` Al Viro
2022-07-15 1:04 ` Al Viro
2022-07-18 2:59 ` Stephen Rothwell
2022-07-18 4:58 ` Al Viro
2022-07-19 16:52 ` Jens Axboe
2022-07-20 2:45 ` Al Viro
2022-07-20 3:00 ` Jens Axboe
2022-07-11 3:57 Stephen Rothwell
2022-07-11 3:38 Stephen Rothwell
2022-05-23 2:28 Stephen Rothwell
2022-05-23 2:58 ` Jens Axboe
2022-05-23 22:54 ` Stephen Rothwell
2021-01-27 3:24 Stephen Rothwell
2018-05-29 4:37 Stephen Rothwell
2018-05-29 4:33 Stephen Rothwell
2018-05-29 8:12 ` Christoph Hellwig
2018-05-29 14:22 ` Jens Axboe
2018-05-29 21:40 ` Stephen Rothwell
2018-05-29 22:17 ` Jens Axboe
2017-02-02 2:44 Stephen Rothwell
2017-02-21 22:14 ` Stephen Rothwell
2016-12-12 1:31 Stephen Rothwell
2016-12-12 1:44 ` Al Viro
2016-12-12 2:00 ` Ming Lei
2015-02-09 3:55 Stephen Rothwell
2015-01-27 3:57 Stephen Rothwell
2015-01-27 4:00 ` Jens Axboe
2015-01-27 4:54 ` Al Viro
2015-01-28 17:11 ` Christoph Hellwig
2015-01-29 5:15 ` Al Viro
2015-02-01 5:56 ` Al Viro
2015-02-02 8:06 ` Christoph Hellwig
2013-04-04 2:16 Stephen Rothwell
2010-05-18 3:04 Stephen Rothwell
2010-05-18 15:37 ` H Hartley Sweeten
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=e0af609c-aa1b-5a8b-89d4-ea6aff779c67@kernel.dk \
--to=axboe@kernel$(echo .)dk \
--cc=cyphar@cyphar$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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