Merge 6.2-rc7 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2023 07:33:30 +0000 (08:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2023 07:33:30 +0000 (08:33 +0100)
commit924fb3ec50f5156d21e4f484358fb36f75b91ca8
treef36b768432fe7f7c07b28857533e1bfe16006abe
parent4f6dfc2136fb2e8dc3f571a5caff6b6e88281fc0
parent4ec5183ec48656cec489c49f989c508b68b518e3
Merge 6.2-rc7 into usb-next

We need the USB fixes in here, and this resolves a merge conflict with
the i915 driver as reported in linux-next

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/gpu/drm/i915/gt/intel_execlists_submission.c
drivers/usb/fotg210/fotg210-udc.c
drivers/usb/gadget/function/f_fs.c
drivers/usb/gadget/udc/bcm63xx_udc.c
drivers/usb/gadget/udc/fusb300_udc.c
drivers/usb/typec/ucsi/ucsi.c