lkml.org 
[lkml]   [2021]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] LEDs changes for v5.13-rc1
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

--

\
 
 \ /
  Last update: 2021-05-04 17:44    [W:0.134 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site