From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754243Ab2ENFHm (ORCPT ); Mon, 14 May 2012 01:07:42 -0400 Received: from shards.monkeyblade.net ([198.137.202.13]:52152 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752661Ab2ENFHl (ORCPT ); Mon, 14 May 2012 01:07:41 -0400 Date: Mon, 14 May 2012 01:03:14 -0400 (EDT) Message-Id: <20120514.010314.489356554013696006.davem@davemloft.net> To: sfr@canb.auug.org.au Cc: tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com, peterz@infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, sam@ravnborg.org Subject: Re: linux-next: manual merge of the tip tree with the sparc-next tree From: David Miller In-Reply-To: <20120514145114.bc3e8b95da9478486ac0a13e@canb.auug.org.au> References: <20120514145114.bc3e8b95da9478486ac0a13e@canb.auug.org.au> X-Mailer: Mew version 6.5 on Emacs 24.0.95 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (shards.monkeyblade.net [198.137.202.13]); Sun, 13 May 2012 22:03:18 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Rothwell Date: Mon, 14 May 2012 14:51:14 +1000 > Today's linux-next merge of the tip tree got a conflict in > arch/sparc/include/asm/thread_info_32.h between commit e7b7e0c35655 > ("sparc32: drop btfixup for alloc_thread_info_node/free_thread_info") > from the sparc-next tree and commit f5e10287367d ("task_allocator: Use > config switches instead of magic defines") from the tip tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Thanks Stephen, you in fact probably will need to carry this one.