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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240709092337.GB501857@google.com>
Date: Tue, 9 Jul 2024 10:23:37 +0100
From: Lee Jones <lee@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Sebastian Reichel <sre@...nel.org>, Hans de Goede <hdegoede@...hat.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Thomas Weißschuh <linux@...ssschuh.net>
Subject: Re: linux-next: manual merge of the battery tree with the leds-lj
 tree

On Tue, 09 Jul 2024, Stephen Rothwell wrote:

> Hi all,
> 
> On Tue, 9 Jul 2024 13:34:20 +1000 Stephen Rothwell <sfr@...b.auug.org.au> 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?

-- 
Lee Jones [李琼斯]