linux-kernel - Re: linux-next: manual merge of the gen-gpio tree with the usb 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: <20130417063736.GA10582@arwen.pp.htv.fi>
Date:	Wed, 17 Apr 2013 09:37:36 +0300
From:	Felipe Balbi <balbi@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Alexandre Courbot <gnurou@...il.com>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>, Felipe Balbi <balbi@...com>,
	Greg KH <greg@...ah.com>
Subject: Re: linux-next: manual merge of the gen-gpio tree with the usb tree

Hi,

On Wed, Apr 17, 2013 at 03:47:15PM +1000, Stephen Rothwell wrote:
> Hi Alexandre,
> 
> Today's linux-next merge of the gen-gpio tree got a conflict in
> drivers/usb/otg/Kconfig between commit a0e631235a04 ("usb: phy: move all
> PHY drivers to drivers/usb/phy/") from the usb tree and commit
> 76ec9d18b897 ("Convert selectors of GENERIC_GPIO to GPIOLIB") from the
> gen-gpio tree.
> 
> The former patch removed the file, so I did that and then applied the
> following patch and can carry the fix as necessary (no action is
> required).

Thanks Stephen, looks alright :-)

-- 
balbi

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