Re: linux-next: manual merge of the msm tree with the arm tree

[David Brown]

On Sun, Jan 30 2011, Stephen Rothwell wrote:

> Hi David,
>
> Today's linux-next merge of the msm tree got conflicts in
> arch/arm/mach-msm/board-msm7x27.c, arch/arm/mach-msm/board-msm7x30.c,
> arch/arm/mach-msm/board-qsd8x50.c and arch/arm/mach-msm/board-sapphire.c
> between commit eda53d6d032effb653410b79e1b49e652a881744 ("ARM: P2V: avoid
> initializers and assembly using PHYS_OFFSET") from the arm tree and
> commit 07a3cc4814f790354d4c7be2c9dc6143a714a07a ("msm: Clean up useless
> ifdefs") from the msm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

What is the best way to resolve this?  I can't really merge against
Russell's tree, since he may need to rebase his tree before the merge
window?  Or is it best to just have you carry the conflict resolution in
linux-next, and I make the resolution during the next merge window?

Thanks,
David

-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/