Re: linux-next: manual merge of the tip tree with the arm tree

[Ingo Molnar <mingo@elte.hu>]

* Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:

> On Fri, May 13, 2011 at 11:26:46AM +0200, Ingo Molnar wrote:
> > Also note that there's also some pending changes in the x86 tree modifying
> > arch/x86/kernel/i8253.c:
> > 
> >   b01cc1b0eae0: x86: Convert remaining x86 clocksources to clocksource_register_hz/khz
> > 
> > If you want to do any further change to this file you need to pull in this 
> > change first or need to resolve the conflict in some other way.
> 
> I have been told by Linus on more than one occasion that Linus wants to
> see exactly these kinds of merge conflicts, as it helps him track what's
> going on.

He has told us on more than one occasion that he wants to see *easy* conflicts, 
where he can see benign interaction between properly maintained trees.

Here he would look and would only determine what i have already determined: 
that the workflow of applying this patch sucked. That is definitely not the 
kind of conflict Linus wants to see in the merge window ...

You applied the patch without talking to the maintainers who are running the 
affected tree. You talked to one of the developers which is fine, and i will 
generally ack it in hindsight if you do a fine job of sorting out the details - 
but here you touched an under-modification file without even realizing it. So 
you messed up which fact i will keep pointing out and i will keep asking you to 
fix your workflow, so that similar mistakes wont happen in the future.

Really, Russell, you sometimes need to accept blame and you need to admit when 
you messed up instead of writing countless mails trying to save face and 
wriggle out of it. I mess up all the time and my hand does not rot away from 
writing this. Really, write this down: "You are right, I messed this up a bit, 
lets fix it instead of wasting time on emails."

Lets resolve the conflict and move on, okay?

Thanks,

	Ingo