From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Ferre Subject: Re: linux-next: manual merge of the arm-soc tree with the arm-soc and pincrtl trees Date: Mon, 26 Nov 2012 11:14:25 +0100 Message-ID: <50B34101.5020405@atmel.com> References: <20121126205615.cda9cfaa998ce6972937d4aa@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.242]:22809 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753308Ab2KZKO2 (ORCPT ); Mon, 26 Nov 2012 05:14:28 -0500 In-Reply-To: <20121126205615.cda9cfaa998ce6972937d4aa@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, Fabio Porcedda , linux-kernel@vger.kernel.org -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 11/26/2012 10:56 AM, Stephen Rothwell : > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/at91sam9g45.dtsi between various commits from > the arm-soc and pincrtl trees and commit 7492e7ca0f95 ("ARM: > at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45") > from the arm-soc tree. > > I fixed it up (see below) and can carry the fix as necessary (no > action is required). Good fix. Thanks for your help Stephen. Best regards, - -- Nicolas Ferre -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQEcBAEBAgAGBQJQs0EBAAoJEAf03oE53VmQW6kIAK4g8nWh1FloA74ZcfRTIgWQ /T4jQkub7phq9Q61jZ6yf4SsISpU7UE2q6G71J8Y/JWnYQf+7N8ricr/+B7arVMD U9xnPnkwEghOIZ6uI7r5rYGypuIdUwAJSb9pg8h7O+ISi7vgEUxiiZRioyb8qBH9 NBFTQr9mLiu89fi9iN5N2QMJdn7L3qE+K6JRbRjXbxv9O2kFCWqEBGxyWNtBzAe3 rLSnRTtI2Oh5UZ0bTi5khL+hcJLsw/rcNv/6odhc1A/bDlZKVoMKlR0sZI9DQx4w pOtlhxsWX8c4XiTXVKn5fk9wjAOhXSJTfZbNo8Ii2ndGuWorNYoYF2Cm9NuiUSI= =nzDW -----END PGP SIGNATURE----- From mboxrd@z Thu Jan 1 00:00:00 1970 From: nicolas.ferre@atmel.com (Nicolas Ferre) Date: Mon, 26 Nov 2012 11:14:25 +0100 Subject: linux-next: manual merge of the arm-soc tree with the arm-soc and pincrtl trees In-Reply-To: <20121126205615.cda9cfaa998ce6972937d4aa@canb.auug.org.au> References: <20121126205615.cda9cfaa998ce6972937d4aa@canb.auug.org.au> Message-ID: <50B34101.5020405@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 11/26/2012 10:56 AM, Stephen Rothwell : > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/at91sam9g45.dtsi between various commits from > the arm-soc and pincrtl trees and commit 7492e7ca0f95 ("ARM: > at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45") > from the arm-soc tree. > > I fixed it up (see below) and can carry the fix as necessary (no > action is required). Good fix. Thanks for your help Stephen. Best regards, - -- Nicolas Ferre -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQEcBAEBAgAGBQJQs0EBAAoJEAf03oE53VmQW6kIAK4g8nWh1FloA74ZcfRTIgWQ /T4jQkub7phq9Q61jZ6yf4SsISpU7UE2q6G71J8Y/JWnYQf+7N8ricr/+B7arVMD U9xnPnkwEghOIZ6uI7r5rYGypuIdUwAJSb9pg8h7O+ISi7vgEUxiiZRioyb8qBH9 NBFTQr9mLiu89fi9iN5N2QMJdn7L3qE+K6JRbRjXbxv9O2kFCWqEBGxyWNtBzAe3 rLSnRTtI2Oh5UZ0bTi5khL+hcJLsw/rcNv/6odhc1A/bDlZKVoMKlR0sZI9DQx4w pOtlhxsWX8c4XiTXVKn5fk9wjAOhXSJTfZbNo8Ii2ndGuWorNYoYF2Cm9NuiUSI= =nzDW -----END PGP SIGNATURE----- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754789Ab2KZKOa (ORCPT ); Mon, 26 Nov 2012 05:14:30 -0500 Received: from eusmtp01.atmel.com ([212.144.249.242]:22809 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753308Ab2KZKO2 (ORCPT ); Mon, 26 Nov 2012 05:14:28 -0500 Message-ID: <50B34101.5020405@atmel.com> Date: Mon, 26 Nov 2012 11:14:25 +0100 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Stephen Rothwell CC: Olof Johansson , Arnd Bergmann , , , "Fabio Porcedda" , Subject: Re: linux-next: manual merge of the arm-soc tree with the arm-soc and pincrtl trees References: <20121126205615.cda9cfaa998ce6972937d4aa@canb.auug.org.au> In-Reply-To: <20121126205615.cda9cfaa998ce6972937d4aa@canb.auug.org.au> X-Enigmail-Version: 1.4.6 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 11/26/2012 10:56 AM, Stephen Rothwell : > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/at91sam9g45.dtsi between various commits from > the arm-soc and pincrtl trees and commit 7492e7ca0f95 ("ARM: > at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45") > from the arm-soc tree. > > I fixed it up (see below) and can carry the fix as necessary (no > action is required). Good fix. Thanks for your help Stephen. Best regards, - -- Nicolas Ferre -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQEcBAEBAgAGBQJQs0EBAAoJEAf03oE53VmQW6kIAK4g8nWh1FloA74ZcfRTIgWQ /T4jQkub7phq9Q61jZ6yf4SsISpU7UE2q6G71J8Y/JWnYQf+7N8ricr/+B7arVMD U9xnPnkwEghOIZ6uI7r5rYGypuIdUwAJSb9pg8h7O+ISi7vgEUxiiZRioyb8qBH9 NBFTQr9mLiu89fi9iN5N2QMJdn7L3qE+K6JRbRjXbxv9O2kFCWqEBGxyWNtBzAe3 rLSnRTtI2Oh5UZ0bTi5khL+hcJLsw/rcNv/6odhc1A/bDlZKVoMKlR0sZI9DQx4w pOtlhxsWX8c4XiTXVKn5fk9wjAOhXSJTfZbNo8Ii2ndGuWorNYoYF2Cm9NuiUSI= =nzDW -----END PGP SIGNATURE-----