Re: [RESEND v2][GIT PULL] platform-drivers-x86 for 4.2-1

["Rafael J. Wysocki" <rjw@rjwysocki.net>]

On Wednesday, July 01, 2015 07:04:34 PM Linus Torvalds wrote:
> On Tue, Jun 30, 2015 at 2:24 PM, Darren Hart <dvhart@infradead.org> wrote:
> >
> > other: Use acpi_video_unregister_backlight instead of acpi_video_unregister in
> >        serveral drivers.
> 
> This was very annoying.
> 
> Why? There were several pointless conflicts, because you and Rafael
> both applied some of the same patches from Hans de Goede, and then
> Rafael had further cleanups (also from Hans) on top of that, so as a
> result you have both sides doing changes, but not agreeing on just
> what the changes are. End result: conflict.
> 
> The conflicts weren't hard to handle, since generally it was trivial
> to see that "ok, I had already gotten that change and then some" and
> just pick Rafael's side. But it's annoying because it shows that you
> guys are stepping on each others toes, and clearly it's not clear who
> maintains what.
> 
> And you guys had clearly both been on the same mail thread, because
> Rafael had you as acking the changes that you had then also committed
> in your own tree. Please talk to each other so that you know who takes
> what, and we don't have this kind of unnecessary duplication and
> subsequent extra work.
> 
> A few duplicate commits aren't the end of the world, so it's not like
> this is a serious problem, but it's an annoyance.

Sorry about that, we'll coordinate better next time.

Rafael