Re: linux-next: manual merge of the tip tree with Linus' tree
From: Sebastian Andrzej Siewior
Date: Wed Mar 16 2011 - 04:50:37 EST
Stephen Rothwell wrote:
Today's linux-next merge of the tip tree got a conflict in
arch/x86/platform/ce4100/ce4100.c between commit 03150171dcf9 ("x86:
ce4100: Set pci ops via callback instead of module init") from Linus'
tree and commit 1fa4163bdc19 ("x86: ce4100: Use OF to setup devices")
from the tip tree.
I just looked and Linus already pulled and fixed it up by himself. Thanks
for letting me know.
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/