Re: linux-next: manual merge of the akpm tree with the usb-gadgettree

From: Stephen Rothwell
Date: Tue Mar 19 2013 - 03:40:03 EST

Hi Felipe,

On Tue, 19 Mar 2013 08:33:34 +0200 Felipe Balbi <balbi@xxxxxx> 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.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature