Messages in this thread | | | From | Linus Torvalds <> | Date | Mon, 3 May 2021 12:27:00 -0700 | Subject | Re: [GIT PULL] LEDs changes for v5.13-rc1 |
| |
On Sun, May 2, 2021 at 3:05 PM Pavel Machek <pavel@ucw.cz> 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
| |