From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Ferre Subject: Re: linux-next: manual merge of the cpuidle-cons tree with the arm-soc tree Date: Mon, 12 Mar 2012 17:05:32 +0100 Message-ID: <4F5E1ECC.1040605@atmel.com> References: <20120309183732.512d3676599da324f4747219@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from newsmtp5.atmel.com ([204.2.163.5]:4545 "EHLO sjogate2.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751239Ab2CLQGB (ORCPT ); Mon, 12 Mar 2012 12:06:01 -0400 In-Reply-To: <20120309183732.512d3676599da324f4747219@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , Rob Lee , Daniel Lezcano Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 03/09/2012 08:37 AM, Stephen Rothwell : > Hi Rob, > > Today's linux-next merge of the cpuidle-cons tree got a conflict > in arch/arm/mach-at91/cpuidle.c between commit 00482a4078f4 ("ARM: > at91: implement the standby function for pm/cpuidle") from the > arm-soc tree and commit 7a1f6e72dce1 ("ARM: at91: Consolidate time > keeping and irq enable") from the cpuidle-cons tree. > > I fixed it up (I think - see below) and can carry the fix as > necessary. Yes: resolution correct. Please carry it. Thanks to Rob and Daniel for their answers. Best regards, - -- Nicolas Ferre -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJPXh7HAAoJEAf03oE53VmQSQwH/15D3okPxJSEiH0k8IFt6Df0 RDY/CdaGYDllGMq7Yc1LiQAPrlHkv+gFNAJkhH8aJvC603pYBFGIa5IPLeZEE+XD MkXiO7pQAOdGtojqSrZI8Sp0kxtfdR6QlNu5o518yvlKIkxbWJoXdVty9+MuciOv GOR+164hJtlr4fLLg7bTzsdnxquDVBBbks9qLhSYEQBEuNkgXKgNfdMouwVI/Zuj sX9DSKnVVm5LS/rrq888JRPPtBf8/HkmOeFRWKktq7Q8WldQbBI79vj01osH++jf rwDiM/CSC0nhXY0IWEof+Hz1mSinM07XGZglDYwqI1ca7HId2C/txaFI3NtcC7A= =rZpG -----END PGP SIGNATURE-----