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

2013-03-26 Thread Greg KH
On Tue, Mar 26, 2013 at 02:49:32PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/serial/usb-serial.c between commit 6aad04f21374 ("TTY: add > tty_port_tty_wakeup helper") from the tty tree and commit d12e211d4484 > ("USB: ser

linux-next: manual merge of the usb tree with the tty tree

2013-03-25 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/serial/usb-serial.c between commit 6aad04f21374 ("TTY: add tty_port_tty_wakeup helper") from the tty tree and commit d12e211d4484 ("USB: serial: clean up debug info") from the usb tree. I fixed it up (I just used the

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

2013-01-28 Thread Greg KH
On Mon, Jan 28, 2013 at 09:13:07PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/gadget/Kconfig between commit 4f73bc4dd3e8 ("tty: Added a > CONFIG_TTY option to allow removal of TTY") from the tty tree and commit > 3249ca22c

linux-next: manual merge of the usb tree with the tty tree

2013-01-28 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/gadget/Kconfig between commit 4f73bc4dd3e8 ("tty: Added a CONFIG_TTY option to allow removal of TTY") from the tty tree and commit 3249ca22c088 ("usb: gadget: u_serial: convert into a module") from the usb tree. I fix

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

2012-09-19 Thread Greg KH
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 ("U

linux-next: manual merge of the usb tree with the tty tree

2012-09-18 Thread Stephen Rothwell
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

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

2012-09-17 Thread Greg KH
On Mon, Sep 17, 2012 at 05:31:03PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/serial/digi_acceleport.c between commit adc8d746caa6 ("tty: > move the termios object into the tty") from the tty tree and commit > f9dfbebb8b39

linux-next: manual merge of the usb tree with the tty tree

2012-09-17 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/serial/mos7720.c between commit adc8d746caa6 ("tty: move the termios object into the tty") from the tty tree and commit 9eecf8085473 ("USB: serial: mos7720.c: remove dbg() usage") from the usb tree. I fixed it up (see

linux-next: manual merge of the usb tree with the tty tree

2012-09-17 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/serial/io_ti.c between commit adc8d746caa6 ("tty: move the termios object into the tty") from the tty tree and commit 67e6da702753 ("USB: serial: io_ti.c: remove dbg() usage") from the usb tree. I fixed it up (see bel

linux-next: manual merge of the usb tree with the tty tree

2012-09-17 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/serial/digi_acceleport.c between commit adc8d746caa6 ("tty: move the termios object into the tty") from the tty tree and commit f9dfbebb8b39 ("USB: serial: digi_acceleport.c: remove dbg() usage") from the usb tree. I

linux-next: manual merge of the usb tree with the tty tree

2012-09-17 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/serial/kl5kusb105.c between commit adc8d746caa6 ("tty: move the termios object into the tty") from the tty tree and commit 1ad7604f69ae ("USB: serial: kl5kusb105.c: remove dbg() usage") from the usb tree. I fixed it u

linux-next: manual merge of the usb tree with the tty tree

2012-09-17 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/serial/mos7840.c between commit adc8d746caa6 ("tty: move the termios object into the tty") from the tty tree and commit 9c134a14f2da ("USB: serial: mos7840.c: remove dbg() usage") from the usb tree. I fixed it up (see