On Thu, Apr 21, 2011 at 09:29:30AM -0700, Stephen Warren wrote:
It didn't matter which way around it was. However, thinking more I was indeed wrong, since the conflicts in the initial application were more complex than I'd thought through.
It's not that they were complex, it's more that if you've got a patch which is advertised as being for a particular branch the general expectation is that it would actually apply to that branch.
I guess the correct solution would have been for a clean application to your tegra branch, then you'd be OK with the merge conflict into 2.6.40? I probably should have mentioned it in the patch either way.
Yes, ideally you'd also show the merge result (and possibly even publish versions of both branches after application, especially if the merge is tricky).