The following changes since commit a38fd8748464831584a19438cbb3082b5a2dab15:
Linux 5.12-rc2 (2021-03-05 17:33:41 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/ tags/leds-5.13-rc1
for you to fetch changes up to 23a700455a1bc55f3ea20675e574181b8c129306:
leds: pca9532: Assign gpio base dynamically (2021-04-25 23:59:58 +0200)
----------------------------------------------------------------
Nothing too exciting here, just some fixes.
This modifies MAINTAINER's file to remove Dan Murphy's email that is
bouncing (and does it globally). I hope that does not conflict too badly.
----------------------------------------------------------------
Arnd Bergmann (1):
leds: lgm: fix gpiolib dependency
ChiYuan Huang (2):
leds: rt4505: Add DT binding document for Richtek RT4505
leds: rt4505: Add support for Richtek RT4505 flash LED controller
Colin Ian King (1):
leds: lgm: Fix spelling mistake "prepate" -> "prepare"
Geert Uytterhoeven (1):
leds: LEDS_BLINK_LGM should depend on X86
Pavel Machek (2):
leds: Kconfig: LEDS_CLASS is usually selected.
MAINTAINERS: Remove Dan Murphy's bouncing email
Rahul Tanwar (1):
leds: lgm: Improve Kconfig help
Stefan Riedmueller (1):
leds: pca9532: Assign gpio base dynamically
Tian Tao (1):
leds: trigger: pattern: Switch to using the new API kobj_to_dev()
Zheng Yongjun (1):
leds-lm3642: convert comma to semicolon
.../devicetree/bindings/leds/leds-rt4505.yaml | 57 +++
MAINTAINERS | 4 -
drivers/leds/Kconfig | 7 +-
drivers/leds/Makefile | 2 +-
drivers/leds/blink/Kconfig | 33 +-
drivers/leds/blink/Makefile | 2 +-
drivers/leds/blink/leds-lgm-sso.c | 2 +-
drivers/leds/flash/Kconfig | 11 +
drivers/leds/flash/Makefile | 1 +
drivers/leds/flash/leds-rt4505.c | 430 +++++++++++++++++++++
drivers/leds/leds-lm3642.c | 4 +-
drivers/leds/leds-pca9532.c | 2 +
drivers/leds/trigger/ledtrig-pattern.c | 2 +-
13 files changed, 525 insertions(+), 32 deletions(-)
create mode 100644 Documentation/devicetree/bindings/leds/leds-rt4505.yaml
create mode 100644 drivers/leds/flash/leds-rt4505.c
--
http://www.livejournal.com/~pavelmachek
On Sun, May 2, 2021 at 3:05 PM Pavel Machek <[email protected]> wrote:
>
> This modifies MAINTAINER's file to remove Dan Murphy's email that is
> bouncing (and does it globally). I hope that does not conflict too badly.
Well, it caused conflicts, but it's not like they were hard to resolve.
In fact, the resolution was to ignore your changes, because those
email addresses had been removed by the other branches I already
merged, so they were gone even before your merge (and the conflicts
were just due to other changes around it)
Linus
The pull request you sent on Mon, 3 May 2021 00:05:19 +0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/ tags/leds-5.13-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d835ff6c96ae6fa1ea474b0290a46e514ab6742b
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
Hi!
> > This modifies MAINTAINER's file to remove Dan Murphy's email that is
> > bouncing (and does it globally). I hope that does not conflict too badly.
>
> Well, it caused conflicts, but it's not like they were hard to resolve.
>
> In fact, the resolution was to ignore your changes, because those
> email addresses had been removed by the other branches I already
> merged, so they were gone even before your merge (and the conflicts
> were just due to other changes around it)
Oops, sounds like I should have test-merged it and dropped the
change. Thanks for solving it for me.
Best regards,
Pavel
--
On Tue, May 4, 2021 at 8:43 AM Pavel Machek <[email protected]> wrote:
>
> Oops, sounds like I should have test-merged it and dropped the
> change. Thanks for solving it for me.
Oh, it was fine this way too.
In fact, I prefer to see a (trivial) merge conflict over having people
change their branch just to avoid it. So I think this all went down
exactly how it should have been done.
Thanks,
Linus