On Wed, Sep 04, 2019 at 08:09:29PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> drivers/usb/roles/intel-xhci-usb-role-switch.c
>
> between commit:
>
> d2a90ebb6553 ("usb: roles: intel_xhci: Supplying software node for the role mux")
>
> from the pm tree and commit:
>
> 2be1fb64dfeb ("usb: roles: intel: Enable static DRD mode for role switch")
>
> from the usb tree.
Ick, sorry about that, merge looks good to me, thanks!
greg k-h
