Messages in this thread | | | From | Linus Torvalds <> | Date | Tue, 4 May 2021 08:54:41 -0700 | Subject | Re: [GIT PULL] LEDs changes for v5.13-rc1 |
| |
On Tue, May 4, 2021 at 8:43 AM Pavel Machek <pavel@ucw.cz> 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
| |