Hi Simon, Today's linux-next merge of the renesas tree got a conflict in drivers/leds/leds-renesas-tpu.c between commit 33d693e59c42 ("leds: use dev_get_platdata()") from the leds tree and commit ae3e4c277669 ("leds: Remove leds-renesas-tpu driver") from the renesas tree. I fixed it up (the latter removed the file, so I did that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpAWPcdIFgwH.pgp
Description: PGP signature