Conflicts were all overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | Documentation/admin-guide/device-mapper/dm-integrity.rst | 15 | |
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/Makefile | 21 | |
| -rw-r--r-- | Documentation/devicetree/bindings/dma/socionext,uniphier-xdmac.yaml | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/st,stpmic1.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/mps,mp5416.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/renesas,usb3-peri.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/renesas,usbhs.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/usb-xhci.txt | 3 | |
| -rw-r--r-- | Documentation/filesystems/debugfs.rst | 4 | |
| -rw-r--r-- | Documentation/networking/devlink/ice.rst | 4 | |
| -rw-r--r-- | MAINTAINERS | 19 | |
| -rw-r--r-- | Makefile | 2 | |
| -rw-r--r-- | arch/arm/crypto/chacha-glue.c | 14 | |
| -rw-r--r-- | arch/arm/crypto/nhpoly1305-neon-glue.c | 2 | |
| -rw-r--r-- | arch/arm/crypto/poly1305-glue.c | 15 | |
| -rw-r--r-- | arch/arm64/crypto/chacha-neon-glue.c | 14 | |
| -rw-r--r-- | arch/arm64/crypto/nhpoly1305-neon-glue.c | 2 | |
| -rw-r--r-- | arch/arm64/crypto/poly1305-glue.c | 15 | |
| -rw-r--r-- | arch/arm64/kernel/vdso/Makefile | 2 | |
| -rw-r--r-- | arch/powerpc/kernel/entry_32.S | 2 | |
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 2 | |
| -rw-r--r-- | arch/powerpc/mm/nohash/8xx.c | 3 | |
| -rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 2 | |
| -rw-r--r-- | arch/riscv/Kconfig | 2 | |
| -rw-r--r-- | arch/riscv/kernel/sbi.c | 17 | |
| -rw-r--r-- | arch/riscv/kernel/stacktrace.c | 4 | |
| -rw-r--r-- | arch/riscv/kernel/vdso/Makefile | 6 | |
| -rw-r--r-- | arch/s390/boot/uv.c | 2 | |
| -rw-r--r-- | arch/s390/kernel/diag.c | 2 | |
| -rw-r--r-- | arch/s390/kernel/smp.c | 4 | |
| -rw-r--r-- | arch/s390/kernel/trace.c | 2 | |
| -rw-r--r-- | arch/s390/kernel/uv.c | 3 | |
| -rw-r--r-- | arch/s390/lib/uaccess.c | 4 | |
| -rw-r--r-- | arch/s390/mm/pgalloc.c | 16 | |
| -rw-r--r-- | arch/s390/pci/pci_irq.c | 5 | |
| -rw-r--r-- | arch/x86/crypto/blake2s-glue.c | 10 | |
| -rw-r--r-- | arch/x86/crypto/chacha_glue.c | 14 | |
| -rw-r--r-- | arch/x86/crypto/nhpoly1305-avx2-glue.c | 2 | |
| -rw-r--r-- | arch/x86/crypto/nhpoly1305-sse2-glue.c | 2 | |
| -rw-r--r-- | arch/x86/crypto/poly1305_glue.c | 13 | |
| -rw-r--r-- | arch/x86/hyperv/hv_init.c | 12 | |
| -rw-r--r-- | arch/x86/include/asm/mshyperv.h | 2 | |
| -rw-r--r-- | block/partitions/core.c | 2 | |
| -rw-r--r-- | drivers/acpi/device_pm.c | 4 | |
| -rw-r--r-- | drivers/base/firmware_loader/fallback_table.c | 1 | |
| -rw-r--r-- | drivers/block/virtio_blk.c | 86 | |
| -rw-r--r-- | drivers/counter/104-quad-8.c | 194 | |
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 2 | |
| -rw-r--r-- | drivers/crypto/caam/caamalg.c | 10 | |
| -rw-r--r-- | drivers/crypto/caam/caamhash.c | 8 | |
| -rw-r--r-- | drivers/crypto/caam/caampkc.c | 8 | |
| -rw-r--r-- | drivers/crypto/chelsio/chcr_ktls.c | 83 | |
| -rw-r--r-- | drivers/dma-buf/dma-buf.c | 7 | |
| -rw-r--r-- | drivers/dma/Kconfig | 3 | |
| -rw-r--r-- | drivers/dma/dmaengine.c | 60 | |
| -rw-r--r-- | drivers/dma/dmatest.c | 6 | |
| -rw-r--r-- | drivers/dma/mmp_tdma.c | 5 | |
| -rw-r--r-- | drivers/dma/pch_dma.c | 2 | |
| -rw-r--r-- | drivers/dma/tegra20-apb-dma.c | 9 | |
| -rw-r--r-- | drivers/dma/ti/k3-psil.c | 1 | |
| -rw-r--r-- | drivers/dma/xilinx/xilinx_dma.c | 20 | |
| -rw-r--r-- | drivers/firmware/imx/Kconfig | 4 | |
| -rw-r--r-- | drivers/fpga/dfl-pci.c | 6 | |
| -rw-r--r-- | drivers/fpga/zynq-fpga.c | 3 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/navi10_sdma_pkt_open.h | 16 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 14 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 38 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 27 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 40 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 1 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 10 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 1 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 15 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 20 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 14 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 3 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 1 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.h | 3 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 4 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 77 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 16 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 1 | |
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 9 | |
| -rw-r--r-- | drivers/gpu/drm/drm_dp_mst_topology.c | 8 | |
| -rw-r--r-- | drivers/gpu/drm/drm_edid.c | 2 | |
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 20 | |
| -rw-r--r-- | drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 12 | |
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_timeline.c | 2 | |
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 6 | |
| -rw-r--r-- | drivers/gpu/drm/i915/i915_vma.c | 10 | |
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_cmd.c | 10 | |
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_display.c | 6 | |
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_draw.c | 7 | |
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_image.c | 3 | |
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_ioctl.c | 5 | |
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_kms.c | 17 | |
| -rw-r--r-- | drivers/hid/Kconfig | 1 | |
| -rw-r--r-- | drivers/hid/hid-alps.c | 1 | |
| -rw-r--r-- | drivers/hid/hid-ids.h | 8 | |
| -rw-r--r-- | drivers/hid/hid-lg-g15.c | 4 | |
| -rw-r--r-- | drivers/hid/hid-multitouch.c | 3 | |
| -rw-r--r-- | drivers/hid/hid-quirks.c | 1 | |
| -rw-r--r-- | drivers/hid/i2c-hid/i2c-hid-core.c | 2 | |
| -rw-r--r-- | drivers/hid/usbhid/hid-core.c | 37 | |
| -rw-r--r-- | drivers/hid/usbhid/usbhid.h | 1 | |
| -rw-r--r-- | drivers/hid/wacom_sys.c | 4 | |
| -rw-r--r-- | drivers/hid/wacom_wac.c | 88 | |
| -rw-r--r-- | drivers/hv/hv.c | 6 | |
| -rw-r--r-- | drivers/hv/hv_trace.h | 4 | |
| -rw-r--r-- | drivers/hv/vmbus_drv.c | 43 | |
| -rw-r--r-- | drivers/i2c/busses/i2c-amd-mp2-pci.c | 2 | |
| -rw-r--r-- | drivers/i2c/busses/i2c-aspeed.c | 5 | |
| -rw-r--r-- | drivers/i2c/busses/i2c-bcm-iproc.c | 3 | |
| -rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 36 | |
| -rw-r--r-- | drivers/iio/adc/ad7192.c | 63 | |
| -rw-r--r-- | drivers/iio/adc/ad7793.c | 2 | |
| -rw-r--r-- | drivers/iio/adc/stm32-adc.c | 31 | |
| -rw-r--r-- | drivers/iio/adc/ti-ads8344.c | 6 | |
| -rw-r--r-- | drivers/iio/adc/xilinx-xadc-core.c | 95 | |
| -rw-r--r-- | drivers/iio/common/st_sensors/st_sensors_core.c | 2 | |
| -rw-r--r-- | drivers/iio/dac/ad5770r.c | 2 | |
| -rw-r--r-- | drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 11 | |
| -rw-r--r-- | drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 3 | |
| -rw-r--r-- | drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 23 | |
| -rw-r--r-- | drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 24 | |
| -rw-r--r-- | drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 29 | |
| -rw-r--r-- | drivers/iio/industrialio-core.c | 7 | |
| -rw-r--r-- | drivers/infiniband/core/cm.c | 26 | |
| -rw-r--r-- | drivers/infiniband/core/rdma_core.c |
