Messages in this thread | | | Date | Thu, 5 Aug 2010 08:51:26 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the tty tree with the kgdb tree |
| |
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
| |