linux-kernel - Re: [GIT PULL] USB changes for v3.17

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: <20140721210650.GD23155@saruman.home>
Date:	Mon, 21 Jul 2014 16:06:50 -0500
From:	Felipe Balbi <balbi@...com>
To:	Greg KH <gregkh@...uxfoundation.org>
CC:	Felipe Balbi <balbi@...com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux USB Mailing List <linux-usb@...r.kernel.org>
Subject: Re: [GIT PULL] USB changes for v3.17

On Mon, Jul 21, 2014 at 11:34:50AM -0700, Greg KH wrote:
> On Mon, Jul 21, 2014 at 10:35:29AM -0500, Felipe Balbi wrote:
> > Hi Greg,
> > 
> > Here's my big set of patches containing 97 commits. While it looks big and
> > all, most commits are just cleanups moving code around, using devm_*, etc.
> > 
> > I tested these patches on a couple TI platforms and couldn't find any regressions
> > on my setup.
> > 
> > This tree has also been on linux-next for a while.
> > 
> > Please consider merging on top of your usb-next branch or let me know if you
> > want anything to change.
> > 
> > cheers
> > 
> > The following changes since commit 4c834452aad01531db949414f94f817a86348d59:
> > 
> >   Linux 3.16-rc3 (2014-06-29 14:11:36 -0700)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/usb-for-v3.17
> 
> I've now merged and pushed this out.  I did have some merge conflicts in
> these files:
> 	drivers/usb/musb/musb_core.c
> 	drivers/usb/musb/musb_cppi41.c
> 	include/uapi/linux/usb/functionfs.h
> 
> and I _think_ I resolved them properly, but getting verification of this
> would be great.

your resolution looks correct to me, thank you.

-- 
balbi

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)