From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: Mark Brown <broonie@kernel.org>
Cc: Andi Shyti <andi.shyti@kernel.org>,
Johan Hovold <johan@kernel.org>,
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 kthread tree with the i2c-host-fixes tree
Date: Tue, 9 Jun 2026 17:35:01 +0200 [thread overview]
Message-ID: <aigypcUHHYFkor1x@ninjato> (raw)
In-Reply-To: <aigwM8t2LnDJvgdy@sirena.co.uk>
[-- Attachment #1: Type: text/plain, Size: 692 bytes --]
On Tue, Jun 09, 2026 at 04:24:35PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the kthread tree got a conflict in:
>
> drivers/i2c/i2c-core-base.c
>
> between commit:
>
> 84762906e2666d ("i2c: core: fix adapter debugfs creation")
>
> from the i2c-host-fixes tree and commits:
>
> 07d5fb537928aa ("i2c: core: fix adapter debugfs creation")
> a378a2bc73e3b7 ("i2c: core: clean up bus id allocation")
>
> from the kthread tree.
? This doesn't come from the kthread tree, does it?
I see the duplication from *my* for-next and Andi's for-next. I will fix
my tree. Sorry for the confusion, a glitch while handing over the
subsystem.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2026-06-09 15:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-09 15:24 linux-next: manual merge of the kthread tree with the i2c-host-fixes tree Mark Brown
2026-06-09 15:35 ` Wolfram Sang [this message]
2026-06-09 15:36 ` 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=aigypcUHHYFkor1x@ninjato \
--to=wsa+renesas@sang-engineering.com \
--cc=andi.shyti@kernel.org \
--cc=broonie@kernel.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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