Merge tag 'iommu-updates-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

Pull iommu updates from Joerg Roedel:

 - remove the bus_set_iommu() interface which became unnecesary because
   of IOMMU per-device probing

 - make the dma-iommu.h header private

 - Intel VT-d changes from Lu Baolu:
	  - Decouple PASID and PRI from SVA
	  - Add ESRTPS & ESIRTPS capability check
	  - Cleanups

 - Apple DART support for the M1 Pro/MAX SOCs

 - support for AMD IOMMUv2 page-tables for the DMA-API layer.

   The v2 page-tables are compatible with the x86 CPU page-tables. Using
   them for DMA-API prepares support for hardware-assisted IOMMU
   virtualization

 - support for MT6795 Helio X10 M4Us in the Mediatek IOMMU driver

 - some smaller fixes and cleanups

* tag 'iommu-updates-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (59 commits)
  iommu/vt-d: Avoid unnecessary global DMA cache invalidation
  iommu/vt-d: Avoid unnecessary global IRTE cache invalidation
  iommu/vt-d: Rename cap_5lp_support to cap_fl5lp_support
  iommu/vt-d: Remove pasid_set_eafe()
  iommu/vt-d: Decouple PASID & PRI enabling from SVA
  iommu/vt-d: Remove unnecessary SVA data accesses in page fault path
  dt-bindings: iommu: arm,smmu-v3: Relax order of interrupt names
  iommu: dart: Support t6000 variant
  iommu/io-pgtable-dart: Add DART PTE support for t6000
  iommu/io-pgtable: Add DART subpage protection support
  iommu/io-pgtable: Move Apple DART support to its own file
  iommu/mediatek: Add support for MT6795 Helio X10 M4Us
  iommu/mediatek: Introduce new flag TF_PORT_TO_ADDR_MT8173
  dt-bindings: mediatek: Add bindings for MT6795 M4U
  iommu/iova: Fix module config properly
  iommu/amd: Fix sparse warning
  iommu/amd: Remove outdated comment
  iommu/amd: Free domain ID after domain_flush_pages
  iommu/amd: Free domain id in error path
  iommu/virtio: Fix compile error with viommu_capable()
  ...

diff --combined Documentation/admin-guide/kernel-parameters.txt
index b2413342b3090383dcefe81229791452bb0df7af,f45c8fc2056c204de3de62452c7d784e8fab3d00..1b3565b61b653f301a80b8cc8069a1b95916decf
--- 1/Documentation/admin-guide/kernel-parameters.txt
--- 2/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -321,6 -321,8 +321,8 @@@
                        force_enable - Force enable the IOMMU on platforms known
                                       to be buggy with IOMMU enabled. Use this
                                       option with care.
+                       pgtbl_v1     - Use v1 page table for DMA-API (Default).
+                       pgtbl_v2     - Use v2 page table for DMA-API.
  
        amd_iommu_dump= [HW,X86-64]
                        Enable AMD IOMMU driver option to dump the ACPI table
@@@ -966,6 -968,10 +968,6 @@@
  
        debugpat        [X86] Enable PAT debugging
  
 -      decnet.addr=    [HW,NET]
 -                      Format: <area>[,<node>]
 -                      See also Documentation/networking/decnet.rst.
 -
        default_hugepagesz=
                        [HW] The size of the default HugeTLB page. This is
                        the size represented by the legacy /proc/ hugepages
