Messages in this thread | | | Date | Wed, 19 Sep 2012 08:17:05 +0100 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the tty tree |
| |
On Wed, Sep 19, 2012 at 02:16:36PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/serial/io_edgeport.c between commit adc8d746caa6 ("tty: move > the termios object into the tty") from the tty tree and commit > 984f68683298 ("USB: serial: io_edgeport.c: remove dbg() usage") from the > usb tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks correct to me, thanks for the fix.
greg k-h
| |