From: Christian Brauner <brauner@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
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: Wed, 7 Feb 2024 10:27:57 +0100 [thread overview]
Message-ID: <20240207-garen-gedanken-48c03f835362@brauner> (raw)
In-Reply-To: <332c106c-21af-4691-8b3f-ffbdf30fecf0@kernel.dk>
On Tue, Feb 06, 2024 at 09:37:33AM -0700, Jens Axboe wrote:
> 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.
Yes, happy to do that. Let's quickly sync later today when you're up?
next prev parent reply other threads:[~2024-02-07 9:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-06 1:48 Stephen Rothwell
2024-02-06 16:37 ` Jens Axboe
2024-02-07 9:27 ` Christian Brauner [this message]
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
2026-10-13 16:49 Mark Brown
2026-10-13 17:00 Mark Brown
2026-11-18 14:53 Mark Brown
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=20240207-garen-gedanken-48c03f835362@brauner \
--to=brauner@kernel.org \
--cc=axboe@kernel.dk \
--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
all inboxes | Powered by JetHome®