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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20130319183946.cbec2469b421909f8a5d7695@canb.auug.org.au>
Date:	Tue, 19 Mar 2013 18:39:46 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	<balbi@...com>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Xi Wang <xi.wang@...il.com>
Subject: Re: 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@...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@...b.auug.org.au

Content of type "application/pgp-signature" skipped