Re: linux-next: manual merge of the mfd tree with the origin tree
From: Lee Jones
Date: Tue Nov 17 2026 - 06:24:40 EST
On Tue, 17 Nov 2026, Mark Brown wrote:
> On Tue, Nov 17, 2026 at 10:47:22AM +0000, Lee Jones wrote:
> > Kees, et al.,
> >
> > > Today's linux-next merge of the mfd tree got a conflict in:
> > >
> > > drivers/mfd/nct6694.c
> > >
> > > between commit:
> > >
> > > 4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")
> >
> > Is there a branch / tag that I can pull this in from?
>
> It's been in mainline since -rc2.
Okay, I'll rebase. Thanks.
--
Lee Jones