lkml.org 
[lkml]   [2013]   [Jun]   [18]   [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, Jun 18, 2013 at 02:55:59PM +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 1143832eca8f
> ("USB: serial: ports: add minor and port number") from the usb tree and
> commit d68edc2881b1 ("staging: serqt_usb2: Fixed coding style
> CamelCases") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix looks fine, thanks.

greg k-h


\
 
 \ /
  Last update: 2013-06-18 18:41    [W:0.029 / U:0.372 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site