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.
> from the leds-lj tree and commit:
--
Cheers,
Stephen Rothwell
Attachment:
pgpv_exh1SlIY.pgp
Description: OpenPGP digital signature
