Re: linux-next: manual merge of the sh tree with Linus' tree
From: Paul Mundt
Date: Mon Aug 08 2011 - 03:26:39 EST
On Mon, Aug 08, 2011 at 12:36:27PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the sh tree got a conflict in
> drivers/tty/serial/sh-sci.c between commit fc97114b8d67 ("sh: Fix boot
> crash related to SCI") from Linus' tree and commit ad75b88ac379 ("serial:
> sh-sci: Fix up default regtype probing") from the sh tree.
> These do the same thing slightly differently ("ret" v. "ret != 0"). I
> used the version from Linus' tree.
I've done the same, should be fixed for tomorrow, thanks.
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/