Merge 6.2-rc7 into usb-next

Browse source

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>

...

This commit is contained in:

Greg Kroah-Hartman 2023-02-06 08:33:30 +01:00

parent 4f6dfc2136 4ec5183ec4

commit 924fb3ec50

490 changed files with 4370 additions and 2189 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

2

.mailmap

View file

15

CREDITS

View file

15

Documentation/admin-guide/cgroup-v2.rst

View file

4

Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml

View file

21

Documentation/devicetree/bindings/regulator/samsung,s2mps14.yaml

View file

2

Documentation/devicetree/bindings/riscv/cpus.yaml

View file

2

Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml

View file

0

Documentation/devicetree/bindings/sound/everest,es8326.yaml Executable file →

View file

2

Documentation/networking/bridge.rst

View file

2

Documentation/networking/device_drivers/ethernet/intel/ice.rst

View file

10

Documentation/networking/nf_conntrack-sysctl.rst

View file

10

Documentation/virt/kvm/api.rst

View file

36

Documentation/x86/amd-memory-encryption.rst

View file

38

MAINTAINERS

View file

2

Makefile

View file

2

arch/arm/Makefile

View file

2

arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts

View file

3

arch/arm/boot/dts/imx7d-smegw01.dts

View file

1

arch/arm/boot/dts/nuvoton-wpcm450.dtsi

View file

7

arch/arm/crypto/Makefile

View file

2

arch/arm/mm/nommu.c

View file

1

arch/arm/mm/proc-macros.S

View file

2

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

View file

1

arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc.dts

View file

2

arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h

View file

1

arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x-rs232-rts.dtso

View file

1

arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtso

View file

1

arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi

View file

3

arch/arm64/boot/dts/freescale/imx8mm-venice-gw7901.dts

View file

3

arch/arm64/boot/dts/freescale/imx8mm-venice-gw7902.dts

View file

1

arch/arm64/boot/dts/freescale/imx8mm-venice-gw7903.dts

View file

1

arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi

View file

1

arch/arm64/boot/dts/freescale/imx8mn-venice-gw7902.dts

View file

1

arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts

View file

9

arch/arm64/include/asm/efi.h

View file

15

arch/arm64/include/asm/stacktrace.h

View file

6

arch/arm64/kernel/efi-rt-wrapper.S

View file

3

arch/arm64/kernel/efi.c

View file

12

arch/arm64/kernel/stacktrace.c

View file

2

arch/arm64/kvm/guest.c

View file

13

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

View file

29

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

View file

8

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

View file

15

arch/arm64/kvm/vgic/vgic.h

View file

7

arch/ia64/kernel/sys_ia64.c

View file

5

arch/parisc/kernel/firmware.c

View file

21

arch/parisc/kernel/ptrace.c

View file

2

arch/powerpc/include/asm/book3s/64/tlbflush.h

View file

43

arch/powerpc/include/asm/hw_irq.h

View file

2

arch/powerpc/kernel/dbell.c

View file

3

arch/powerpc/kernel/head_85xx.S

View file

2

arch/powerpc/kernel/irq.c

View file

2

arch/powerpc/kernel/time.c

View file

11

arch/powerpc/kexec/file_load_64.c

View file

5

arch/powerpc/kvm/booke.c

View file

24

arch/powerpc/mm/book3s64/radix_pgtable.c

View file

14

arch/powerpc/perf/imc-pmu.c

View file

3

arch/riscv/Makefile

View file

2

arch/riscv/include/asm/alternative-macros.h

View file

3

arch/riscv/include/asm/hwcap.h

View file

28

arch/riscv/include/asm/vdso/processor.h

View file

2

arch/riscv/kernel/head.S

View file

18

arch/riscv/kernel/probes/kprobes.c

View file

4

arch/riscv/kernel/probes/simulate-insn.c

View file

3

arch/riscv/kernel/smpboot.c

View file

2

arch/s390/boot/decompressor.c

View file

1

arch/sh/kernel/vmlinux.lds.S

View file

2

arch/x86/Makefile

View file

6

arch/x86/boot/compressed/ident_map_64.c

View file

2

arch/x86/boot/compressed/misc.h

View file

70

arch/x86/boot/compressed/sev.c

View file

1

arch/x86/events/intel/core.c

View file

1

arch/x86/events/intel/cstate.c

View file

8

arch/x86/include/asm/acpi.h

View file

26

arch/x86/include/asm/debugreg.h

View file

20

arch/x86/include/asm/msr-index.h

View file

6

arch/x86/include/uapi/asm/svm.h

View file

9

arch/x86/kernel/cpu/aperfmperf.c

View file

1

arch/x86/kernel/i8259.c

View file

4

arch/x86/kernel/irqinit.c

View file

21

arch/x86/kvm/vmx/vmx.c

View file

2

arch/x86/pci/xen.c

View file

2

block/bfq-cgroup.c

View file

4

block/bfq-iosched.c

View file

4

block/blk-cgroup.c

View file

5

block/blk-mq.c

View file

4

certs/Makefile

View file

6

drivers/acpi/sleep.c

View file

49

drivers/acpi/video_detect.c

View file

2

drivers/ata/libata-core.c

View file

9

drivers/block/ublk_drv.c

View file

8

drivers/bus/sunxi-rsb.c

View file

1

drivers/cxl/acpi.c

View file

44

drivers/cxl/core/pmem.c

View file

7

drivers/cxl/pci.c

View file

24

drivers/cxl/pmem.c

View file

2

drivers/dma-buf/dma-fence.c

View file

15

drivers/edac/edac_device.c

View file

5

drivers/edac/qcom_edac.c

View file

4

drivers/firewire/core-cdev.c

View file

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