lkml.org 
[lkml]   [2013]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the akpm tree with the usb-gadget tree
Hi Felipe,

On Tue, 19 Mar 2013 08:33:34 +0200 Felipe Balbi <balbi@ti.com> wrote:
>
> On Tue, Mar 19, 2013 at 02:39:22PM +1100, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the akpm tree got a conflict in
> > drivers/usb/gadget/amd5536udc.c between commit 6c39d90393a2 ("usb:
> > gadget: amd5536udc: remove unnecessary initializations") from the tree
>
> Looks like there's a small bug in your scripts: "from the tree" misses
> "usb-gadget".

Yeah, that's one of the bits I have to fill in manually and sometimes I
forget - at least this time I got the Subject right.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-03-19 09:01    [W:0.042 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site