-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 05/18/2012 12:44 AM, Stephen Rothwell :
> Hi all,
>
> On Thu, 17 May 2012 08:06:01 -0700 Greg KH
> <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>>
>> On Wed, May 16, 2012 at 06:50:54PM +0000, Arnd Bergmann wrote:
>>> On Wednesday 16 May 2012, Nicolas Ferre wrote:
>>>> Now that the bulk of at91sam9g20-related nodes are located in
>>>> at91sam9260.dtsi, we have to re-create the path to this ADC
>>>> node for SoC specific parts.
>>>>
>>>> Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
>>>
>>> Should we apply this patch in arm-soc so that Greg can drop the
>>> hunk that no longer applies?
>>
>> It's not a "no longer applies", it's a "this does not merge".
>> The patch is in my tree, unless you want me to revert it, it's
>> going to stay there until it goes to Linus.
>
> Just apply the patch to the arm-soc tree - then the merge
> resolution becomes "use the arm-soc version". There is no need
> for Greg to revert the other patch.
Hi Stephen,
After checking the current status of
arch/arm/boot/dts/at91sam9g20.dtsi in linux-next, it seems the merge
resolution has not produced a good result:
The "adc0" node, should only look like:
ahb {
apb {
adc0: adc@fffe0000 {
atmel,adc-startup-time = <40>;
};
};
};
without the redundant code carried by the staging git tree. In short,
the arm-soc version is the proper one.
Thanks for your help, best regards,
- --
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJPuhR7AAoJEAf03oE53VmQW4wH/0lqpqrTujJ/dQ0z5Ku7Xde3
EKKJm51AIlIadOXiteYH6cw34ISm68cXZWpkbKh3UKiCcJGSJi4VjCrkcJ//CwUL
B4bZD3A6Y8zLQ+TaQbjMnfzKq2dOBRQ1M1dNoQXwPe83vjV85T4hoKco7LBhGhUI
l//0aWrcefH9sQynAYRhNE0M6hlfr/Edlia0zHlkVYqE2K5ALxaH6lki2EUzxvJC
l8qydZ9lum37ebnot09WB2qhIlkRApb50sYbQG4nMwlC3jSblXrPelQvChWLo/yi
JOPOF7Lcj9fnJmeVGlQknobilgWmRnuVQUbqBG4NjDx71k5WiEywF6ymBa8TJnA=
=rnQu
-----END PGP SIGNATURE-----
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
