lkml.org 
[lkml]   [2012]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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


\
 
 \ /
  Last update: 2012-09-19 10:01    [W:0.026 / U:0.864 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site