Merge 5.11-rc3 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Jan 2021 07:11:26 +0000 (08:11 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Jan 2021 07:11:26 +0000 (08:11 +0100)
commita66a7d48f34a253429999dcc7188f607cd7a206a
treec8f135f000b000f59dd171eb51b850d9374f8f9c
parent841081d89d5adf96759f2df50185de950f5d8694
parent7c53f6b671f4aba70ff15e1b05148b10d58c2837
Merge 5.11-rc3 into usb-next

Resolves a merge issue in:
drivers/usb/dwc3/gadget.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/core.h
drivers/usb/dwc3/gadget.c
drivers/usb/gadget/composite.c
drivers/usb/gadget/configfs.c
drivers/usb/gadget/function/f_printer.c