RE: linux-next: manual merge of the arm-soc tree with the arm tree

[Stephen Warren]

Stephen Rothwell wrote at Monday, October 03, 2011 6:09 PM:
> Hi Arnd,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-tegra/board-seaboard.h between commit ea5abbd215b7 ("ARM:
> 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>") from
> the arm tree and commit a697e694aeb8 ("ARM: Tegra: Seaboard board updates
> for audio") from the arm-soc tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Both this and the similar fixup in the other email look fine to me.

For my education, how does this get resolved; presumably neither Russell's
tree nor arm-soc can take a patch that fixes this right now, so does one of
the trees get rebased after the merge of the other but before being pulled
by Linus, or does Linus do this merge fixup when he pulls?

Thanks for cluing me in!

-- 
nvpublic

--
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/