Re: linux-next: manual merge of the tty tree with the kgdb tree

From: Greg KH
Date: Thu Aug 05 2010 - 11:52:11 EST


On Thu, Aug 05, 2010 at 01:17:00PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/char/vt.c between commit be6f9f80724e1684987c486c33c4eb882ba50680
> ("vt,console,kdb: automatically set kdb LINES variable") from the kgdb
> tree and commit 46ca223803ae544fb5460bc81d961244866fcdc4 ("vt: clean up
> the code - use kernel library") from the tty tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.

Thanks, that's an easy fixup.

greg k-h
--
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/