Merge 6.4-rc4 into usb-next

Browse source

We need the USB fixes in here and this resolves merge conflicts in:
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/udc/core.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Greg Kroah-Hartman 2023-05-28 15:25:53 +01:00

parent 19b3cf44e1 7877cb91f1

commit 7e530d32a3

1168 changed files with 119450 additions and 115141 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

.mailmap

View file

4

CREDITS

View file

4

Documentation/admin-guide/cifs/changes.rst

View file

8

Documentation/admin-guide/cifs/usage.rst

View file

49

Documentation/admin-guide/quickly-build-trimmed-linux.rst

View file

1

Documentation/block/index.rst

View file

99

Documentation/block/request.rst

View file

6

Documentation/cdrom/index.rst

View file

2

Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml

View file

12

Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml

View file

6

Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml

View file

1

Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml

View file

19

Documentation/devicetree/bindings/net/can/st,stm32-bxcan.yaml

View file

13

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-common.yaml

View file

38

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml

View file

77

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml

View file

6

Documentation/devicetree/bindings/sound/tas2562.yaml

View file

6

Documentation/devicetree/bindings/sound/tas2770.yaml

View file

6

Documentation/devicetree/bindings/sound/tas27xx.yaml

View file

2

Documentation/devicetree/bindings/sound/tlv320aic32x4.txt

View file

2

Documentation/devicetree/bindings/usb/cdns,usb3.yaml

View file

2

Documentation/filesystems/index.rst

View file

3

Documentation/filesystems/ramfs-rootfs-initramfs.rst

View file

4

Documentation/filesystems/sharedsubtree.rst

View file

2

Documentation/filesystems/cifs/cifsroot.rst → Documentation/filesystems/smb/cifsroot.rst

View file

0

Documentation/filesystems/cifs/index.rst → Documentation/filesystems/smb/index.rst

View file

0

Documentation/filesystems/cifs/ksmbd.rst → Documentation/filesystems/smb/ksmbd.rst

View file

2

Documentation/fpga/index.rst

View file

2

Documentation/locking/index.rst

View file

4

Documentation/netlink/specs/handshake.yaml

View file

9

Documentation/networking/bonding.rst

View file

2

Documentation/networking/index.rst

View file

5

Documentation/networking/tls-handshake.rst

View file

3

Documentation/networking/x25-iface.rst

View file

2

Documentation/pcmcia/index.rst

View file

33

Documentation/process/maintainer-netdev.rst

View file

1

Documentation/s390/vfio-ap.rst

View file

2

Documentation/staging/crc32.rst

View file

2

Documentation/timers/index.rst

View file

2

Documentation/userspace-api/ioctl/ioctl-number.rst

View file

2297

MAINTAINERS

View file

File diff suppressed because it is too large Load diff

2

Makefile

View file

1

arch/arm/boot/dts/imx6qdl-mba6.dtsi

View file

7

arch/arm/boot/dts/imx6ull-dhcor-som.dtsi

View file

1

arch/arm/boot/dts/stm32f429.dtsi

View file

82

arch/arm/boot/dts/stm32f7-pinctrl.dtsi

View file

1

arch/arm/boot/dts/vexpress-v2p-ca5s.dts

View file

6

arch/arm/include/asm/arm_pmuv3.h

View file

25

arch/arm/kernel/unwind.c

View file

5

arch/arm/mach-sa1100/jornada720_ssp.c

View file

7

arch/arm/vfp/entry.S

View file

6

arch/arm/vfp/vfphw.S

View file

1

arch/arm64/boot/dts/arm/foundation-v8.dtsi

View file

1

arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts

View file

1

arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts

View file

1

arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi

View file

8

arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi

View file

28

arch/arm64/boot/dts/freescale/imx8mn.dtsi

View file

25

arch/arm64/boot/dts/freescale/imx8mp.dtsi

View file

6

arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi

View file

3

arch/arm64/boot/dts/freescale/imx8x-colibri-iris.dtsi

View file

14

arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi

View file

6

arch/arm64/include/asm/arm_pmuv3.h

View file

8

arch/arm64/include/asm/cputype.h

View file

1

arch/arm64/include/asm/kvm_pgtable.h

View file

7

arch/arm64/kernel/mte.c

View file

2

arch/arm64/kernel/vdso.c

View file

26

arch/arm64/kvm/fpsimd.c

View file

12

arch/arm64/kvm/hyp/include/hyp/switch.h

View file

41

arch/arm64/kvm/hyp/pgtable.c

View file

2

arch/arm64/kvm/inject_fault.c

View file

4

arch/arm64/kvm/vgic/vgic-v3.c

View file

7

arch/arm64/kvm/vmid.c

View file

5

arch/arm64/mm/copypage.c

View file

4

arch/arm64/mm/fault.c

View file

14

arch/m68k/kernel/signal.c

View file

1

arch/mips/Kconfig

View file

27

arch/mips/alchemy/common/dbdma.c

View file

5

arch/mips/kernel/cpu-probe.c

View file

9

arch/mips/kernel/setup.c

View file

4

arch/parisc/Kconfig

View file

11

arch/parisc/Kconfig.debug

View file

4

arch/parisc/include/asm/cacheflush.h

View file

8

arch/parisc/include/asm/pgtable.h

View file

39

arch/parisc/include/asm/spinlock.h

View file

8

arch/parisc/include/asm/spinlock_types.h

View file

2

arch/parisc/kernel/alternative.c

View file

5

arch/parisc/kernel/cache.c

View file

2

arch/parisc/kernel/kexec.c

View file

18

arch/parisc/kernel/pci-dma.c

View file

11

arch/parisc/kernel/process.c

View file

18

arch/parisc/kernel/traps.c

View file

6

arch/powerpc/Kconfig

View file

6

arch/powerpc/boot/Makefile

View file

2

arch/powerpc/crypto/Kconfig

View file

5

arch/powerpc/include/asm/iommu.h

View file

4

arch/powerpc/kernel/dma-iommu.c

View file

28

arch/powerpc/kernel/iommu.c

View file

5

arch/powerpc/kernel/isa-bridge.c

View file

4

arch/powerpc/mm/book3s64/radix_pgtable.c

View file

Some files were not shown because too many files have changed in this diff Show more