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

2013-01-25 Thread Greg KH
On Mon, Jan 21, 2013 at 01:02:19PM -0800, Greg KH wrote: > On Mon, Jan 21, 2013 at 03:07:11PM +1100, Stephen Rothwell wrote: > > Hi Greg, > > > > Today's linux-next merge of the usb tree got a conflict in > > drivers/usb/serial/io_ti.c between commit 1ee0a224bc9a ("USB: io_ti: Fix > > NULL

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

2013-01-25 Thread Greg KH
On Mon, Jan 21, 2013 at 01:02:19PM -0800, Greg KH wrote: On Mon, Jan 21, 2013 at 03:07:11PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/serial/io_ti.c between commit 1ee0a224bc9a (USB: io_ti: Fix NULL dereference in

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

2013-01-21 Thread Greg KH
On Mon, Jan 21, 2013 at 03:07:11PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/serial/io_ti.c between commit 1ee0a224bc9a ("USB: io_ti: Fix > NULL dereference in chase_port()") from Linus' tree and commit > f40d781554ef

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

2013-01-21 Thread Greg KH
On Mon, Jan 21, 2013 at 03:07:11PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/serial/io_ti.c between commit 1ee0a224bc9a (USB: io_ti: Fix NULL dereference in chase_port()) from Linus' tree and commit f40d781554ef (USB:

linux-next: manual merge of the usb tree with Linus' tree

2013-01-20 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 1ee0a224bc9a ("USB: io_ti: Fix NULL dereference in chase_port()") from Linus' tree and commit f40d781554ef ("USB: io_ti: kill custom closing_wait implementation") from the usb tree. I

linux-next: manual merge of the usb tree with Linus' tree

2013-01-20 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 1ee0a224bc9a (USB: io_ti: Fix NULL dereference in chase_port()) from Linus' tree and commit f40d781554ef (USB: io_ti: kill custom closing_wait implementation) from the usb tree. I fixed