@@@ -2432,12 -2438,6 +2434,12 @@@
                        0: force disabled
                        1: force enabled
  
 +      kunit.enable=   [KUNIT] Enable executing KUnit tests. Requires
 +                      CONFIG_KUNIT to be set to be fully enabled. The
 +                      default value can be overridden via
 +                      KUNIT_DEFAULT_ENABLED.
 +                      Default is 1 (enabled)
 +
        kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs.
                        Default is 0 (don't ignore, but inject #GP)
  
@@@ -3209,7 -3209,6 +3211,7 @@@
                                               spectre_v2_user=off [X86]
                                               spec_store_bypass_disable=off [X86,PPC]
                                               ssbd=force-off [ARM64]
 +                                             nospectre_bhb [ARM64]
                                               l1tf=off [X86]
                                               mds=off [X86]
                                               tsx_async_abort=off [X86]
@@@ -3616,7 -3615,7 +3618,7 @@@
  
        nohugeiomap     [KNL,X86,PPC,ARM64] Disable kernel huge I/O mappings.
  
 -      nohugevmalloc   [PPC] Disable kernel huge vmalloc mappings.
 +      nohugevmalloc   [KNL,X86,PPC,ARM64] Disable kernel huge vmalloc mappings.
  
        nosmt           [KNL,S390] Disable symmetric multithreading (SMT).
                        Equivalent to smt=1.
@@@ -3629,15 -3628,11 +3631,15 @@@
                        (bounds check bypass). With this option data leaks are
                        possible in the system.
  
 -      nospectre_v2    [X86,PPC_FSL_BOOK3E,ARM64] Disable all mitigations for
 +      nospectre_v2    [X86,PPC_E500,ARM64] Disable all mitigations for
                        the Spectre variant 2 (indirect branch prediction)
                        vulnerability. System may allow data leaks with this
                        option.
  
 +      nospectre_bhb   [ARM64] Disable all mitigations for Spectre-BHB (branch
 +                      history injection) vulnerability. System may allow data leaks
 +                      with this option.
 +
        nospec_store_bypass_disable
                        [HW] Disable all mitigations for the Speculative Store Bypass vulnerability
  
@@@ -3748,9 -3743,9 +3750,9 @@@
                        [X86,PV_OPS] Disable paravirtualized VMware scheduler
                        clock and use the default one.
  
 -      no-steal-acc    [X86,PV_OPS,ARM64] Disable paravirtualized steal time
 -                      accounting. steal time is computed, but won't
 -                      influence scheduler behaviour
 +      no-steal-acc    [X86,PV_OPS,ARM64,PPC/PSERIES] Disable paravirtualized
 +                      steal time accounting. steal time is computed, but
 +                      won't influence scheduler behaviour
  
        nolapic         [X86-32,APIC] Do not enable or use the local APIC.
  
@@@ -3812,10 -3807,6 +3814,10 @@@
  
        nox2apic        [X86-64,APIC] Do not enable x2APIC mode.
  
 +                      NOTE: this parameter will be ignored on systems with the
 +                      LEGACY_XAPIC_DISABLED bit set in the
 +                      IA32_XAPIC_DISABLE_STATUS MSR.
 +
        nps_mtm_hs_ctr= [KNL,ARC]
                        This parameter sets the maximum duration, in
                        cycles, each HW thread of the CTOP can run

diff --combined MAINTAINERS
index 01169f29097ee703d15e033d9f63fad711ea5012,6b7d889186fbcbb3afaa3c82412658fe5b1cd94c..4157710d6f8d45567202553f786dbca532071161
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -348,6 -348,7 +348,6 @@@ M: "Rafael J. Wysocki" <[email protected]
  R:    Len Brown <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://01.org/linux-acpi
  Q:    https://patchwork.kernel.org/project/linux-acpi/list/
  B:    https://bugzilla.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
@@@ -426,6 -427,7 +426,6 @@@ M: Rafael J. Wysocki <[email protected]
  R:    Zhang Rui <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://01.org/linux-acpi
  B:    https://bugzilla.kernel.org
  F:    drivers/acpi/*thermal*
  
@@@ -618,7 -620,7 +618,7 @@@ ADXL367 THREE-AXIS DIGITAL ACCELEROMETE
  M:    Cosmin Tanislav <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/iio/accel/adi,adxl367.yaml
  F:    drivers/iio/accel/adxl367*
  
@@@ -748,17 -750,19 +748,17 @@@ S:      Supporte
  F:    drivers/infiniband/hw/erdma
  F:    include/uapi/rdma/erdma-abi.h
  
 +ALIBABA PMU DRIVER
 +M:    Shuai Xue <[email protected]>
 +S:    Supported
 +F:    Documentation/admin-guide/perf/alibaba_pmu.rst
 +F:    drivers/perf/alibaba_uncore_dwr_pmu.c
 +
  ALIENWARE WMI DRIVER
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/dell/alienware-wmi.c
  
 -ALL SENSORS DLH SERIES PRESSURE SENSORS DRIVER
 -M:    Tomislav Denis <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -W:    http://www.allsensors.com/
 -F:    Documentation/devicetree/bindings/iio/pressure/asc,dlhl60d.yaml
 -F:    drivers/iio/pressure/dlhl60d.c
 -
  ALLEGRO DVT VIDEO IP CORE DRIVER
  M:    Michael Tretter <[email protected]>
  R:    Pengutronix Kernel Team <[email protected]>
@@@ -817,13 -821,6 +817,13 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/staging/media/sunxi/cedrus/
  
 +ALLWINNER DMIC DRIVERS
 +M:    Ban Tao <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml
 +F:    sound/soc/sunxi/sun50i-dmic.c
 +
  ALPHA PORT
  M:    Richard Henderson <[email protected]>
  M:    Ivan Kokshaysky <[email protected]>
@@@ -882,13 -879,6 +882,13 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/altera/
  
 +ALTERA TSE PCS
 +M:    Maxime Chevallier <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/pcs/pcs-altera-tse.c
 +F:    include/linux/pcs-altera-tse.h
 +
  ALTERA UART/JTAG UART SERIAL DRIVERS
  M:    Tobias Klauser <[email protected]>
  L:    [email protected]
@@@ -1032,13 -1022,6 +1032,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/amd/pmc.c
  
 +AMD PMF DRIVER
 +M:    Shyam Sundar S K <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-amd-pmf
 +F:    drivers/platform/x86/amd/pmf/
 +
  AMD HSMP DRIVER
  M:    Naveen Krishna Chatradhi <[email protected]>
  R:    Carlos Bilbao <[email protected]>
@@@ -1062,7 -1045,6 +1062,7 @@@ L:      [email protected]
  S:    Supported
  F:    Documentation/admin-guide/pm/amd-pstate.rst
  F:    drivers/cpufreq/amd-pstate*
 +F:    include/linux/amd-pstate.h
  F:    tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
  
  AMD PTDMA DRIVER
@@@ -1170,7 -1152,7 +1170,7 @@@ ANALOG DEVICES INC AD74413R DRIVE
  M:    Cosmin Tanislav <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml
  F:    drivers/iio/addac/ad74413r.c
  F:    include/dt-bindings/iio/addac/adi,ad74413r.h
@@@ -1345,23 -1327,13 +1345,23 @@@ W:   https://ez.analog.com/linux-software
  F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
  F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
  F:    Documentation/devicetree/bindings/iio/*/adi,*
 -F:    Documentation/devicetree/bindings/iio/dac/adi,ad5758.yaml
 +F:    Documentation/devicetree/bindings/iio/adc/lltc,ltc2496.yaml
 +F:    Documentation/devicetree/bindings/iio/adc/lltc,ltc2497.yaml
  F:    drivers/iio/*/ad*
  F:    drivers/iio/adc/ltc249*
  F:    drivers/iio/amplifiers/hmc425a.c
  F:    drivers/staging/iio/*/ad*
  X:    drivers/iio/*/adjd*
  
 +ANALOG DEVICES INC MAX31760 DRIVER
 +M:    Ibrahim Tilki <[email protected]>
 +S:    Maintained
 +W:    http://wiki.analog.com/
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/hwmon/adi,max31760.yaml
 +F:    Documentation/hwmon/max31760.rst
 +F:    drivers/hwmon/max31760.c
 +
  ANALOGBITS PLL LIBRARIES
  M:    Paul Walmsley <[email protected]>
  S:    Supported
@@@ -1410,7 -1382,7 +1410,7 @@@ APEX EMBEDDED SYSTEMS STX104 IIO DRIVE
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/iio/adc/stx104.c
 +F:    drivers/iio/addac/stx104.c
  
  APM DRIVER
  M:    Jiri Kosina <[email protected]>
@@@ -1915,6 -1887,7 +1915,7 @@@ F:      drivers/dma/apple-admac.
  F:    drivers/i2c/busses/i2c-pasemi-core.c
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/iommu/apple-dart.c
+ F:    drivers/iommu/io-pgtable-dart.c
  F:    drivers/irqchip/irq-apple-aic.c
  F:    drivers/mailbox/apple-mailbox.c
  F:    drivers/nvme/host/apple.c
@@@ -1927,15 -1900,6 +1928,15 @@@ F:    include/dt-bindings/pinctrl/apple.
  F:    include/linux/apple-mailbox.h
  F:    include/linux/soc/apple/*
  
 +ARM/APPLE MACHINE SOUND DRIVERS
 +M:    Martin Povišer <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/apple,*
 +F:    sound/soc/apple/*
 +F:    sound/soc/codecs/cs42l83-i2c.c
 +
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <[email protected]>
  M:    Lars Persson <[email protected]>
@@@ -2431,7 -2395,6 +2432,7 @@@ N:      atme
  ARM/Microchip Sparx5 SoC support
  M:    Lars Povlsen <[email protected]>
  M:    Steen Hegelund <[email protected]>
 +M:    Daniel Machon <[email protected]>
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -2617,7 -2580,7 +2618,7 @@@ W:      http://www.armlinux.org.uk
  
  ARM/QUALCOMM SUPPORT
  M:    Andy Gross <[email protected]>
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  R:    Konrad Dybcio <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -2626,7 -2589,6 +2627,7 @@@ F:      Documentation/devicetree/bindings/*/
  F:    Documentation/devicetree/bindings/soc/qcom/
  F:    arch/arm/boot/dts/qcom-*.dts
  F:    arch/arm/boot/dts/qcom-*.dtsi
 +F:    arch/arm/configs/qcom_defconfig
  F:    arch/arm/mach-qcom/
  F:    arch/arm64/boot/dts/qcom/
  F:    drivers/*/*/qcom*
@@@ -2689,7 -2651,7 +2690,7 @@@ F:      arch/arm/boot/dts/rtd
  F:    arch/arm/mach-realtek/
  F:    arch/arm64/boot/dts/realtek/
  
 -ARM/RENESAS ARM64 ARCHITECTURE
 +ARM/RENESAS ARCHITECTURE
  M:    Geert Uytterhoeven <[email protected]>
  M:    Magnus Damm <[email protected]>
  L:    [email protected]
@@@ -2700,16 -2662,6 +2701,16 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
  F:    Documentation/devicetree/bindings/soc/renesas/
 +F:    arch/arm/boot/dts/emev2*
 +F:    arch/arm/boot/dts/gr-peach*
 +F:    arch/arm/boot/dts/iwg20d-q7*
 +F:    arch/arm/boot/dts/r7s*
 +F:    arch/arm/boot/dts/r8a*
 +F:    arch/arm/boot/dts/r9a*
 +F:    arch/arm/boot/dts/sh*
 +F:    arch/arm/configs/shmobile_defconfig
 +F:    arch/arm/include/debug/renesas-scif.S
 +F:    arch/arm/mach-shmobile/
  F:    arch/arm64/boot/dts/renesas/
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
@@@ -2719,6 -2671,7 +2720,6 @@@ M:      Russell King <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    http://www.armlinux.org.uk/
 -F:    arch/arm/include/asm/hardware/entry-macro-iomd.S
  F:    arch/arm/include/asm/hardware/ioc.h
  F:    arch/arm/include/asm/hardware/iomd.h
  F:    arch/arm/include/asm/hardware/memc.h
@@@ -2820,6 -2773,29 +2821,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/media/platform/samsung/s5p-mfc/
  
 -ARM/SHMOBILE ARM ARCHITECTURE
 -M:    Geert Uytterhoeven <[email protected]>
 -M:    Magnus Damm <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
 -C:    irc://irc.libera.chat/renesas-soc
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
 -F:    Documentation/devicetree/bindings/arm/renesas.yaml
 -F:    Documentation/devicetree/bindings/soc/renesas/
 -F:    arch/arm/boot/dts/emev2*
 -F:    arch/arm/boot/dts/gr-peach*
 -F:    arch/arm/boot/dts/iwg20d-q7*
 -F:    arch/arm/boot/dts/r7s*
 -F:    arch/arm/boot/dts/r8a*
 -F:    arch/arm/boot/dts/r9a*
 -F:    arch/arm/boot/dts/sh*
 -F:    arch/arm/configs/shmobile_defconfig
 -F:    arch/arm/include/debug/renesas-scif.S
 -F:    arch/arm/mach-shmobile/
 -F:    drivers/soc/renesas/
 -F:    include/linux/soc/renesas/
 -
  ARM/SOCFPGA ARCHITECTURE
  M:    Dinh Nguyen <[email protected]>
  S:    Maintained
@@@ -3112,8 -3088,6 +3113,8 @@@ W:      http://wiki.xilinx.co
  T:    git https://github.com/Xilinx/linux-xlnx.git
  F:    Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml
  F:    Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
 +F:    Documentation/devicetree/bindings/memory-controllers/snps,dw-umctl2-ddrc.yaml
 +F:    Documentation/devicetree/bindings/memory-controllers/xlnx,zynq-ddrc-a05.yaml
  F:    Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml
  F:    arch/arm/mach-zynq/
  F:    drivers/clocksource/timer-cadence-ttc.c
@@@ -3237,13 -3211,6 +3238,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml
  F:    drivers/usb/gadget/udc/aspeed_udc.c
  
 +ASPEED CRYPTO DRIVER
 +M:    Neal Liu <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml
 +F:    drivers/crypto/aspeed/
 +
  ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
  M:    Corentin Chary <[email protected]>
  L:    [email protected]
@@@ -3267,6 -3234,13 +3268,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/hwmon/asus_wmi_sensors.c
  
 -ASUS WMI EC HARDWARE MONITOR DRIVER
 -M:    Eugene Shalygin <[email protected]>
 -M:    Denis Pauk <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/hwmon/asus_wmi_ec_sensors.c
 -
  ASUS EC HARDWARE MONITOR DRIVER
  M:    Eugene Shalygin <[email protected]>
  L:    [email protected]
@@@ -3852,7 -3826,6 +3853,7 @@@ F:      kernel/bpf/dispatcher.
  F:    kernel/bpf/trampoline.c
  F:    include/linux/bpf*
  F:    include/linux/filter.h
 +F:    include/linux/tnum.h
  
  BPF [BTF]
  M:    Martin KaFai Lau <[email protected]>
@@@ -3978,7 -3951,6 +3979,7 @@@ M:      William Zhang <william.zhang@broadco
  M:    Anand Gore <[email protected]>
  M:    Kursad Oney <[email protected]>
  M:    Florian Fainelli <[email protected]>
 +M:    Rafał Miłecki <[email protected]>
  R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -4925,7 -4897,6 +4926,7 @@@ M:      Prashant Malani <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/chrome/cros_ec_typec.c
 +F:    drivers/platform/chrome/cros_typec_switch.c
  
  CHROMEOS EC USB PD NOTIFY DRIVER
  M:    Prashant Malani <[email protected]>
@@@ -4989,7 -4960,7 +4990,7 @@@ F:      drivers/hwmon/lochnagar-hwmon.
  F:    drivers/mfd/lochnagar-i2c.c
  F:    drivers/pinctrl/cirrus/pinctrl-lochnagar.c
  F:    drivers/regulator/lochnagar-regulator.c
 -F:    include/dt-bindings/clk/lochnagar.h
 +F:    include/dt-bindings/clock/lochnagar.h
  F:    include/dt-bindings/pinctrl/lochnagar.h
  F:    include/linux/mfd/lochnagar*
  F:    sound/soc/codecs/lochnagar-sc.c
@@@ -5323,7 -5294,7 +5324,7 @@@ COUNTER SUBSYSTE
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git https://git.linaro.org/people/william.gray/counter.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git
  F:    Documentation/ABI/testing/sysfs-bus-counter
  F:    Documentation/driver-api/generic-counter.rst
  F:    drivers/counter/
@@@ -5404,8 -5375,8 +5405,8 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    drivers/cpuidle/cpuidle-big_little.c
  
  CPUIDLE DRIVER - ARM EXYNOS
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
  M:    Daniel Lezcano <[email protected]>
 +R:    Krzysztof Kozlowski <[email protected]>
  M:    Kukjin Kim <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -5753,6 -5724,13 +5754,6 @@@ F:     include/linux/tfrc.
  F:    include/uapi/linux/dccp.h
  F:    net/dccp/
  
 -DECnet NETWORK LAYER
 -L:    [email protected]
 -S:    Orphan
 -W:    http://linux-decnet.sourceforge.net
 -F:    Documentation/networking/decnet.rst
 -F:    net/decnet/
 -
  DECSTATION PLATFORM SUPPORT
  M:    "Maciej W. Rozycki" <[email protected]>
  L:    [email protected]
@@@ -5921,9 -5899,10 +5922,9 @@@ T:     git git://git.kernel.org/pub/scm/lin
  F:    drivers/usb/dwc2/
  
  DESIGNWARE USB3 DRD IP DRIVER
 -M:    Felipe Balbi <[email protected]>
 +M:    Thinh Nguyen <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  F:    drivers/usb/dwc3/
  
  DEVANTECH SRF ULTRASONIC RANGER IIO DRIVER
@@@ -6204,7 -6183,7 +6205,7 @@@ F:      Documentation/devicetree/bindings/me
  F:    drivers/memory/samsung/exynos5422-dmc.c
  
  DME1737 HARDWARE MONITOR DRIVER
 -M:    Juerg Haefliger <juergh@gmail.com>
 +M:    Juerg Haefliger <juergh@proton.me>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/dme1737.rst
@@@ -6444,11 -6423,6 +6445,11 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
  F:    drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
  
 +DRM DRIVER FOR GENERIC EDP PANELS
 +R:    Douglas Anderson <[email protected]>
 +F:    Documentation/devicetree/bindings/display/panel/panel-edp.yaml
 +F:    drivers/gpu/drm/panel/panel-edp.c
 +
  DRM DRIVER FOR GENERIC USB DISPLAY
  M:    Noralf Trønnes <[email protected]>
  S:    Maintained
@@@ -7235,8 -7209,6 +7236,8 @@@ M:      Jason Baron <[email protected]
  S:    Maintained
  F:    include/linux/dynamic_debug.h
  F:    lib/dynamic_debug.c
 +M:    Jim Cromie <[email protected]>
 +F:    lib/test_dynamic_debug.c
  
  DYNAMIC INTERRUPT MODERATION
  M:    Tal Gilboa <[email protected]>
@@@ -7564,7 -7536,7 +7565,7 @@@ M:      Adrian Hunter <[email protected]
  M:    Ritesh Harjani <[email protected]>
  M:    Asutosh Das <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/mmc/host/cqhci*
  
  EMULEX 10Gbps iSCSI - OneConnect DRIVER
@@@ -7717,6 -7689,7 +7718,6 @@@ R:      Kees Cook <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
 -F:    arch/alpha/kernel/binfmt_loader.c
  F:    fs/*binfmt_*.c
  F:    fs/exec.c
  F:    include/linux/binfmts.h
@@@ -8033,7 -8006,6 +8034,7 @@@ L:      [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    include/linux/fortify-string.h
 +F:    lib/fortify_kunit.c
  F:    lib/test_fortify/*
  F:    scripts/test_fortify.sh
  K:    \b__NO_FORTIFY\b
@@@ -8440,19 -8412,6 +8441,19 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/fujitsu-tablet.c
  
 +FUNCTION HOOKS (FTRACE)
 +M:    Steven Rostedt <[email protected]>
 +M:    Masami Hiramatsu <[email protected]>
 +R:    Mark Rutland <[email protected]>
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 +F:    Documentation/trace/ftrace*
 +F:    kernel/trace/ftrace*
 +F:    kernel/trace/fgraph.c
 +F:    arch/*/*/*/*ftrace*
 +F:    arch/*/*/*ftrace*
 +F:    include/*/ftrace.h
 +
  FUNGIBLE ETHERNET DRIVERS
  M:    Dimitris Michailidis <[email protected]>
  L:    [email protected]
@@@ -8489,6 -8448,7 +8490,6 @@@ F:      tools/testing/selftests/futex
  
  GATEWORKS SYSTEM CONTROLLER (GSC) DRIVER
  M:    Tim Harvey <[email protected]>
 -M:    Robert Jones <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
  F:    drivers/mfd/gateworks-gsc.c
@@@ -8928,7 -8888,6 +8929,7 @@@ T:      git https://git.kernel.org/pub/scm/l
  F:    Documentation/ABI/testing/debugfs-driver-habanalabs
  F:    Documentation/ABI/testing/sysfs-driver-habanalabs
  F:    drivers/misc/habanalabs/
 +F:    include/trace/events/habanalabs.h
  F:    include/uapi/misc/habanalabs.h
  
  HACKRF MEDIA DRIVER
@@@ -8950,7 -8909,7 +8951,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
  F:    Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
  F:    Documentation/devicetree/bindings/media/rockchip-vpu.yaml
 -F:    drivers/staging/media/hantro/
 +F:    drivers/media/platform/verisilicon/
  
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
  M:    Frank Seidel <[email protected]>
@@@ -8986,7 -8945,7 +8987,7 @@@ F:      include/linux/hw_random.
  
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <[email protected]>
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  R:    Baolin Wang <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -9096,12 -9055,6 +9097,12 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/hid/hid-playstation.c
  
 +HID PHOENIX RC FLIGHT CONTROLLER
 +M:    Marcus Folkesson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/hid-pxrc.c
 +
  HID SENSOR HUB DRIVERS
  M:    Jiri Kosina <[email protected]>
  M:    Jonathan Cameron <[email protected]>
@@@ -9114,12 -9067,6 +9115,12 @@@ F:    drivers/hid/hid-sensor-
  F:    drivers/iio/*/hid-*
  F:    include/linux/hid-sensor-*
  
 +HID VRC-2 CAR CONTROLLER DRIVER
 +M:    Marcus Folkesson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/hid-vrc2.c
 +
  HID WACOM DRIVER
  M:    Ping Cheng <[email protected]>
  M:    Jason Gerecke  <[email protected]>
@@@ -9172,7 -9119,6 +9173,7 @@@ F:      net/dsa/tag_hellcreek.
  
  HISILICON DMA DRIVER
  M:    Zhou Wang <[email protected]>
 +M:    Jie Hai <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/dma/hisi_dma.c
@@@ -9244,14 -9190,6 +9245,14 @@@ S:    Supporte
  F:    Documentation/admin-guide/perf/hns3-pmu.rst
  F:    drivers/perf/hisilicon/hns3_pmu.c
  
 +HISILICON PTT DRIVER
 +M:    Yicong Yang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-devices-hisi_ptt
 +F:    Documentation/trace/hisi-ptt.rst
 +F:    drivers/hwtracing/ptt/
 +
  HISILICON QM DRIVER
  M:    Weili Qian <[email protected]>
  M:    Zhou Wang <[email protected]>
@@@ -10442,6 -10380,7 +10443,6 @@@ INTEL MENLOW THERMAL DRIVE
  M:    Sujith Thomas <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://01.org/linux-acpi
  F:    drivers/thermal/intel/intel_menlow.c
  
  INTEL P-Unit IPC DRIVER
@@@ -10689,8 -10628,8 +10690,8 @@@ L:   [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  F:    drivers/iommu/dma-iommu.c
+ F:    drivers/iommu/dma-iommu.h
  F:    drivers/iommu/iova.c
- F:    include/linux/dma-iommu.h
  F:    include/linux/iova.h
  
  IOMMU SUBSYSTEM
@@@ -11136,8 -11075,8 +11137,8 @@@ F:   tools/testing/selftests
  KERNEL SMB3 SERVER (KSMBD)
  M:    Namjae Jeon <[email protected]>
  M:    Steve French <[email protected]>
 -M:    Hyunchul Lee <[email protected]>
  R:    Sergey Senozhatsky <[email protected]>
 +R:    Tom Talpey <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.samba.org/ksmbd.git
@@@ -11442,7 -11381,7 +11443,7 @@@ M:   Anil S Keshavamurthy <anil.s.keshava
  M:    "David S. Miller" <[email protected]>
  M:    Masami Hiramatsu <[email protected]>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
  F:    Documentation/trace/kprobes.rst
  F:    include/asm-generic/kprobes.h
  F:    include/linux/kprobes.h
@@@ -11619,15 -11558,6 +11620,15 @@@ F: drivers/ata/ahci_platform.
  F:    drivers/ata/libahci_platform.c
  F:    include/linux/ahci_platform.h
  
 +LIBATA SATA AHCI SYNOPSYS DWC CONTROLLER DRIVER
 +M:    Serge Semin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
 +F:    Documentation/devicetree/bindings/ata/baikal,bt1-ahci.yaml
 +F:    Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml
 +F:    drivers/ata/ahci_dwc.c
 +
  LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
  M:    Mikael Pettersson <[email protected]>
  L:    [email protected]
@@@ -11702,7 -11632,6 +11703,7 @@@ F:   Documentation/process/license-rules.
  F:    LICENSES/
  F:    scripts/spdxcheck-test.sh
  F:    scripts/spdxcheck.py
 +F:    scripts/spdxexclude
  
  LINEAR RANGES HELPERS
  M:    Mark Brown <[email protected]>
@@@ -12001,7 -11930,7 +12002,7 @@@ LTC2688 IIO DAC DRIVE
  M:    Nuno Sá <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/ABI/testing/sysfs-bus-iio-dac-ltc2688
  F:    Documentation/devicetree/bindings/iio/dac/adi,ltc2688.yaml
  F:    drivers/iio/dac/ltc2688.c
@@@ -12418,14 -12347,6 +12419,14 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
  F:    drivers/iio/proximity/mb1232.c
  
 +MAXIM MAX11205 DRIVER
 +M:    Ramona Bolboaca <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/iio/adc/maxim,max11205.yaml
 +F:    drivers/iio/adc/max11205.c
 +
  MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
  R:    Iskren Chernev <[email protected]>
  R:    Krzysztof Kozlowski <[email protected]>
@@@ -12491,6 -12412,7 +12492,6 @@@ F:   drivers/power/supply/max77976_charge
  
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
  M:    Krzysztof Kozlowski <[email protected]>
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
  B:    mailto:[email protected]
@@@ -12502,6 -12424,7 +12503,6 @@@ F:   drivers/power/supply/max77693_charge
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
  B:    mailto:[email protected]
@@@ -12949,7 -12872,7 +12950,7 @@@ MEDIATEK MT7621/28/88 I2C DRIVE
  M:    Stefan Roese <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-mt7621.txt
 +F:    Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml
  F:    drivers/i2c/busses/i2c-mt7621.c
  
  MEDIATEK MT7621 PCIE CONTROLLER DRIVER
@@@ -13062,9 -12985,9 +13063,9 @@@ F:   drivers/input/touchscreen/melfas_mip
  
  MELLANOX BLUEFIELD I2C DRIVER
  M:    Khalil Blaiech <[email protected]>
 +M:    Asmaa Mnebhi <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/i2c/mellanox,i2c-mlxbf.yaml
  F:    drivers/i2c/busses/i2c-mlxbf.c
  
  MELLANOX ETHERNET DRIVER (mlx4_en)
@@@ -13268,13 -13191,6 +13269,13 @@@ F: drivers/mtd
  F:    include/linux/mtd/
  F:    include/uapi/mtd/
  
 +MEMSENSING MICROSYSTEMS MSA311 DRIVER
 +M:    Dmitry Rokosov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/accel/memsensing,msa311.yaml
 +F:    drivers/iio/accel/msa311.c
 +
  MEN A21 WATCHDOG DRIVER
  M:    Johannes Thumshirn <[email protected]>
  L:    [email protected]
@@@ -13378,7 -13294,7 +13379,7 @@@ F:   include/dt-bindings/dma/at91.
  MICROCHIP AT91 SERIAL DRIVER
  M:    Richard Genoud <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
 +F:    Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
  F:    drivers/tty/serial/atmel_serial.c
  F:    drivers/tty/serial/atmel_serial.h
  
@@@ -13386,7 -13302,7 +13387,7 @@@ MICROCHIP AT91 USART MFD DRIVE
  M:    Radu Pirea <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
 +F:    Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
  F:    drivers/mfd/at91-usart.c
  F:    include/dt-bindings/mfd/at91-usart.h
  
@@@ -13394,7 -13310,7 +13395,7 @@@ MICROCHIP AT91 USART SPI DRIVE
  M:    Radu Pirea <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
 +F:    Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
  F:    drivers/spi/spi-at91-usart.c
  
  MICROCHIP AUDIO ASOC DRIVERS
@@@ -13496,7 -13412,7 +13497,7 @@@ MICROCHIP MCP3911 ADC DRIVE
  M:    Marcus Folkesson <[email protected]>
  M:    Kent Gustavsson <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml
  F:    drivers/iio/adc/mcp3911.c
  
@@@ -13512,14 -13428,6 +13513,14 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
  F:    drivers/mtd/nand/raw/atmel/*
  
 +MICROCHIP PCI1XXXX GP DRIVER
 +M:    Kumaravel Thiagarajan <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c
 +F:    drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h
 +F:    drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
 +
  MICROCHIP OTPC DRIVER
  M:    Claudiu Beznea <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -13528,14 -13436,6 +13529,14 @@@ F: Documentation/devicetree/bindings/nv
  F:    drivers/nvmem/microchip-otpc.c
  F:    include/dt-bindings/nvmem/microchip,sama7g5-otpc.h
  
 +MICROCHIP PCI1XXXX I2C DRIVER
 +M:    Tharun Kumar P <[email protected]>
 +M:    Kumaravel Thiagarajan <[email protected]>
 +M:    Microchip Linux Driver Support <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-mchp-pci1xxxx.c
 +
  MICROCHIP PWM DRIVER
  M:    Claudiu Beznea <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -13595,7 -13495,6 +13596,7 @@@ M:   [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/mips/mscc.txt
 +F:    Documentation/devicetree/bindings/phy/mscc,vsc7514-serdes.yaml
  F:    Documentation/devicetree/bindings/power/reset/ocelot-reset.txt
  F:    arch/mips/boot/dts/mscc/
  F:    arch/mips/configs/generic/board-ocelot.config
@@@ -13883,7 -13782,7 +13884,7 @@@ MOTION EYE VAIO PICTUREBOOK CAMERA DRIV
  S:    Orphan
  W:    http://popies.net/meye/
  F:    Documentation/userspace-api/media/drivers/meye*
 -F:    drivers/media/pci/meye/
 +F:    drivers/staging/media/deprecated/meye/
  F:    include/uapi/linux/meye.h
  
  MOTORCOMM PHY DRIVER
@@@ -14552,7 -14451,6 +14553,7 @@@ M:   Willy Tarreau <[email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
  F:    tools/include/nolibc/
 +F:    tools/testing/selftests/nolibc/
  
  NSDEPS
  M:    Matthias Maennich <[email protected]>
@@@ -14635,7 -14533,6 +14636,7 @@@ M:   Daniel Dadap <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/platform/x86/nvidia-wmi-ec-backlight.c
 +F:    include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h
  
  NVM EXPRESS DRIVER
  M:    Keith Busch <[email protected]>
@@@ -14651,15 -14548,6 +14652,15 @@@ F: drivers/nvme/common
  F:    include/linux/nvme*
  F:    include/uapi/linux/nvme_ioctl.h
  
 +NVM EXPRESS FABRICS AUTHENTICATION
 +M:    Hannes Reinecke <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/nvme/host/auth.c
 +F:    drivers/nvme/target/auth.c
 +F:    drivers/nvme/target/fabrics-cmd-auth.c
 +F:    include/linux/nvme-auth.h
 +
  NVM EXPRESS FC TRANSPORT DRIVERS
  M:    James Smart <[email protected]>
  L:    [email protected]
@@@ -14809,15 -14697,6 +14810,15 @@@ S: Orpha
  F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
  F:    drivers/nfc/nxp-nci
  
 +NXP i.MX 8MP DW100 V4L2 DRIVER
 +M:    Xavier Roumegue <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/nxp,dw100.yaml
 +F:    Documentation/userspace-api/media/drivers/dw100.rst
 +F:    drivers/media/platform/nxp/dw100/
 +F:    include/uapi/linux/dw100.h
 +
  NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
  M:    Mirela Rabulea <[email protected]>
  R:    NXP Linux Team <[email protected]>
@@@ -14869,13 -14748,6 +14870,13 @@@ F: net/dsa/tag_ocelot.
  F:    net/dsa/tag_ocelot_8021q.c
  F:    tools/testing/selftests/drivers/net/ocelot/*
  
 +OCELOT EXTERNAL SWITCH CONTROL
 +M:    Colin Foster <[email protected]>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/mfd/mscc,ocelot.yaml
 +F:    drivers/mfd/ocelot*
 +F:    include/linux/mfd/ocelot.h
 +
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
  M:    Frederic Barrat <[email protected]>
  M:    Andrew Donnellan <[email protected]>
@@@ -15070,7 -14942,6 +15071,7 @@@ F:   drivers/regulator/palmas-regulator*.
  F:    drivers/regulator/pbias-regulator.c
  F:    drivers/regulator/tps65217-regulator.c
  F:    drivers/regulator/tps65218-regulator.c
 +F:    drivers/regulator/tps65219-regulator.c
  F:    drivers/regulator/tps65910-regulator.c
  F:    drivers/regulator/twl-regulator.c
  F:    drivers/regulator/twl6030-regulator.c
@@@ -16256,7 -16127,7 +16257,7 @@@ F:   drivers/gpio/gpio-sama5d2-piobu.
  F:    drivers/pinctrl/pinctrl-at91*
  
  PIN CONTROLLER - QUALCOMM
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/qcom,*.txt
@@@ -16669,6 -16540,14 +16670,6 @@@ T:  git git://linuxtv.org/media_tree.gi
  F:    drivers/media/usb/pwc/*
  F:    include/trace/events/pwc.h
  
 -PWM FAN DRIVER
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    Documentation/devicetree/bindings/hwmon/pwm-fan.txt
 -F:    Documentation/hwmon/pwm-fan.rst
 -F:    drivers/hwmon/pwm-fan.c
 -
  PWM IR Transmitter
  M:    Sean Young <[email protected]>
  L:    [email protected]
@@@ -16737,9 -16616,6 +16738,9 @@@ M:   Srinivas Kandagatla <srinivas.kandag
  M:    Banajit Goswami <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +F:    Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml
 +F:    Documentation/devicetree/bindings/sound/qcom,*
 +F:    drivers/soc/qcom/apr.c
  F:    include/dt-bindings/sound/qcom,wcd9335.h
  F:    sound/soc/codecs/lpass-rx-macro.*
  F:    sound/soc/codecs/lpass-tx-macro.*
@@@ -16944,7 -16820,7 +16945,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/platform/qcom/camss/
  
  QUALCOMM CLOCK DRIVERS
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
@@@ -16994,7 -16870,7 +16995,7 @@@ M:   Srinivas Kandagatla <srinivas.kandag
  M:    Amol Maheshwari <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/misc/qcom,fastrpc.txt
 +F:    Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
  F:    drivers/misc/fastrpc.c
  F:    include/uapi/misc/fastrpc.h
  
@@@ -17434,7 -17310,7 +17435,7 @@@ S:   Supporte
  F:    fs/reiserfs/
  
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  M:    Mathieu Poirier <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -17447,7 -17323,7 +17448,7 @@@ F:   include/linux/remoteproc.
  F:    include/linux/remoteproc/
  
  REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
 -M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +M:    Bjorn Andersson <andersson@kernel.org>
  M:    Mathieu Poirier <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -17573,12 -17449,6 +17574,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/mtd/renesas-nandc.yaml
  F:    drivers/mtd/nand/raw/renesas-nand-controller.c
  
 +RENESAS VERSACLOCK 7 CLOCK DRIVER
 +M:    Alex Helms <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/clock/renesas,versaclock7.yaml
 +F:    drivers/clk/clk-versaclock7.c
 +
  RESET CONTROLLER FRAMEWORK
  M:    Philipp Zabel <[email protected]>
  S:    Maintained
@@@ -17680,10 -17550,8 +17681,10 @@@ F: drivers/clk/microchip/clk-mpfs.
  F:    drivers/i2c/busses/i2c-microchip-core.c
  F:    drivers/mailbox/mailbox-mpfs.c
  F:    drivers/pci/controller/pcie-microchip-host.c
 +F:    drivers/reset/reset-mpfs.c
  F:    drivers/rtc/rtc-mpfs.c
  F:    drivers/soc/microchip/
 +F:    drivers/spi/spi-microchip-core-qspi.c
  F:    drivers/spi/spi-microchip-core.c
  F:    drivers/usb/musb/mpfs.c
  F:    include/soc/microchip/mpfs.h
@@@ -17891,24 -17759,6 +17892,24 @@@ F: include/rv
  F:    kernel/trace/rv/
  F:    tools/verification/
  
 +RUST
 +M:    Miguel Ojeda <[email protected]>
 +M:    Alex Gaynor <[email protected]>
 +M:    Wedson Almeida Filho <[email protected]>
 +R:    Boqun Feng <[email protected]>
 +R:    Gary Guo <[email protected]>
 +R:    Björn Roy Baron <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://github.com/Rust-for-Linux/linux
 +B:    https://github.com/Rust-for-Linux/linux/issues
 +T:    git https://github.com/Rust-for-Linux/linux.git rust-next
 +F:    Documentation/rust/
 +F:    rust/
 +F:    samples/rust/
 +F:    scripts/*rust*
 +K:    \b(?i:rust)\b
 +
  RXRPC SOCKETS (AF_RXRPC)
  M:    David Howells <[email protected]>
  M:    Marc Dionne <[email protected]>
@@@ -18080,7 -17930,8 +18081,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/common/saa7146/
 -F:    drivers/media/pci/saa7146/
 +F:    drivers/staging/media/deprecated/saa7146/
  F:    include/media/drv-intf/saa7146*
  
  SAFESETID SECURITY MODULE
@@@ -18135,6 -17986,7 +18136,6 @@@ F:   drivers/platform/x86/samsung-laptop.
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Krzysztof Kozlowski <[email protected]>
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -18199,14 -18051,12 +18200,14 @@@ Q:        https://patchwork.linuxtv.org/projec
  F:    drivers/media/platform/samsung/exynos4-is/
  
  SAMSUNG SOC CLOCK DRIVERS
 +M:    Krzysztof Kozlowski <[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  M:    Tomasz Figa <[email protected]>
  M:    Chanwoo Choi <[email protected]>
  R:    Alim Akhtar <[email protected]>
  L:    [email protected]
  S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
  F:    Documentation/devicetree/bindings/clock/samsung,*.yaml
  F:    Documentation/devicetree/bindings/clock/samsung,s3c*
@@@ -18431,7 -18281,7 +18432,7 @@@ F:   drivers/mmc/host/sdhci-brcmstb
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
  M:    Adrian Hunter <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/mmc/host/sdhci*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
@@@ -18454,7 -18304,7 +18455,7 @@@ S:   Maintaine
  F:    drivers/mmc/host/sdhci-spear.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) TI OMAP DRIVER
 -M:    Kishon Vijay Abraham I <kishon@ti.com>
 +M:    Vignesh Raghavendra <vigneshr@ti.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-omap.c
@@@ -19655,11 -19505,6 +19656,11 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/dlink/sundance.c
  
 +SUN HAPPY MEAL ETHERNET DRIVER
 +M:    Sean Anderson <[email protected]>
 +S:    Maintained
 +F:    drivers/net/ethernet/sun/sunhme.*
 +
  SUNPLUS ETHERNET DRIVER
  M:    Wells Lu <[email protected]>
  L:    [email protected]
@@@ -19674,15 -19519,6 +19675,15 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml
  F:    drivers/nvmem/sunplus-ocotp.c
  
 +SUNPLUS USB2 PHY DRIVER
 +M:    Vincent Shih <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/phy/sunplus,sp7021-usb2-phy.yaml
 +F:    drivers/phy/sunplus/Kconfig
 +F:    drivers/phy/sunplus/Makefile
 +F:    drivers/phy/sunplus/phy-sunplus-usb2.c
 +
  SUNPLUS PWM DRIVER
  M:    Hammer Hsieh <[email protected]>
  S:    Maintained
@@@ -20126,7 -19962,7 +20127,7 @@@ S:   Supporte
  F:    drivers/net/team/
  F:    include/linux/if_team.h
  F:    include/uapi/linux/if_team.h
 -F:    tools/testing/selftests/net/team/
 +F:    tools/testing/selftests/drivers/net/team/
  
  TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT
  M:    "Savoir-faire Linux Inc." <[email protected]>
@@@ -20440,6 -20276,13 +20441,6 @@@ M:  Robert Richter <[email protected]
  S:    Odd Fixes
  F:    drivers/gpio/gpio-thunderx.c
  
 -TI ADS131E0X ADC SERIES DRIVER
 -M:    Tomislav Denis <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/adc/ti,ads131e08.yaml
 -F:    drivers/iio/adc/ti-ads131e08.c
 -
  TI AM437X VPFE DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
@@@ -20491,7 -20334,6 +20492,7 @@@ R:   Sekhar Nori <[email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/clock/ti/davinci/
  F:    drivers/clk/davinci/
 +F:    include/linux/clk/davinci.h
  
  TI DAVINCI SERIES GPIO DRIVER
  M:    Keerthy <[email protected]>
@@@ -20508,18 -20350,8 +20509,18 @@@ W: https://linuxtv.or
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
  F:    drivers/media/platform/ti/davinci/
 +F:    drivers/staging/media/deprecated/vpfe_capture/
  F:    include/media/davinci/
  
 +TI ENHANCED CAPTURE (eCAP) DRIVER
 +M:    Vignesh Raghavendra <[email protected]>
 +R:    Julien Panis <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/counter/ti,am62-ecap-capture.yaml
 +F:    drivers/counter/ti-ecap-capture.c
 +
  TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
  R:    David Lechner <[email protected]>
  L:    [email protected]
@@@ -20658,7 -20490,7 +20659,7 @@@ S:   Odd fixe
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/tm6000*
 -F:    drivers/media/usb/tm6000/
 +F:    drivers/staging/media/deprecated/tm6000/
  
  TMIO/SDHI MMC DRIVER
  M:    Wolfram Sang <[email protected]>
@@@ -20758,10 -20590,9 +20759,10 @@@ F: include/linux/toshiba.
  F:    include/uapi/linux/toshiba.h
  
  TOSHIBA TC358743 DRIVER
 -M:    Mats Randgaard <[email protected]>
 +M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/tc358743.txt
  F:    drivers/media/i2c/tc358743*
  F:    include/media/i2c/tc358743.h
  
@@@ -20782,20 -20613,16 +20783,20 @@@ Q:        https://patchwork.kernel.org/project
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
  F:    drivers/char/tpm/
  
 +TPS546D24 DRIVER
 +M:    Duke Du <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/tps546d24.rst
 +F:    drivers/hwmon/pmbus/tps546d24.c
 +
  TRACING
  M:    Steven Rostedt <[email protected]>
 -M:    Ingo Molnar <[email protected]>
 +M:    Masami Hiramatsu <[email protected]>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
 -F:    Documentation/trace/ftrace.rst
 -F:    arch/*/*/*/*ftrace*
 -F:    arch/*/*/*ftrace*
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 +F:    Documentation/trace/*
  F:    fs/tracefs/
 -F:    include/*/ftrace.h
  F:    include/linux/trace*.h
  F:    include/trace/
  F:    kernel/trace/
@@@ -20804,7 -20631,7 +20805,7 @@@ F:   tools/testing/selftests/ftrace
  
  TRACING MMIO ACCESSES (MMIOTRACE)
  M:    Steven Rostedt <[email protected]>
 -M:    Ingo Molnar <mingo@kernel.org>
 +M:    Masami Hiramatsu <mhiramat@kernel.org>
  R:    Karol Herbst <[email protected]>
  R:    Pekka Paalanen <[email protected]>
  L:    [email protected]
@@@ -20935,7 -20762,6 +20936,7 @@@ U-BOOT ENVIRONMENT VARIABLE
  M:    Rafał Miłecki <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/nvmem/u-boot,env.yaml
 +F:    drivers/nvmem/u-boot-env.c
  
  UACCE ACCELERATOR FRAMEWORK
  M:    Zhangfei Gao <[email protected]>
@@@ -21415,7 -21241,7 +21416,7 @@@ S:   Maintaine
  W:    http://royale.zerezo.com/zr364xx/
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/zr364xx*
 -F:    drivers/media/usb/zr364xx/
 +F:    drivers/staging/media/deprecated/zr364xx/
  
  USER-MODE LINUX (UML)
  M:    Richard Weinberger <[email protected]>
@@@ -21883,7 -21709,7 +21884,7 @@@ VMWARE BALLOON DRIVE
  M:    Nadav Amit <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/misc/vmw_balloon.c
  
  VMWARE HYPERVISOR INTERFACE
@@@ -21902,14 -21728,14 +21903,14 @@@ M:        Bryan Tan <[email protected]
  M:    Vishnu Dasa <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/infiniband/hw/vmw_pvrdma/
  
 -VMware PVSCSI driver
 +VMWARE PVSCSI DRIVER
  M:    Vishal Bhakta <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/scsi/vmw_pvscsi.c
  F:    drivers/scsi/vmw_pvscsi.h
  
@@@ -21922,19 -21748,19 +21923,19 @@@ F:        drivers/ptp/ptp_vmw.
  
  VMWARE VMCI DRIVER
  M:    Bryan Tan <[email protected]>
 -M:    Rajesh Jalisatgi <[email protected]>
  M:    Vishnu Dasa <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/misc/vmw_vmci/
 +F:    include/linux/vmw_vmci*
  
  VMWARE VMMOUSE SUBDRIVER
  M:    Zack Rusin <[email protected]>
  R:    VMware Graphics Reviewers <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/input/mouse/vmmouse.c
  F:    drivers/input/mouse/vmmouse.h
  
@@@ -21942,17 -21768,9 +21943,17 @@@ VMWARE VMXNET3 ETHERNET DRIVE
  M:    Ronak Doshi <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/net/vmxnet3/
  
 +VMWARE VSOCK VMCI TRANSPORT DRIVER
 +M:    Bryan Tan <[email protected]>
 +M:    Vishnu Dasa <[email protected]>
 +R:    VMware PV-Drivers Reviewers <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    net/vmw_vsock/vmci_transport*
 +
  VOCORE VOCORE2 BOARD
  M:    Harvey Hunt <[email protected]>
  L:    [email protected]
@@@ -21998,7 -21816,7 +21999,7 @@@ F:   lib/test_scanf.
  F:    lib/vsprintf.c
  
  VT1211 HARDWARE MONITOR DRIVER
 -M:    Juerg Haefliger <juergh@gmail.com>
 +M:    Juerg Haefliger <juergh@proton.me>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/vt1211.rst
@@@ -22057,11 -21875,9 +22058,11 @@@ F: drivers/input/tablet/wacom_serial4.
  
  WANGXUN ETHERNET DRIVER
  M:    Jiawen Wu <[email protected]>
 +M:    Mengyuan Lou <[email protected]>
 +W:    https://www.net-swift.com
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/networking/device_drivers/ethernet/wangxun/txgbe.rst
 +F:    Documentation/networking/device_drivers/ethernet/wangxun/*
  F:    drivers/net/ethernet/wangxun/
  
  WATCHDOG DEVICE DRIVERS

diff --combined arch/arm64/Kconfig
index dbec73313bf7bfd4a510146018f369108203ac8c,65e259f29c5409f4998341882aad43be6d081ad4..12e0a162ece5a6d9a7e5e343bb1917155eadb24e
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -149,7 -149,6 +149,7 @@@ config ARM6
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_BITREVERSE
        select HAVE_ARCH_COMPILER_H
 +      select HAVE_ARCH_HUGE_VMALLOC
        select HAVE_ARCH_HUGE_VMAP
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_ARCH_JUMP_LABEL_RELATIVE
@@@ -195,6 -194,7 +195,6 @@@
        select HAVE_IRQ_TIME_ACCOUNTING
        select HAVE_KVM
        select HAVE_NMI
 -      select HAVE_PATA_PLATFORM
        select HAVE_PERF_EVENTS
        select HAVE_PERF_REGS
        select HAVE_PERF_USER_STACK_DUMP
@@@ -209,7 -209,6 +209,6 @@@
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_GENERIC_VDSO
-       select IOMMU_DMA if IOMMU_SUPPORT
        select IRQ_DOMAIN
        select IRQ_FORCED_THREADING
        select KASAN_VMALLOC if KASAN
@@@ -230,7 -229,6 +229,7 @@@
        select HAVE_ARCH_USERFAULTFD_MINOR if USERFAULTFD
        select TRACE_IRQFLAGS_SUPPORT
        select TRACE_IRQFLAGS_NMI_SUPPORT
 +      select HAVE_SOFTIRQ_ON_OWN_STACK
        help
          ARM 64-bit (AArch64) Linux support.
  
@@@ -734,19 -732,6 +733,19 @@@ config ARM64_ERRATUM_207705
  
          If unsure, say Y.
  
 +config ARM64_ERRATUM_2658417
 +      bool "Cortex-A510: 2658417: remove BF16 support due to incorrect result"
 +      default y
 +      help
 +        This option adds the workaround for ARM Cortex-A510 erratum 2658417.
 +        Affected Cortex-A510 (r0p0 to r1p1) may produce the wrong result for
 +        BFMMLA or VMMLA instructions in rare circumstances when a pair of
 +        A510 CPUs are using shared neon hardware. As the sharing is not
 +        discoverable by the kernel, hide the BF16 HWCAP to indicate that
 +        user-space should not be using these instructions.
 +
 +        If unsure, say Y.
 +
  config ARM64_ERRATUM_2119858
        bool "Cortex-A710/X2: 2119858: workaround TRBE overwriting trace data in FILL mode"
        default y
@@@ -1576,9 -1561,6 +1575,9 @@@ config THUMB2_COMPAT_VDS
          Compile the compat vDSO with '-mthumb -fomit-frame-pointer' if y,
          otherwise with '-marm'.
  
 +config COMPAT_ALIGNMENT_FIXUPS
 +      bool "Fix up misaligned multi-word loads and stores in user space"
 +
  menuconfig ARMV8_DEPRECATED
        bool "Emulate deprecated/obsolete ARMv8 instructions"
        depends on SYSCTL
@@@ -2251,3 -2233,6 +2250,3 @@@ source "drivers/acpi/Kconfig
  
  source "arch/arm64/kvm/Kconfig"
  
 -if CRYPTO
 -source "arch/arm64/crypto/Kconfig"
 -endif # CRYPTO

diff --combined arch/arm64/mm/dma-mapping.c
index 83a512a6ff0dd51b1855d0e5dc4d6a22c59fbe60,7d7e9a0463057b818b7b44bc0c80fcbf2a9cc3f4..3cb101e8cb29baca75d3fd25287c9dfe932f7677
--- 1/arch/arm64/mm/dma-mapping.c
--- 2/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@@ -7,7 -7,7 +7,7 @@@
  #include <linux/gfp.h>
  #include <linux/cache.h>
  #include <linux/dma-map-ops.h>
- #include <linux/dma-iommu.h>
+ #include <linux/iommu.h>
  #include <xen/xen.h>
  
  #include <asm/cacheflush.h>
@@@ -36,7 -36,7 +36,7 @@@ void arch_dma_prep_coherent(struct pag
  {
        unsigned long start = (unsigned long)page_address(page);
  
 -      dcache_clean_inval_poc(start, start + size);
 +      dcache_clean_poc(start, start + size);
  }
  
  #ifdef CONFIG_IOMMU_DMA

diff --combined drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index 71f7edded9cf2dfaff602c4ff1fb3610c4f62b35,b788a38d8fdf549e7e45ed979a2dec796f8e1dfa..ba47c73f5b8c8af09272bb8480f5592a68498010
--- 1/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
--- 2/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@@ -14,7 -14,6 +14,6 @@@
  #include <linux/bitops.h>
  #include <linux/crash_dump.h>
  #include <linux/delay.h>
- #include <linux/dma-iommu.h>
  #include <linux/err.h>
  #include <linux/interrupt.h>
  #include <linux/io-pgtable.h>
@@@ -28,9 -27,8 +27,8 @@@
  #include <linux/pci-ats.h>
  #include <linux/platform_device.h>
  
- #include <linux/amba/bus.h>
- 
  #include "arm-smmu-v3.h"
+ #include "../../dma-iommu.h"
  #include "../../iommu-sva-lib.h"
  
  static bool disable_bypass = true;
@@@ -1992,11 -1990,14 +1990,14 @@@ static const struct iommu_flush_ops arm
  };
  
  /* IOMMU API */
- static bool arm_smmu_capable(enum iommu_cap cap)
+ static bool arm_smmu_capable(struct device *dev, enum iommu_cap cap)
  {
+       struct arm_smmu_master *master = dev_iommu_priv_get(dev);
+ 
        switch (cap) {
        case IOMMU_CAP_CACHE_COHERENCY:
-               return true;
+               /* Assume that a coherent TCU implies coherent TBUs */
+               return master->smmu->features & ARM_SMMU_FEAT_COHERENCY;
        case IOMMU_CAP_NOEXEC:
                return true;
        default:
@@@ -2817,26 -2818,6 +2818,26 @@@ static int arm_smmu_dev_disable_feature
        }
  }
  
 +/*
 + * HiSilicon PCIe tune and trace device can be used to trace TLP headers on the
 + * PCIe link and save the data to memory by DMA. The hardware is restricted to
 + * use identity mapping only.
 + */
 +#define IS_HISI_PTT_DEVICE(pdev)      ((pdev)->vendor == PCI_VENDOR_ID_HUAWEI && \
 +                                       (pdev)->device == 0xa12e)
 +
 +static int arm_smmu_def_domain_type(struct device *dev)
 +{
 +      if (dev_is_pci(dev)) {
 +              struct pci_dev *pdev = to_pci_dev(dev);
 +
 +              if (IS_HISI_PTT_DEVICE(pdev))
 +                      return IOMMU_DOMAIN_IDENTITY;
 +      }
 +
 +      return 0;
 +}
 +
  static struct iommu_ops arm_smmu_ops = {
        .capable                = arm_smmu_capable,
        .domain_alloc           = arm_smmu_domain_alloc,
@@@ -2851,7 -2832,6 +2852,7 @@@
        .sva_unbind             = arm_smmu_sva_unbind,
        .sva_get_pasid          = arm_smmu_sva_get_pasid,
        .page_response          = arm_smmu_page_response,
 +      .def_domain_type        = arm_smmu_def_domain_type,
        .pgsize_bitmap          = -1UL, /* Restricted during device attach */
        .owner                  = THIS_MODULE,
        .default_domain_ops = &(const struct iommu_domain_ops) {
@@@ -3694,43 -3674,6 +3695,6 @@@ static unsigned long arm_smmu_resource_
                return SZ_128K;
  }
  
- static int arm_smmu_set_bus_ops(struct iommu_ops *ops)
- {
-       int err;
- 
- #ifdef CONFIG_PCI
-       if (pci_bus_type.iommu_ops != ops) {
-               err = bus_set_iommu(&pci_bus_type, ops);
-               if (err)
-                       return err;
-       }
- #endif
- #ifdef CONFIG_ARM_AMBA
-       if (amba_bustype.iommu_ops != ops) {
-               err = bus_set_iommu(&amba_bustype, ops);
-               if (err)
-                       goto err_reset_pci_ops;
-       }
- #endif
-       if (platform_bus_type.iommu_ops != ops) {
-               err = bus_set_iommu(&platform_bus_type, ops);
-               if (err)
-                       goto err_reset_amba_ops;
-       }
- 
-       return 0;
- 
- err_reset_amba_ops:
- #ifdef CONFIG_ARM_AMBA
-       bus_set_iommu(&amba_bustype, NULL);
- #endif
- err_reset_pci_ops: __maybe_unused;
- #ifdef CONFIG_PCI
-       bus_set_iommu(&pci_bus_type, NULL);
- #endif
-       return err;
- }
- 
  static void __iomem *arm_smmu_ioremap(struct device *dev, resource_size_t start,
                                      resource_size_t size)
  {
@@@ -3869,27 -3812,17 +3833,17 @@@ static int arm_smmu_device_probe(struc
        ret = iommu_device_register(&smmu->iommu, &arm_smmu_ops, dev);
        if (ret) {
                dev_err(dev, "Failed to register iommu\n");
-               goto err_sysfs_remove;
+               iommu_device_sysfs_remove(&smmu->iommu);
+               return ret;
        }
  
-       ret = arm_smmu_set_bus_ops(&arm_smmu_ops);
-       if (ret)
-               goto err_unregister_device;
- 
        return 0;
- 
- err_unregister_device:
-       iommu_device_unregister(&smmu->iommu);
- err_sysfs_remove:
-       iommu_device_sysfs_remove(&smmu->iommu);
-       return ret;
  }
  
  static int arm_smmu_device_remove(struct platform_device *pdev)
  {
        struct arm_smmu_device *smmu = platform_get_drvdata(pdev);
  
-       arm_smmu_set_bus_ops(NULL);
        iommu_device_unregister(&smmu->iommu);
        iommu_device_sysfs_remove(&smmu->iommu);
        arm_smmu_device_disable(smmu);

diff --combined drivers/irqchip/irq-gic-v3-its.c
index beead1a0191c11b2daa1925f0730bba49a1c8f9d,e7d8d4208ee68ee50f87d87cf9d0686f3a125c8e..973ede0197e36f066f1904280bc710cc89c84879
--- 1/drivers/irqchip/irq-gic-v3-its.c
--- 2/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@@ -11,9 -11,9 +11,9 @@@
  #include <linux/cpu.h>
  #include <linux/crash_dump.h>
  #include <linux/delay.h>
- #include <linux/dma-iommu.h>
  #include <linux/efi.h>
  #include <linux/interrupt.h>
+ #include <linux/iommu.h>
  #include <linux/iopoll.h>
  #include <linux/irqdomain.h>
  #include <linux/list.h>
@@@ -1574,15 -1574,13 +1574,15 @@@ static int its_select_cpu(struct irq_da
                          const struct cpumask *aff_mask)
  {
        struct its_device *its_dev = irq_data_get_irq_chip_data(d);
 -      cpumask_var_t tmpmask;
 +      static DEFINE_RAW_SPINLOCK(tmpmask_lock);
 +      static struct cpumask __tmpmask;
 +      struct cpumask *tmpmask;
 +      unsigned long flags;
        int cpu, node;
 -
 -      if (!alloc_cpumask_var(&tmpmask, GFP_ATOMIC))
 -              return -ENOMEM;
 -
        node = its_dev->its->numa_node;
 +      tmpmask = &__tmpmask;
 +
 +      raw_spin_lock_irqsave(&tmpmask_lock, flags);
  
        if (!irqd_affinity_is_managed(d)) {
                /* First try the NUMA node */
@@@ -1636,7 -1634,7 +1636,7 @@@
                cpu = cpumask_pick_least_loaded(d, tmpmask);
        }
  out:
 -      free_cpumask_var(tmpmask);
 +      raw_spin_unlock_irqrestore(&tmpmask_lock, flags);
  
        pr_debug("IRQ%d -> %*pbl CPU%d\n", d->irq, cpumask_pr_args(aff_mask), cpu);
        return cpu;