From: Jens Axboe <axboe@kernel•dk>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Christian Brauner <brauner@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the vfs-brauner tree
Date: Tue, 6 Feb 2024 09:37:33 -0700 [thread overview]
Message-ID: <332c106c-21af-4691-8b3f-ffbdf30fecf0@kernel.dk> (raw)
In-Reply-To: <20240206124852.6183d0f7@canb.auug.org.au>
On 2/5/24 6:48 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> block/blk.h
>
> between commits:
>
> 19db932fd2b0 ("bdev: make bdev_{release, open_by_dev}() private to block layer")
> 09f8289e1b74 ("bdev: make struct bdev_handle private to the block layer")
> d75140abba91 ("bdev: remove bdev pointer from struct bdev_handle")
>
> from the vfs-brauner tree and commits:
>
> c4e47bbb00da ("block: move cgroup time handling code into blk.h")
> 08420cf70cfb ("block: add blk_time_get_ns() and blk_time_get() helpers")
> da4c8c3d0975 ("block: cache current nsec time in struct blk_plug")
> 06b23f92af87 ("block: update cached timestamp post schedule/preemption")
>
> from the block tree.
>
> I fixed it up (see 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.
That's a lot of conflicts. Christian, we really should separate some of
these so we can have the shared bits in a shared branch.
--
Jens Axboe
next prev parent reply other threads:[~2024-02-06 16:37 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-06 1:48 linux-next: manual merge of the block tree with the vfs-brauner tree Stephen Rothwell
2024-02-06 16:37 ` Jens Axboe [this message]
2024-02-07 9:27 ` Christian Brauner
-- strict thread matches above, loose matches on Subject: below --
2024-04-02 0:21 Stephen Rothwell
2024-05-08 3:02 Stephen Rothwell
2024-05-08 6:46 ` Christoph Hellwig
2024-06-28 17:59 Mark Brown
2024-06-29 10:05 ` Christian Brauner
2024-06-29 14:28 ` Jens Axboe
2024-06-28 17:59 Mark Brown
2025-11-17 3:32 Stephen Rothwell
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
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=332c106c-21af-4691-8b3f-ffbdf30fecf0@kernel.dk \
--to=axboe@kernel$(echo .)dk \
--cc=brauner@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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