linux-kernel - Re: linux-next: manual merge of the usb tree with the driver-core 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: <20130128104615.GA28698@arwen.pp.htv.fi>
Date:	Mon, 28 Jan 2013 12:46:15 +0200
From:	Felipe Balbi <balbi@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Greg KH <greg@...ah.com>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>,
	Thierry Reding <thierry.reding@...onic-design.de>,
	Kishon Vijay Abraham I <kishon@...com>,
	Felipe Balbi <balbi@...com>
Subject: Re: linux-next: manual merge of the usb tree with the driver-core
 tree

On Mon, Jan 28, 2013 at 09:35:35PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/phy/omap-usb2.c between commit 148e11349b0c ("usb: Convert to
> devm_ioremap_resource()") from the  tree and commit ca784be36cc7 ("usb:
> start using the control module driver") from the usb tree.
> 
> I fixed it up (I wasn't sure how, so I effectively dropped the former
> change) and can carry the fix as necessary (no action is required).

thank you ;-)

-- 
balbi

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