Re: [GIT PULL] LEDs changes for v5.13-rc1
From: Pavel Machek
Date: Tue May 04 2021 - 11:43:36 EST
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
--