Re: linux-next: manual merge of the battery tree with the leds-lj tree

[Stephen Rothwell]

Hi Lee,

On Tue, 9 Jul 2024 10:23:37 +0100 Lee Jones <lee@xxxxxxxxxx> wrote:
>
> On Tue, 09 Jul 2024, Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > On Tue, 9 Jul 2024 13:34:20 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:  
> > >
> > > Today's linux-next merge of the battery tree got a conflict in:
> > > 
> > >   include/linux/leds.h
> > > 
> > > between commit:
> > > 
> > >   6b0d3355e5a5 ("leds: class: Add flag to avoid automatic renaming of LED devices")  
> > 
> > This is also in the mfd tree.  
> 
> That's intentional.  It's a shared branch.
> 
> Same commit ID, right?

Yeah, not a problem, I was just noting for completeness.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpiTT8Dkdn8R.pgp
Description: OpenPGP digital signature