Messages in this thread | | | Date | Thu, 15 Mar 2012 08:10:27 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the tty tree with the xen-two tree |
| |
On Thu, Mar 15, 2012 at 04:37:40PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in > drivers/tty/hvc/hvc_xen.c between commits 02e19f9c7cac ("hvc_xen: > implement multiconsole support") and cf8e019b523a ("hvc_xen: introduce > HVC_XEN_FRONTEND") from the xen-two tree and commit d4e33fac2408 > ("serial: Kill off NO_IRQ") from the tty tree. > > The code was moved around. I fixed it up (see below) and can carry the > fix as necessary.
Thanks, this looks good.
greg k-h
| |