lkml.org 
[lkml]   [2012]   [Apr]   [24]   [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 Tue, Apr 24, 2012 at 02:48:20PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/line6/driver.c between commit 2b8dec323d34 ("USB:
> driver.c: remove err() usage") from the usb tree and commit c46b8a6567fb
> ("Staging: line6: only allocate a buffer if it is needed") (and later)
> from the staging tree.
>
> The latter supercedes the former, so I used that.

Thanks, that is correct.

greg k-h


\
 
 \ /
  Last update: 2012-04-24 16:47    [W:0.031 / U:0.888 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site