From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754501AbbGBTVd (ORCPT ); Thu, 2 Jul 2015 15:21:33 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:62572 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754254AbbGBTVZ (ORCPT ); Thu, 2 Jul 2015 15:21:25 -0400 From: "Rafael J. Wysocki" To: Linus Torvalds Cc: Darren Hart , "Rafael J. Wysocki" , Hans de Goede , Linux Kernel Mailing List Subject: Re: [RESEND v2][GIT PULL] platform-drivers-x86 for 4.2-1 Date: Thu, 02 Jul 2015 21:47:45 +0200 Message-ID: <5216849.vIPuWYcW7k@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/4.1.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: References: <20150630212423.GB27795@vmdeb7> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday, July 01, 2015 07:04:34 PM Linus Torvalds wrote: > On Tue, Jun 30, 2015 at 2:24 PM, Darren Hart 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