Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757955Ab1EMIHZ (ORCPT ); Fri, 13 May 2011 04:07:25 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:56776 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757767Ab1EMIHJ (ORCPT ); Fri, 13 May 2011 04:07:09 -0400 Date: Fri, 13 May 2011 10:06:34 +0200 From: Ingo Molnar To: Stephen Rothwell , Russell King , Russell King Cc: Thomas Gleixner , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King , John Stultz , Jacob Pan , Glauber Costa , Dimitri Sivanich , Rusty Russell , Jeremy Fitzhardinge , Chris McDermott , Konrad Rzeszutek Wilk Subject: Re: linux-next: manual merge of the tip tree with the arm tree Message-ID: <20110513080634.GA13647@elte.hu> References: <20110513131437.8999e8eb.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110513131437.8999e8eb.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-08-17) X-ELTE-SpamScore: -2.0 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-2.0 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.3.1 -2.0 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1865 Lines: 50 * Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > arch/x86/kernel/i8253.c between commit 3490f584b9ba ("clocksource: convert > x86 to generic i8253 clocksource") from the arm tree and commit b01cc1b0eae0 > ("x86: Convert remaining x86 clocksources to clocksource_register_hz/khz") > from the tip tree. > > The former seems to supercede the latter, so I used the former. Russell, how the heck did this commit: commit 3490f584b9ba5a0b6f63832fbc9c5ec72506697b Author: Russell King AuthorDate: Sun May 8 18:55:19 2011 +0100 Commit: Russell King CommitDate: Tue May 10 08:20:54 2011 +0100 clocksource: convert x86 to generic i8253 clocksource which has such a clearly x86 diffstat: arch/x86/Kconfig | 1 + arch/x86/include/asm/i8253.h | 2 + arch/x86/kernel/i8253.c | 79 +----------------------------------------- 3 files changed, 4 insertions(+), 78 deletions(-) end up in the ARM tree without an ack from an x86 maintainer?? Not only did it conflict with a 2 months old commit, but it also broke the linux-next x86 build. I see the commit has an ack from John but that feedback is not visible in the lkml thread of this patch nor did John really realize the conflict nor the build breakage. The patch was still in the to-be-reviewed queue of our patches. Nor was it tested properly. The patch looks sane but your workflow sucks. Please revert it and use a proper Git workflow to change arch/x86/ details ... Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/