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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20240709161729.27935749@canb.auug.org.au>
Date: Tue, 9 Jul 2024 16:17:29 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Sebastian Reichel <sre@...nel.org>, Lee Jones <lee@...nel.org>
Cc: 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

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.

> from the leds-lj tree and commit:
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped