Merge 5.19-rc7 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Jul 2022 20:41:42 +0000 (22:41 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Jul 2022 20:41:42 +0000 (22:41 +0200)
We need the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/usb/dwc3/gadget.c
drivers/usb/typec/class.c

diff --cc MAINTAINERS
index d5cdf81ea2c0e359a00e46b167e0a7bd9c9589b4,651616ed8ae25e8e790915721d86c6404cb171fa..1d254110c3546f7f5f9119f439cd723a8baebd4c
@@@ -17223,9 -17278,11 +17293,12 @@@ M: Daire McNamara <daire.mcnamara@micro
  L:    linux-riscv@lists.infradead.org
  S:    Supported
  F:    arch/riscv/boot/dts/microchip/
+ F:    drivers/char/hw_random/mpfs-rng.c
+ F:    drivers/clk/microchip/clk-mpfs.c
  F:    drivers/mailbox/mailbox-mpfs.c
+ F:    drivers/pci/controller/pcie-microchip-host.c
  F:    drivers/soc/microchip/
 +F:    drivers/usb/musb/mpfs.c
  F:    include/soc/microchip/mpfs.h
  
  RNBD BLOCK DRIVERS
Simple merge
Simple merge