From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Travis Subject: Re: linux-next: manual merge of the rr_cpumask tree Date: Fri, 02 Jan 2009 09:21:45 -0800 Message-ID: <495E4D29.70305@sgi.com> References: <20090102133557.0750cdbe.sfr@canb.auug.org.au> <200901021617.40995.rusty@rustcorp.com.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from relay3.sgi.com ([192.48.171.31]:39600 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751741AbZABRVs (ORCPT ); Fri, 2 Jan 2009 12:21:48 -0500 In-Reply-To: <200901021617.40995.rusty@rustcorp.com.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Rusty Russell Cc: Stephen Rothwell , linux-next@vger.kernel.org, Ingo Molnar Rusty Russell wrote: > On Friday 02 January 2009 13:05:57 Stephen Rothwell wrote: >> Hi Rusty, >> >> Today's linux-next merge of the rr_cpumask tree got a conflict in >> arch/x86/kernel/io_apic.c between commit >> 22f65d31b25a320a5246592160bcb102d2791c45 ("x86: Update io_apic.c to use >> new cpumask API") from the cpus4096 tree and commit >> 2ca1a615835d9f4990f42102ab1f2ef434e7e89c ("Merge branch 'master' of >> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6") (or >> something - I suspect git has failed me a little here) > > Yes, I've had several 'git blame' pointing to merges from Ingo's tree. > And they tend to be n-way merges, so tracing it down is too hard. > > The cpus4096 tree is supposed to have already merged the cpumask tree, > so this should not have happened. > >> I have dropped the rr_cpumask tree for today and also the rr tree that >> depends on it. > > OK I will remove this dependency for the moment. > > Rusty. Hi Rusty & Stephen, Thanks for dealing with these thorny issues. Yes, if there's a more pita file than sched.c it's io_apic.c ... ;-) Cheers, Mike