Re: linux-next: manual merge of the usb tree with the usb.current tree

[Greg KH]

On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/Kconfig between commit cd6e245a2d06 ("usb: Remove
> references to non-existent PLAT_S5P symbol") from the usb.current tree
> and commit dd3cf17488b1 ("usb: host: Remove optional dependencies on
> PLAT_S5P") from the usb tree.
> 
> I fixed it up (I used the usb tree version) and can carry the fix as
> necessary (no action is required).

That's the correct fix, thanks for doing that.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/