From: Jens Axboe <axboe@kernel.dk>
To: Christian Brauner <brauner@kernel.org>, Mark Brown <broonie@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mateusz Guzik <mjguzik@gmail.com>,
Prasad Singamsetty <prasad.singamsetty@oracle.com>
Subject: Re: linux-next: manual merge of the block tree with the vfs-brauner tree
Date: Sat, 29 Jun 2024 08:28:56 -0600 [thread overview]
Message-ID: <53d0ee02-c33f-4fd5-ab14-cf28a618a699@kernel.dk> (raw)
In-Reply-To: <20240629-gelohnt-widmung-b53f957cd69f@brauner>
On 6/29/24 4:05 AM, Christian Brauner wrote:
> On Fri, Jun 28, 2024 at 06:59:39PM GMT, Mark Brown wrote:
>> Hi all,
>>
>> Today's linux-next merge of the block tree got a conflict in:
>>
>> fs/stat.c
>>
>> between commit:
>>
>> 0ef625bba6fb2 ("vfs: support statx(..., NULL, AT_EMPTY_PATH, ...)")
>>
>> from the vfs-brauner tree and commit:
>>
>> 0f9ca80fa4f96 ("fs: Add initial atomic write support info to statx")
>> 9abcfbd235f59 ("block: Add atomic write support for statx")
>>
>> from the block tree.
>
> Jens,
>
> Can you give me the fs bits and I'll put them in a shared branch we can
> both pull in?
It's pretty far down in my tree at this point, so I think we'll just
have to live with this conflict. At least it's not a complicated one to
resolve.
--
Jens Axboe
next prev parent reply other threads:[~2024-06-29 14:28 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-28 17:59 linux-next: manual merge of the block tree with the vfs-brauner tree Mark Brown
2024-06-29 10:05 ` Christian Brauner
2024-06-29 14:28 ` Jens Axboe [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-05 13:44 Mark Brown
2026-03-05 14:54 ` Christoph Hellwig
2026-03-05 15:18 ` Mark Brown
2026-03-05 17:34 ` Keith Busch
2026-03-06 14:22 ` Christoph Hellwig
2026-03-09 13:45 ` Jens Axboe
2026-03-09 13:48 ` Jens Axboe
2026-03-09 13:54 ` Jens Axboe
2026-03-10 6:26 ` Christoph Hellwig
2025-11-17 3:32 Stephen Rothwell
2024-06-28 17:59 Mark Brown
2024-05-08 3:02 Stephen Rothwell
2024-05-08 6:46 ` Christoph Hellwig
2024-04-02 0:21 Stephen Rothwell
2024-02-06 1:48 Stephen Rothwell
2024-02-06 16:37 ` Jens Axboe
2024-02-07 9:27 ` Christian Brauner
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=53d0ee02-c33f-4fd5-ab14-cf28a618a699@kernel.dk \
--to=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=broonie@kernel.org \
--cc=john.g.garry@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mjguzik@gmail.com \
--cc=prasad.singamsetty@oracle.com \
/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.