Searched hist:"8 bd6b8c4" (Results 1 – 1 of 1) sorted by relevance
| /openbmc/linux/drivers/usb/dwc3/ |
| H A D | core.c | 8bd6b8c4 Tue Apr 26 00:27:39 CDT 2022 Stephen Rothwell <sfr@canb.auug.org.au> USB: fixup for merge issue with "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"
Today's linux-next merge of the extcon tree got a conflict in:
drivers/usb/dwc3/drd.c
between commit:
0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral if extcon is present")
from the usb tree and commit:
88490c7f43c4 ("extcon: Fix extcon_get_extcon_dev() error handling")
from the extcon tree.
I fixed it up (the former moved the code modified by the latter, so I
used the former version of this files and added the following merge fix
patch) and can carry the fix as necessary.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20220426152739.62f6836e@canb.auug.org.au
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|