From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [git patches] libata updates Date: Wed, 25 Jul 2012 18:58:21 -0400 Message-ID: <50107A0D.3060003@pobox.com> References: <20120725203551.GA19762@havoc.gtf.org> <20120725204350.GA20530@havoc.gtf.org> <50107297.305@pobox.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-yw0-f46.google.com ([209.85.213.46]:40968 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751107Ab2GYW6Z (ORCPT ); Wed, 25 Jul 2012 18:58:25 -0400 In-Reply-To: Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Linus Torvalds Cc: Andrew Morton , linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org, LKML On 07/25/2012 06:31 PM, Linus Torvalds wrote: > On Wed, Jul 25, 2012 at 3:26 PM, Jeff Garzik wrote: >> >> Even so, separately, it still needed that post-merge compile fix. > > And that's yet another example of how *NOT* to do things. > > If the merge has errors like that, then they should be fixed up in the merge. > > Please. Don't do this. Let me merge stuff, and you explain in the pull > request why it gets merge problems. Not this mess. > > That merge itself was *trivial*. I do those kinds of fixups in my > sleep and you don't even need to explain those. The non-trivial part > you did as a separate commit. But neither of those should have been > "I'll pre-merge for Linus so that he doesn't see these problems". What is the right course in when a post-merge change is needed? Jeff