Re: linux-next: manual merge of the kthread tree with the i2c-host-fixes tree

[Mark Brown]

On Tue, Jun 09, 2026 at 05:35:01PM +0200, Wolfram Sang wrote:
> On Tue, Jun 09, 2026 at 04:24:35PM +0100, Mark Brown wrote:

> > 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.

It's your tree, yes - the scripting got confused and is picking up
kthread as the anme for some reason.

Attachment: signature.asc
Description: PGP signature