From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932183Ab2EGUYf (ORCPT ); Mon, 7 May 2012 16:24:35 -0400 Received: from smtp.snhosting.dk ([87.238.248.203]:33796 "EHLO smtp.domainteam.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932115Ab2EGUYe (ORCPT ); Mon, 7 May 2012 16:24:34 -0400 Date: Mon, 7 May 2012 22:24:32 +0200 From: Sam Ravnborg To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Daney , Michal Marek Subject: Re: linux-next: manual merge of the tip tree with the kbuild tree Message-ID: <20120507202432.GA10521@merkur.ravnborg.org> References: <20120507151054.3fa8df4599e81cc6ae87ca7a@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120507151054.3fa8df4599e81cc6ae87ca7a@canb.auug.org.au> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 07, 2012 at 03:10:54PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in Makefile > between commit 1f2bfbd00e46 ("kbuild: link of vmlinux moved to a script") > from the kbuild tree and commit 1dbdc6f177c6 ("kbuild/extable: Hook up > sortextable into the build system") from the tip tree. > > I used the Makefile bits from the kbuild tree and added the following > patch as a merge fixup. > > From: Stephen Rothwell > Date: Mon, 7 May 2012 15:00:04 +1000 > Subject: [PATCH] kbuild: merge fix for sorting exceptions tables at build time > > Signed-off-by: Stephen Rothwell Acked-by: Sam Ravnborg Thanks Stephen, I should have know this conflict came up as I had seen this patch already. But somehow I forgot it again. Sam