[GIT PULL v2] Linux support for ARM LPAE

[Catalin Marinas]

On 6 December 2011 20:34, Russell King - ARM Linux
<linux at arm.linux.org.uk> wrote:
> On Tue, Dec 06, 2011 at 03:29:55PM +0000, Catalin Marinas wrote:
>> I updated the series with an additional signed-off-by to your patch. The
>> code is unchanged. Could you please pull it again?
>
> I will for this time only, but note - last time you said:
>
>> If there are no further comments, could you please pull the ARM LPAE
>> branch below? They should be merged after Will's idmap patches (no real
>> conflict, just correctly functioning setup_mm_for_reboot).
>
> Now, the thing is, merging it after Will's patches won't solve that in
> any shape or form - it really does not matter what order I do the merges
> in, the fact of the matter is that there is no ordering or dependence
> between your patches and Will's, so there's no guarantee that your code
> will see a properly functioning setup_mm_for_reboot.

This situation is not unique to my LPAE patches (git bisect doesn't
always go well merges). There are many other situations where one
relies on some stuff to get into mainline (or maintainer tree) before
merging. Just have a look at the kernel logs.

But if you want, there other solutions:

1. I can rebase the LPAE branch on top of your devel-stable _after_
you merged Will's patches. Then I send another pull request.

2. Only merge the LPAE patches without the one adding the Kconfig
option. Later apply the Kconfig patch.

> If you actually depend on something in some other tree, you need to have
> it merged into your tree _before_ the objects which depend on it.

Not easy in this instance. AFAIK Will's code relied on some reset
patches from you, so Will just used your devel-stable branch.

> As I said, I will merge it this time around, but next time I won't.

As I also said above, there are solutions. What it is really needed is
_better_ collaboration during merges and _discussing_ the best
approach rather than threatening that there won't be other pulls. I'm
open to rebase my branch against other commits, just say it. I doubt
this is the only time where merge issues occured.

-- 
Catalin