On Thu, 19 Jul 2012, Tony Lindgren wrote:
> Well I'm still a bit confused :)
>
> Which branch in arm-soc tree should this fix be applied then?
In terms of arm-soc, it's needed in arm-soc for-next, due to commit
066b6eba6d58ad1cb9ec3917b6ee79730c3c3310 ("Merge branch 'next/cleanup'
into for-next"). That merge commit resolves the conflict the same way
that the linux-omap tree commit 3dd50d0545bd5a8ad83d4339f07935cd3e883271
("Merge tag 'omap-cleanup-for-v3.6' into tmp-merge") did.
066b6eba is also present in a few other arm-soc branches:
arm-soc/staging/io-cleanup-pci
arm-soc/tmp
I did not do an exhaustive search for similar mismerges under different
commit IDs.
- Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
