Re: linux-next: manual merge of the gen-gpio tree with the usb tree

[Felipe Balbi]

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

Attachment: signature.asc
Description: Digital signature