Messages in this thread | | | Date | Wed, 19 Sep 2012 08:18:00 +0100 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the usb tree |
| |
On Wed, Sep 19, 2012 at 02:35:05PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/serqt_usb2/serqt_usb2.c between commit e8656b02ef35 > ("USB: serial: serqt_usb2: remove dbg() usage") from the usb tree and > commit 623c2bb2c59a ("staging: serqt_usb2: fix dbg print when kzalloc > failed to allocate qt_port") from the staging tree. > > The former removes the line changed by the latter, so I just did that (no > action is required).
That looks correct, thanks for doing this.
greg k-h
| |