From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Ferre Subject: Re: linux-next: manual merge of the kbuild tree with the arm-soc tree Date: Tue, 7 Oct 2014 09:56:34 +0200 Message-ID: <54339CB2.9010202@atmel.com> References: <20141007123926.0e14810b@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from eusmtp01.atmel.com ([212.144.249.243]:24008 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751214AbaJGH4h (ORCPT ); Tue, 7 Oct 2014 03:56:37 -0400 In-Reply-To: <20141007123926.0e14810b@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , Michal Marek , Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Boris BREZILLON On 07/10/2014 03:39, Stephen Rothwell : > Hi Michal, > > Today's linux-next merge of the kbuild tree got a conflict in > arch/arm/mach-at91/Makefile between commit 91a55d4f6900 ("ARM: at91: > introduce OLD_IRQ_AT91 Kconfig option") from the arm-soc tree and > commit ac84eb47cc19 ("kbuild: remove unnecessary variable > initializaions") from the kbuild tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Fix is good. Thanks Stephen. Bye, -- Nicolas Ferre