]> Git Repo - J-linux.git/commitdiff
Merge tag 'dmaengine-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...
authorLinus Torvalds <[email protected]>
Tue, 23 Feb 2021 23:05:10 +0000 (15:05 -0800)
committerLinus Torvalds <[email protected]>
Tue, 23 Feb 2021 23:05:10 +0000 (15:05 -0800)
Pull dmaengine updates from Vinod Koul:
 "We have couple of drivers removed a new driver and bunch of new device
  support and few updates to drivers for this round.

  New drivers/devices:
   - Intel LGM SoC DMA driver
   - Actions Semi S500 DMA controller
   - Renesas r8a779a0 dma controller
   - Ingenic JZ4760(B) dma controller
   - Intel KeemBay AxiDMA controller

  Removed:
   - Coh901318 dma driver
   - Zte zx dma driver
   - Sirfsoc dma driver

  Updates:
   - mmp_pdma, mmp_tdma gained module support
   - imx-sdma become modern and dropped platform data support
   - dw-axi driver gained slave and cyclic dma support"

* tag 'dmaengine-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (58 commits)
  dmaengine: dw-axi-dmac: remove redundant null check on desc
  dmaengine: xilinx_dma: Alloc tx descriptors GFP_NOWAIT
  dmaengine: dw-axi-dmac: Virtually split the linked-list
  dmaengine: dw-axi-dmac: Set constraint to the Max segment size
  dmaengine: dw-axi-dmac: Add Intel KeemBay AxiDMA BYTE and HALFWORD registers
  dmaengine: dw-axi-dmac: Add Intel KeemBay AxiDMA handshake
  dmaengine: dw-axi-dmac: Add Intel KeemBay AxiDMA support
  dmaengine: drivers: Kconfig: add HAS_IOMEM dependency to DW_AXI_DMAC
  dmaengine: dw-axi-dmac: Add Intel KeemBay DMA register fields
  dt-binding: dma: dw-axi-dmac: Add support for Intel KeemBay AxiDMA
  dmaengine: dw-axi-dmac: Support burst residue granularity
  dmaengine: dw-axi-dmac: Support of_dma_controller_register()
  dmaegine: dw-axi-dmac: Support device_prep_dma_cyclic()
  dmaengine: dw-axi-dmac: Support device_prep_slave_sg
  dmaengine: dw-axi-dmac: Add device_config operation
  dmaengine: dw-axi-dmac: Add device_synchronize() callback
  dmaengine: dw-axi-dmac: move dma_pool_create() to alloc_chan_resources()
  dmaengine: dw-axi-dmac: simplify descriptor management
  dt-bindings: dma: Add YAML schemas for dw-axi-dmac
  dmaengine: ti: k3-psil: optimize struct psil_endpoint_config for size
  ...

1  2 
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
drivers/dma/idxd/dma.c
drivers/dma/idxd/init.c
drivers/dma/qcom/bam_dma.c
drivers/dma/qcom/gpi.c
drivers/dma/ti/k3-udma.c
drivers/dma/xilinx/xilinx_dma.c

index 8b5f717b8c8c9eab0d187cb4c34fcfdbed74200d,c25786b954193bae74fc161eb93bfd6b5926a81a..0ac8837773184da227b9779b506a62ed6bcf5b04
        arcrimi=        [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards
                        Format: <io>,<irq>,<nodeID>
  
 +      arm64.nobti     [ARM64] Unconditionally disable Branch Target
 +                      Identification support
 +
 +      arm64.nopauth   [ARM64] Unconditionally disable Pointer Authentication
 +                      support
 +
        ataflop=        [HW,M68k]
  
        atarimouse=     [HW,MOUSE] Atari Mouse
                        kernel/dma/contiguous.c
  
        cma_pernuma=nn[MG]
 -                      [ARM64,KNL]
 +                      [ARM64,KNL,CMA]
                        Sets the size of kernel per-numa memory area for
                        contiguous memory allocations. A value of 0 disables
                        per-numa CMA altogether. And If this option is not
                        insecure, please do not use on production kernels.
  
        debug_locks_verbose=
 -                      [KNL] verbose self-tests
 -                      Format=<0|1>
 +                      [KNL] verbose locking self-tests
 +                      Format: <int>
                        Print debugging info while doing the locking API
                        self-tests.
 -                      We default to 0 (no extra messages), setting it to
 -                      1 will print _a lot_ more information - normally
 -                      only useful to kernel developers.
 +                      Bitmask for the various LOCKTYPE_ tests. Defaults to 0
 +                      (no extra messages), setting it to -1 (all bits set)
 +                      will print _a_lot_ more information - normally only
 +                      useful to lockdep developers.
  
        debug_objects   [KNL] Enable object debugging
  
                        causing system reset or hang due to sending
                        INIT from AP to BSP.
  
 -      perf_v4_pmi=    [X86,INTEL]
 -                      Format: <bool>
 -                      Disable Intel PMU counter freezing feature.
 -                      The feature only exists starting from
 -                      Arch Perfmon v4 (Skylake and newer).
 -
        disable_ddw     [PPC/PSERIES]
                        Disable Dynamic DMA Window support. Use this
                        to workaround buggy firmware.
  
        ftrace_filter=[function-list]
                        [FTRACE] Limit the functions traced by the function
 -                      tracer at boot up. function-list is a comma separated
 +                      tracer at boot up. function-list is a comma-separated
                        list of functions. This list can be changed at run
                        time by the set_ftrace_filter file in the debugfs
                        tracing directory.
        ftrace_graph_filter=[function-list]
                        [FTRACE] Limit the top level callers functions traced
                        by the function graph tracer at boot up.
 -                      function-list is a comma separated list of functions
 +                      function-list is a comma-separated list of functions
                        that can be changed at run time by the
                        set_graph_function file in the debugfs tracing directory.
  
        ftrace_graph_notrace=[function-list]
                        [FTRACE] Do not trace from the functions specified in
 -                      function-list.  This list is a comma separated list of
 +                      function-list.  This list is a comma-separated list of
                        functions that can be changed at run time by the
                        set_graph_notrace file in the debugfs tracing directory.
  
        hpet_mmap=      [X86, HPET_MMAP] Allow userspace to mmap HPET
                        registers.  Default set by CONFIG_HPET_MMAP_DEFAULT.
  
 -      hugetlb_cma=    [HW] The size of a cma area used for allocation
 +      hugetlb_cma=    [HW,CMA] The size of a CMA area used for allocation
                        of gigantic hugepages.
                        Format: nn[KMGTPE]
  
 -                      Reserve a cma area of given size and allocate gigantic
 -                      hugepages using the cma allocator. If enabled, the
 +                      Reserve a CMA area of given size and allocate gigantic
 +                      hugepages using the CMA allocator. If enabled, the
                        boot-time allocation of gigantic hugepages is skipped.
  
        hugepages=      [HW] Number of HugeTLB pages to allocate at boot.
                        In such case C2/C3 won't be used again.
                        idle=nomwait: Disable mwait for CPU C-states
  
+       idxd.sva=       [HW]
+                       Format: <bool>
+                       Allow force disabling of Shared Virtual Memory (SVA)
+                       support for the idxd driver. By default it is set to
+                       true (1).
        ieee754=        [MIPS] Select IEEE Std 754 conformance mode
                        Format: { strict | legacy | 2008 | relaxed }
                        Default: strict
        ima_policy=     [IMA]
                        The builtin policies to load during IMA setup.
                        Format: "tcb | appraise_tcb | secure_boot |
 -                               fail_securely"
 +                               fail_securely | critical_data"
  
                        The "tcb" policy measures all programs exec'd, files
                        mmap'd for exec, and all files opened with the read
                        filesystems with the SB_I_UNVERIFIABLE_SIGNATURE
                        flag.
  
 +                      The "critical_data" policy measures kernel integrity
 +                      critical data.
 +
        ima_tcb         [IMA] Deprecated.  Use ima_policy= instead.
                        Load a policy which meets the needs of the Trusted
                        Computing Base.  This means IMA will measure all
        kvm-arm.mode=
                        [KVM,ARM] Select one of KVM/arm64's modes of operation.
  
 +                      nvhe: Standard nVHE-based mode, without support for
 +                            protected guests.
 +
                        protected: nVHE-based mode with support for guests whose
                                   state is kept private from the host.
                                   Not valid if the kernel is running in EL2.
                        when set.
                        Format: <int>
  
 -      libata.force=   [LIBATA] Force configurations.  The format is comma
 +      libata.force=   [LIBATA] Force configurations.  The format is comma-
                        separated list of "[ID:]VAL" where ID is
                        PORT[.DEVICE].  PORT and DEVICE are decimal numbers
                        matching port, link or device.  Basically, it matches
                        parameter, xsave area per process might occupy more
                        memory on xsaves enabled systems.
  
 -      nohlt           [BUGS=ARM,SH] Tells the kernel that the sleep(SH) or
 -                      wfi(ARM) instruction doesn't work correctly and not to
 -                      use it. This is also useful when using JTAG debugger.
 +      nohlt           [ARM,ARM64,MICROBLAZE,SH] Forces the kernel to busy wait
 +                      in do_idle() and not use the arch_cpu_idle()
 +                      implementation; requires CONFIG_GENERIC_IDLE_POLL_SETUP
 +                      to be effective. This is useful on platforms where the
 +                      sleep(SH) or wfi(ARM,ARM64) instructions do not work
 +                      correctly or when doing power measurements to evalute
 +                      the impact of the sleep instructions. This is also
 +                      useful when using JTAG debugger.
  
        no_file_caps    Tells the kernel not to honor file capabilities.  The
                        only way then for a file to be executed with privilege
                        in certain environments such as networked servers or
                        real-time systems.
  
 +      no_hash_pointers
 +                      Force pointers printed to the console or buffers to be
 +                      unhashed.  By default, when a pointer is printed via %p
 +                      format string, that pointer is "hashed", i.e. obscured
 +                      by hashing the pointer value.  This is a security feature
 +                      that hides actual kernel addresses from unprivileged
 +                      users, but it also makes debugging the kernel more
 +                      difficult since unequal pointers can no longer be
 +                      compared.  However, if this command-line option is
 +                      specified, then all normal pointers will have their true
 +                      value printed.  Pointers printed via %pK may still be
 +                      hashed.  This option should only be specified when
 +                      debugging the kernel.  Please do not use on production
 +                      kernels.
 +
        nohibernate     [HIBERNATION] Disable hibernation and resume.
  
        nohz=           [KNL] Boottime enable/disable dynamic ticks
                        For example, to override I2C bus2:
                        omap_mux=i2c2_scl.i2c2_scl=0x100,i2c2_sda.i2c2_sda=0x100
  
 -      oprofile.timer= [HW]
 -                      Use timer interrupt instead of performance counters
 -
 -      oprofile.cpu_type=      Force an oprofile cpu type
 -                      This might be useful if you have an older oprofile
 -                      userland or if you want common events.
 -                      Format: { arch_perfmon }
 -                      arch_perfmon: [X86] Force use of architectural
 -                              perfmon on Intel CPUs instead of the
 -                              CPU specific event set.
 -                      timer: [X86] Force use of architectural NMI
 -                              timer mode (see also oprofile.timer
 -                              for generic hr timer mode)
 -
        oops=panic      Always panic on oopses. Default is to just kill the
                        process, but there is a small probability of
                        deadlocking the machine.
                        Format: {"off"}
                        Disable Hardware Transactional Memory
  
 +      preempt=        [KNL]
 +                      Select preemption mode if you have CONFIG_PREEMPT_DYNAMIC
 +                      none - Limited to cond_resched() calls
 +                      voluntary - Limited to cond_resched() and might_sleep() calls
 +                      full - Any section that isn't explicitly preempt disabled
 +                             can be preempted anytime.
 +
        print-fatal-signals=
                        [KNL] debug: print fatal signals
  
                        value, meaning that RCU_SOFTIRQ is used by default.
                        Specify rcutree.use_softirq=0 to use rcuc kthreads.
  
 +                      But note that CONFIG_PREEMPT_RT=y kernels disable
 +                      this kernel boot parameter, forcibly setting it
 +                      to zero.
 +
        rcutree.rcu_fanout_exact= [KNL]
                        Disable autobalancing of the rcu_node combining
                        tree.  This is used by rcutorture, and might
                        Set wakeup interval for idle CPUs that have
                        RCU callbacks (RCU_FAST_NO_HZ=y).
  
 -      rcutree.rcu_idle_lazy_gp_delay= [KNL]
 -                      Set wakeup interval for idle CPUs that have
 -                      only "lazy" RCU callbacks (RCU_FAST_NO_HZ=y).
 -                      Lazy RCU callbacks are those which RCU can
 -                      prove do nothing more than free memory.
 -
        rcutree.rcu_kick_kthreads= [KNL]
                        Cause the grace-period kthread to get an extra
                        wake_up() if it sleeps three times longer than
                        stress RCU, they don't participate in the actual
                        test, hence the "fake".
  
 +      rcutorture.nocbs_nthreads= [KNL]
 +                      Set number of RCU callback-offload togglers.
 +                      Zero (the default) disables toggling.
 +
 +      rcutorture.nocbs_toggle= [KNL]
 +                      Set the delay in milliseconds between successive
 +                      callback-offload toggling attempts.
 +
        rcutorture.nreaders= [KNL]
                        Set number of RCU readers.  The value -1 selects
                        N-1, where N is the number of CPUs.  A value
                        only normal grace-period primitives.  No effect
                        on CONFIG_TINY_RCU kernels.
  
 +                      But note that CONFIG_PREEMPT_RT=y kernels enables
 +                      this kernel boot parameter, forcibly setting
 +                      it to the value one, that is, converting any
 +                      post-boot attempt at an expedited RCU grace
 +                      period to instead use normal non-expedited
 +                      grace-period processing.
 +
        rcupdate.rcu_task_ipi_delay= [KNL]
                        Set time in jiffies during which RCU tasks will
                        avoid sending IPIs, starting with the beginning
        refscale.verbose= [KNL]
                        Enable additional printk() statements.
  
 +      refscale.verbose_batched= [KNL]
 +                      Batch the additional printk() statements.  If zero
 +                      (the default) or negative, print everything.  Otherwise,
 +                      print every Nth verbose statement, where N is the value
 +                      specified.
 +
        relax_domain_level=
                        [KNL, SMP] Set scheduler's default relax_domain_level.
                        See Documentation/admin-guide/cgroup-v1/cpusets.rst.
  
        stacktrace_filter=[function-list]
                        [FTRACE] Limit the functions that the stack tracer
 -                      will trace at boot up. function-list is a comma separated
 +                      will trace at boot up. function-list is a comma-separated
                        list of functions. This list can be changed at run
                        time by the stack_trace_filter file in the debugfs
                        tracing directory. Note, this enables stack tracing
                        are running concurrently, especially on systems
                        with rotating-rust storage.
  
 +      torture.verbose_sleep_frequency= [KNL]
 +                      Specifies how many verbose printk()s should be
 +                      emitted between each sleep.  The default of zero
 +                      disables verbose-printk() sleeping.
 +
 +      torture.verbose_sleep_duration= [KNL]
 +                      Duration of each verbose-printk() sleep in jiffies.
 +
        tp720=          [HW,PS2]
  
        tpm_suspend_pcr=[HW,TPM]
        trace_event=[event-list]
                        [FTRACE] Set and start specified trace events in order
                        to facilitate early boot debugging. The event-list is a
 -                      comma separated list of trace events to enable. See
 +                      comma-separated list of trace events to enable. See
                        also Documentation/trace/events.rst
  
        trace_options=[option-list]
                        This option is obsoleted by the "nopv" option, which
                        has equivalent effect for XEN platform.
  
 +      xen_no_vector_callback
 +                      [KNL,X86,XEN] Disable the vector callback for Xen
 +                      event channel interrupts.
 +
        xen_scrub_pages=        [XEN]
                        Boolean option to control scrubbing pages before giving them back
                        to Xen, for use by other domains. Can be also changed at runtime
diff --combined MAINTAINERS
index dace4bd105d526b3d202293d7060390ebd18f7e3,882dcc9023c07a296e12333aa1ac871bea7c2ed2..1d75afad615fc6bbd98082be811c2d171e35ed8d
@@@ -203,8 -203,8 +203,8 @@@ F: include/uapi/linux/nl80211.
  F:    net/wireless/
  
  8169 10/100/1000 GIGABIT ETHERNET DRIVER
 -M:    Realtek linux nic maintainers <[email protected]>
  M:    Heiner Kallweit <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/realtek/r8169*
@@@ -699,8 -699,7 +699,8 @@@ M: Michael Tretter <m.tretter@pengutron
  R:    Pengutronix Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/staging/media/allegro-dvt/
 +F:    Documentation/devicetree/bindings/media/allegro,al5e.yaml
 +F:    drivers/media/platform/allegro-dvt/
  
  ALLWINNER A10 CSI DRIVER
  M:    Maxime Ripard <[email protected]>
@@@ -821,6 -820,7 +821,6 @@@ M: Netanel Belgazal <[email protected]
  M:    Arthur Kiyanovski <[email protected]>
  R:    Guy Tzalik <[email protected]>
  R:    Saeed Bishara <[email protected]>
 -R:    Zorik Machulsky <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/amazon/ena.rst
@@@ -907,7 -907,7 +907,7 @@@ AMD KF
  M:    Felix Kuehling <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://people.freedesktop.org/~agd5f/linux
 +T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd*.[ch]
  F:    drivers/gpu/drm/amd/amdkfd/
  F:    drivers/gpu/drm/amd/include/cik_structs.h
@@@ -1414,6 -1414,7 +1414,6 @@@ F:      arch/arm*/include/asm/hw_breakpoint.
  F:    arch/arm*/include/asm/perf_event.h
  F:    arch/arm*/kernel/hw_breakpoint.c
  F:    arch/arm*/kernel/perf_*
 -F:    arch/arm/oprofile/common.c
  F:    drivers/perf/
  F:    include/linux/perf/arm_pmu.h
  
@@@ -1511,7 -1512,6 +1511,7 @@@ ARM/ACTIONS SEMI ARCHITECTUR
  M:    Andreas Färber <[email protected]>
  M:    Manivannan Sadhasivam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/actions.yaml
  F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
@@@ -1779,6 -1779,19 +1779,6 @@@ F:     drivers/net/ethernet/cortina
  F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
 -ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
 -M:    Barry Song <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
 -F:    arch/arm/boot/dts/prima2*
 -F:    arch/arm/mach-prima2/
 -F:    drivers/clk/sirf/
 -F:    drivers/clocksource/timer-atlas7.c
 -F:    drivers/clocksource/timer-prima2.c
 -X:    drivers/gnss
 -N:    [^a-z]sirf
 -
  ARM/CZ.NIC TURRIS MOX SUPPORT
  M:    Marek Behun <[email protected]>
  S:    Maintained
@@@ -1794,6 -1807,13 +1794,6 @@@ F:     drivers/firmware/turris-mox-rwtm.
  F:    drivers/gpio/gpio-moxtet.c
  F:    include/linux/moxtet.h
  
 -ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
 -M:    Uwe Kleine-König <[email protected]>
 -R:    Pengutronix Kernel Team <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -N:    efm32
 -
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  M:    Robert Jarzmik <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2071,7 -2091,7 +2071,7 @@@ M:      Chunfeng Yun <chunfeng.yun@mediatek.
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/phy/phy-mtk-*
 +F:    Documentation/devicetree/bindings/phy/mediatek,*
  F:    drivers/phy/mediatek/
  
  ARM/Microchip (AT91) SoC support
@@@ -2099,7 -2119,7 +2099,7 @@@ N:      atme
  ARM/Microchip Sparx5 SoC support
  M:    Lars Povlsen <[email protected]>
  M:    Steen Hegelund <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  T:    git git://github.com/microchip-ung/linux-upstream.git
  S:    Maintained
  W:    http://linux-chenxing.org/
  F:    Documentation/devicetree/bindings/arm/mstar/*
 +F:    Documentation/devicetree/bindings/clock/mstar,msc313-mpll.yaml
  F:    Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml
  F:    arch/arm/boot/dts/mstar-*
  F:    arch/arm/mach-mstar/
 +F:    drivers/clk/mstar/
  F:    drivers/gpio/gpio-msc313.c
 +F:    include/dt-bindings/clock/mstar-*
  F:    include/dt-bindings/gpio/msc313-gpio.h
  
  ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
  M:    Michael Petchkovsky <[email protected]>
  S:    Maintained
  
 -ARM/NOMADIK/U300/Ux500 ARCHITECTURES
 +ARM/NOMADIK/Ux500 ARCHITECTURES
  M:    Linus Walleij <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2148,23 -2165,35 +2148,23 @@@ F:   Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/arm/ux500.yaml
  F:    Documentation/devicetree/bindings/arm/ux500/
  F:    Documentation/devicetree/bindings/i2c/i2c-nomadik.txt
 -F:    Documentation/devicetree/bindings/i2c/i2c-stu300.txt
  F:    arch/arm/boot/dts/ste-*
  F:    arch/arm/mach-nomadik/
 -F:    arch/arm/mach-u300/
  F:    arch/arm/mach-ux500/
  F:    drivers/clk/clk-nomadik.c
 -F:    drivers/clk/clk-u300.c
  F:    drivers/clocksource/clksrc-dbx500-prcmu.c
 -F:    drivers/clocksource/timer-u300.c
 -F:    drivers/dma/coh901318*
  F:    drivers/dma/ste_dma40*
  F:    drivers/hwspinlock/u8500_hsem.c
  F:    drivers/i2c/busses/i2c-nomadik.c
 -F:    drivers/i2c/busses/i2c-stu300.c
  F:    drivers/iio/adc/ab8500-gpadc.c
 -F:    drivers/mfd/ab3100*
  F:    drivers/mfd/ab8500*
  F:    drivers/mfd/abx500*
  F:    drivers/mfd/db8500*
  F:    drivers/mfd/dbx500*
  F:    drivers/pinctrl/nomadik/
 -F:    drivers/pinctrl/pinctrl-coh901*
 -F:    drivers/pinctrl/pinctrl-u300.c
 -F:    drivers/rtc/rtc-ab3100.c
  F:    drivers/rtc/rtc-ab8500.c
 -F:    drivers/rtc/rtc-coh901331.c
  F:    drivers/rtc/rtc-pl031.c
  F:    drivers/soc/ux500/
 -F:    drivers/watchdog/coh901327_wdt.c
  
  ARM/NUVOTON NPCM ARCHITECTURE
  M:    Avi Fishman <[email protected]>
@@@ -2386,8 -2415,6 +2386,8 @@@ F:      drivers/*/*s5pv210
  F:    drivers/memory/samsung/
  F:    drivers/soc/samsung/
  F:    drivers/tty/serial/samsung*
 +F:    include/linux/platform_data/*s3c*
 +F:    include/linux/serial_s3c.h
  F:    include/linux/soc/samsung/
  N:    exynos
  N:    s3c2410
@@@ -2531,6 -2558,13 +2531,6 @@@ F:     arch/arm/boot/dts/berlin
  F:    arch/arm/mach-berlin/
  F:    arch/arm64/boot/dts/synaptics/
  
 -ARM/TANGO ARCHITECTURE
 -M:    Marc Gonzalez <[email protected]>
 -M:    Mans Rullgard <[email protected]>
 -L:    [email protected]
 -S:    Odd Fixes
 -N:    tango
 -
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2583,8 -2617,8 +2583,8 @@@ S:      Maintaine
  F:    drivers/power/reset/keystone-reset.c
  
  ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
 -M:    Tero Kristo <[email protected]>
  M:    Nishanth Menon <[email protected]>
 +M:    Tero Kristo <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/arm/ti/k3.yaml
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
  F:    Documentation/devicetree/bindings/arm/toshiba.yaml
 +F:    Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
 +F:    Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml
  F:    Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
  F:    arch/arm64/boot/dts/toshiba/
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
 +F:    drivers/gpio/gpio-visconti.c
  F:    drivers/pinctrl/visconti/
 +F:    drivers/watchdog/visconti_wdt.c
  N:    visconti
  
  ARM/UNIPHIER ARCHITECTURE
@@@ -2696,6 -2724,40 +2696,6 @@@ S:     Maintaine
  F:    arch/arm/mach-pxa/include/mach/z2.h
  F:    arch/arm/mach-pxa/z2.c
  
 -ARM/ZTE ARCHITECTURE
 -M:    Jun Nie <[email protected]>
 -M:    Shawn Guo <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/arm/zte.yaml
 -F:    Documentation/devicetree/bindings/clock/zx2967*.txt
 -F:    Documentation/devicetree/bindings/dma/zxdma.txt
 -F:    Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
 -F:    Documentation/devicetree/bindings/i2c/i2c-zx2967.txt
 -F:    Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
 -F:    Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
 -F:    Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
 -F:    Documentation/devicetree/bindings/soc/zte/
 -F:    Documentation/devicetree/bindings/sound/zte,*.txt
 -F:    Documentation/devicetree/bindings/thermal/zx2967-thermal.txt
 -F:    Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
 -F:    arch/arm/boot/dts/zx2967*
 -F:    arch/arm/mach-zx/
 -F:    arch/arm64/boot/dts/zte/
 -F:    drivers/clk/zte/
 -F:    drivers/dma/zx_dma.c
 -F:    drivers/gpio/gpio-zx.c
 -F:    drivers/i2c/busses/i2c-zx2967.c
 -F:    drivers/mmc/host/dw_mmc-zx.*
 -F:    drivers/pinctrl/zte/
 -F:    drivers/soc/zte/
 -F:    drivers/thermal/zx2967_thermal.c
 -F:    drivers/watchdog/zx2967_wdt.c
 -F:    include/dt-bindings/clock/zx2967*.h
 -F:    include/dt-bindings/soc/zte,*.h
 -F:    sound/soc/codecs/zx_aud96p22.c
 -F:    sound/soc/zte/
 -
  ARM/ZYNQ ARCHITECTURE
  M:    Michal Simek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2704,7 -2766,6 +2704,7 @@@ 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/spi/xlnx,zynq-qspi.yaml
  F:    arch/arm/mach-zynq/
  F:    drivers/block/xsysace.c
  F:    drivers/clocksource/timer-cadence-ttc.c
@@@ -2727,14 -2788,6 +2727,14 @@@ F:    arch/arm64
  F:    tools/testing/selftests/arm64/
  X:    arch/arm64/boot/dts/
  
 +ARROW SPEEDCHIPS XRS7000 SERIES ETHERNET SWITCH DRIVER
 +M:    George McCollister <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml
 +F:    drivers/net/dsa/xrs700x/*
 +F:    net/dsa/tag_xrs700x.c
 +
  AS3645A LED FLASH CONTROLLER DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -2780,15 -2833,6 +2780,15 @@@ F:    Documentation/devicetree/bindings/in
  F:    drivers/irqchip/irq-aspeed-scu-ic.c
  F:    include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
  
 +ASPEED SD/MMC DRIVER
 +M:    Andrew Jeffery <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml
 +F:    drivers/mmc/host/sdhci-of-aspeed*
 +
  ASPEED VIDEO ENGINE DRIVER
  M:    Eddie James <[email protected]>
  L:    [email protected]
@@@ -2828,9 -2872,7 +2828,7 @@@ S:      Odd fixe
  W:    http://sourceforge.net/projects/xscaleiop
  F:    Documentation/crypto/async-tx-api.rst
  F:    crypto/async_tx/
- F:    drivers/dma/
  F:    include/linux/async_tx.h
- F:    include/linux/dmaengine.h
  
  AT24 EEPROM DRIVER
  M:    Bartosz Golaszewski <[email protected]>
@@@ -2898,6 -2940,7 +2896,6 @@@ S:      Maintaine
  F:    drivers/hwmon/asus_atk0110.c
  
  ATLX ETHERNET DRIVERS
 -M:    Jay Cliburn <[email protected]>
  M:    Chris Snook <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -3196,7 -3239,6 +3194,7 @@@ L:      [email protected]
  S:    Supported
  W:    http://sourceforge.net/projects/bonding/
  F:    drivers/net/bonding/
 +F:    include/net/bonding.h
  F:    include/uapi/linux/if_bonding.h
  
  BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER
@@@ -3292,7 -3334,7 +3290,7 @@@ F:      arch/riscv/net
  X:    arch/riscv/net/bpf_jit_comp64.c
  
  BPF JIT for RISC-V (64-bit)
 -M:    Björn Töpel <bjorn[email protected]>
 +M:    Björn Töpel <bjorn@kernel.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -3356,7 -3398,6 +3354,7 @@@ L:      [email protected] (sub
  S:    Supported
  F:    Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml
  F:    drivers/net/dsa/b53/*
 +F:    include/linux/dsa/brcm.h
  F:    include/linux/platform_data/b53.h
  
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
@@@ -3370,7 -3411,7 +3368,7 @@@ F:      Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pcie-brcmstb.c
  F:    drivers/staging/vc04_services
  N:    bcm2711
 -N:    bcm2835
 +N:    bcm283*
  
  BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
@@@ -3394,15 -3435,6 +3392,15 @@@ F:    Documentation/devicetree/bindings/mi
  F:    arch/mips/bcm47xx/*
  F:    arch/mips/include/asm/mach-bcm47xx/*
  
 +BROADCOM BCM4908 ETHERNET DRIVER
 +M:    RafaÅ‚ MiÅ‚ecki <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
 +F:    drivers/net/ethernet/broadcom/bcm4908_enet.*
 +F:    drivers/net/ethernet/broadcom/unimac.h
 +
  BROADCOM BCM5301X ARM ARCHITECTURE
  M:    Hauke Mehrtens <[email protected]>
  M:    RafaÅ‚ MiÅ‚ecki <[email protected]>
@@@ -3522,7 -3554,7 +3520,7 @@@ S:      Supporte
  F:    drivers/net/ethernet/broadcom/bnxt/
  
  BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 -M:    Arend van Spriel <arend.vanspriel@broadcom.com>
 +M:    Arend van Spriel <aspriel@gmail.com>
  M:    Franky Lin <[email protected]>
  M:    Hante Meuleman <[email protected]>
  M:    Chi-hsien Lin <[email protected]>
@@@ -3591,7 -3623,6 +3589,7 @@@ S:      Supporte
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
  F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
  F:    drivers/net/ethernet/broadcom/genet/
 +F:    drivers/net/ethernet/broadcom/unimac.h
  F:    drivers/net/mdio/mdio-bcm-unimac.c
  F:    include/linux/platform_data/bcmgenet.h
  F:    include/linux/platform_data/mdio-bcm-unimac.h
@@@ -3625,15 -3656,6 +3623,15 @@@ N:    bcm8831
  N:    hr2
  N:    stingray
  
 +BROADCOM IPROC GBIT ETHERNET DRIVER
 +M:    RafaÅ‚ MiÅ‚ecki <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/brcm,amac.txt
 +F:    drivers/net/ethernet/broadcom/bgmac*
 +F:    drivers/net/ethernet/broadcom/unimac.h
 +
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/firmware/broadcom/*
  
 +BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
 +M:    RafaÅ‚ MiÅ‚ecki <[email protected]>
 +M:    Florian Fainelli <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://github.com/broadcom/stblinux.git
 +F:    drivers/soc/bcm/bcm-pmb.c
 +F:    include/dt-bindings/soc/bcm-pmb.h
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    RafaÅ‚ MiÅ‚ecki <[email protected]>
  L:    [email protected]
@@@ -3723,7 -3735,6 +3721,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
 +F:    drivers/net/ethernet/broadcom/unimac.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Siva Reddy Kallam <[email protected]>
@@@ -3831,6 -3842,14 +3829,6 @@@ F:     drivers/irqchip/irq-csky-
  N:    csky
  K:    csky
  
 -C6X ARCHITECTURE
 -M:    Mark Salter <[email protected]>
 -M:    Aurelien Jacquiot <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -W:    http://www.linux-c6x.org/wiki/index.php/Main_Page
 -F:    arch/c6x/
 -
  CA8210 IEEE-802.15.4 RADIO DRIVER
  M:    Harry Morris <[email protected]>
  L:    [email protected]
@@@ -3860,24 -3879,15 +3858,24 @@@ F:   Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/cadence-nand-controller.c
  
  CADENCE USB3 DRD IP DRIVER
 -M:    Peter Chen <peter.chen@nxp.com>
 +M:    Peter Chen <peter.chen@kernel.org>
  M:    Pawel Laszczak <[email protected]>
 -M:    Roger Quadros <[email protected]>
 +R:    Roger Quadros <[email protected]>
  R:    Aswath Govindraju <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
  F:    Documentation/devicetree/bindings/usb/cdns,usb3.yaml
  F:    drivers/usb/cdns3/
 +X:    drivers/usb/cdns3/cdnsp*
 +
 +CADENCE USBSSP DRD IP DRIVER
 +M:    Pawel Laszczak <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 +F:    drivers/usb/cdns3/
 +X:    drivers/usb/cdns3/cdns3*
  
  CADET FM/AM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
@@@ -3919,10 -3929,8 +3917,10 @@@ T:    git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  F:    Documentation/devicetree/bindings/net/can/
  F:    drivers/net/can/
 +F:    include/linux/can/bittiming.h
  F:    include/linux/can/dev.h
  F:    include/linux/can/led.h
 +F:    include/linux/can/length.h
  F:    include/linux/can/platform/
  F:    include/linux/can/rx-offload.h
  F:    include/uapi/linux/can/error.h
@@@ -3938,7 -3946,6 +3936,7 @@@ W:      https://github.com/linux-ca
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  F:    Documentation/networking/can.rst
 +F:    include/linux/can/can-ml.h
  F:    include/linux/can/core.h
  F:    include/linux/can/skb.h
  F:    include/net/netns/can.h
@@@ -3952,7 -3959,7 +3950,7 @@@ F:      net/can
  CAN-J1939 NETWORK LAYER
  M:    Robin van der Gracht <[email protected]>
  M:    Oleksij Rempel <[email protected]>
 -R:    Pengutronix Kernel Team <[email protected]>
 +R:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/networking/j1939.rst
@@@ -4074,6 -4081,7 +4072,6 @@@ W:      http://www.ibm.com/developerworks/po
  F:    arch/powerpc/include/asm/cell*.h
  F:    arch/powerpc/include/asm/spu*.h
  F:    arch/powerpc/include/uapi/asm/spu*.h
 -F:    arch/powerpc/oprofile/*cell*
  F:    arch/powerpc/platforms/cell/
  
  CELLWISE CW2015 BATTERY DRIVER
@@@ -4153,7 -4161,7 +4151,7 @@@ S:      Maintaine
  F:    Documentation/translations/zh_CN/
  
  CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 -M:    Peter Chen <[email protected]>
 +M:    Peter Chen <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
@@@ -4295,7 -4303,7 +4293,7 @@@ S:      Maintaine
  F:    .clang-format
  
  CLANG/LLVM BUILD SUPPORT
 -M:    Nathan Chancellor <nat[email protected]>
 +M:    Nathan Chancellor <nat[email protected]>
  M:    Nick Desaulniers <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -4303,9 -4311,7 +4301,9 @@@ W:      https://clangbuiltlinux.github.io
  B:    https://github.com/ClangBuiltLinux/linux/issues
  C:    irc://chat.freenode.net/clangbuiltlinux
  F:    Documentation/kbuild/llvm.rst
 +F:    include/linux/compiler-clang.h
  F:    scripts/clang-tools/
 +F:    scripts/clang-version.sh
  F:    scripts/lld-version.sh
  K:    \b(?i:clang|llvm)\b
  
@@@ -4459,7 -4465,7 +4457,7 @@@ F:      include/linux/console
  
  CONTROL GROUP (CGROUP)
  M:    Tejun Heo <[email protected]>
 -M:    Li Zefan <lizefan@huawei.com>
 +M:    Zefan Li <lizefan.x@bytedance.com>
  M:    Johannes Weiner <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -4483,9 -4489,11 +4481,9 @@@ F:     block/blk-throttle.
  F:    include/linux/blk-cgroup.h
  
  CONTROL GROUP - CPUSET
 -M:    Li Zefan <lizefan@huawei.com>
 +M:    Zefan Li <lizefan.x@bytedance.com>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.bullopensource.org/cpuset/
 -W:    http://oss.sgi.com/projects/cpusets/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  F:    Documentation/admin-guide/cgroup-v1/cpusets.rst
  F:    include/linux/cpuset.h
@@@ -4578,7 -4586,7 +4576,7 @@@ B:      https://bugzilla.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  F:    Documentation/admin-guide/pm/cpuidle.rst
  F:    Documentation/driver-api/pm/cpuidle.rst
 -F:    drivers/cpuidle/*
 +F:    drivers/cpuidle/
  F:    include/linux/cpuidle.h
  
  CPU POWER MONITORING SUBSYSTEM
@@@ -4613,7 -4621,6 +4611,7 @@@ L:      [email protected]
  S:    Supported
  F:    arch/arm/mach-exynos/pm.c
  F:    drivers/cpuidle/cpuidle-exynos.c
 +F:    include/linux/platform_data/cpuidle-exynos.h
  
  CPUIDLE DRIVER - ARM PSCI
  M:    Lorenzo Pieralisi <[email protected]>
@@@ -4913,8 -4920,9 +4911,8 @@@ F:      Documentation/scsi/dc395x.rs
  F:    drivers/scsi/dc395x.*
  
  DCCP PROTOCOL
 -M:    Gerrit Renker <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp
  F:    include/linux/dccp.h
  F:    include/linux/tfrc.h
@@@ -4929,7 -4937,7 +4927,7 @@@ F:      Documentation/networking/decnet.rs
  F:    net/decnet/
  
  DECSTATION PLATFORM SUPPORT
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  L:    [email protected]
  S:    Maintained
  W:    http://www.linux-mips.org/wiki/DECstation
@@@ -4938,12 -4946,12 +4936,12 @@@ F:   arch/mips/include/asm/dec
  F:    arch/mips/include/asm/mach-dec/
  
  DEFXX FDDI NETWORK DRIVER
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  S:    Maintained
  F:    drivers/net/fddi/defxx.*
  
  DEFZA FDDI NETWORK DRIVER
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  S:    Maintained
  F:    drivers/net/fddi/defza.*
  
@@@ -4960,17 -4968,17 +4958,17 @@@ M:   Matthew Garrett <[email protected]
  M:    Pali Rohár <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/x86/dell-laptop.c
 +F:    drivers/platform/x86/dell/dell-laptop.c
  
  DELL LAPTOP FREEFALL DRIVER
  M:    Pali Rohár <[email protected]>
  S:    Maintained
 -F:    drivers/platform/x86/dell-smo8800.c
 +F:    drivers/platform/x86/dell/dell-smo8800.c
  
  DELL LAPTOP RBTN DRIVER
  M:    Pali Rohár <[email protected]>
  S:    Maintained
 -F:    drivers/platform/x86/dell-rbtn.*
 +F:    drivers/platform/x86/dell/dell-rbtn.*
  
  DELL LAPTOP SMM DRIVER
  M:    Pali Rohár <[email protected]>
@@@ -4982,26 -4990,26 +4980,26 @@@ DELL REMOTE BIOS UPDATE DRIVE
  M:    Stuart Hayes <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/x86/dell_rbu.c
 +F:    drivers/platform/x86/dell/dell_rbu.c
  
  DELL SMBIOS DRIVER
  M:    Pali Rohár <[email protected]>
  M:    Mario Limonciello <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/x86/dell-smbios.*
 +F:    drivers/platform/x86/dell/dell-smbios.*
  
  DELL SMBIOS SMM DRIVER
  M:    Mario Limonciello <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/x86/dell-smbios-smm.c
 +F:    drivers/platform/x86/dell/dell-smbios-smm.c
  
  DELL SMBIOS WMI DRIVER
  M:    Mario Limonciello <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/x86/dell-smbios-wmi.c
 +F:    drivers/platform/x86/dell/dell-smbios-wmi.c
  F:    tools/wmi/dell-smbios-example.c
  
  DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
@@@ -5009,12 -5017,12 +5007,12 @@@ M:   Stuart Hayes <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/driver-api/dcdbas.rst
 -F:    drivers/platform/x86/dcdbas.*
 +F:    drivers/platform/x86/dell/dcdbas.*
  
  DELL WMI DESCRIPTOR DRIVER
  M:    Mario Limonciello <[email protected]>
  S:    Maintained
 -F:    drivers/platform/x86/dell-wmi-descriptor.c
 +F:    drivers/platform/x86/dell/dell-wmi-descriptor.c
  
  DELL WMI SYSMAN DRIVER
  M:    Divya Bharathi <[email protected]>
@@@ -5023,13 -5031,13 +5021,13 @@@ M:   Prasanth Ksr <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-class-firmware-attributes
 -F:    drivers/platform/x86/dell-wmi-sysman/
 +F:    drivers/platform/x86/dell/dell-wmi-sysman/
  
  DELL WMI NOTIFICATIONS DRIVER
  M:    Matthew Garrett <[email protected]>
  M:    Pali Rohár <[email protected]>
  S:    Maintained
 -F:    drivers/platform/x86/dell-wmi.c
 +F:    drivers/platform/x86/dell/dell-wmi.c
  
  DELTA ST MEDIA DRIVER
  M:    Hugues Fruchet <[email protected]>
@@@ -5271,6 -5279,7 +5269,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/dma/
  F:    Documentation/driver-api/dmaengine/
  F:    drivers/dma/
+ F:    include/linux/dma/
  F:    include/linux/dmaengine.h
  F:    include/linux/of_dma.h
  
@@@ -5774,7 -5783,6 +5773,7 @@@ F:      drivers/gpu/drm/vboxvideo
  DRM DRIVER FOR VMWARE VIRTUAL GPU
  M:    "VMware Graphics" <[email protected]>
  M:    Roland Scheidegger <[email protected]>
 +M:    Zack Rusin <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://people.freedesktop.org/~sroland/linux
@@@ -5976,8 -5984,8 +5975,8 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/stm
  
  DRM DRIVERS FOR TI KEYSTONE
 -M:    Jyri Sarha <j[email protected]>
 -M:    Tomi Valkeinen <tom[email protected]>
 +M:    Jyri Sarha <j[email protected]>
 +M:    Tomi Valkeinen <tom[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -5987,15 -5995,15 +5986,15 @@@ F:   Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/tidss/
  
  DRM DRIVERS FOR TI LCDC
 -M:    Jyri Sarha <j[email protected]>
 -R:    Tomi Valkeinen <tom[email protected]>
 +M:    Jyri Sarha <j[email protected]>
 +R:    Tomi Valkeinen <tom[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/tilcdc/
  F:    drivers/gpu/drm/tilcdc/
  
  DRM DRIVERS FOR TI OMAP
 -M:    Tomi Valkeinen <tom[email protected]>
 +M:    Tomi Valkeinen <tom[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/ti/
@@@ -6048,6 -6056,14 +6047,6 @@@ T:     git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/xlnx/
  F:    drivers/gpu/drm/xlnx/
  
 -DRM DRIVERS FOR ZTE ZX
 -M:    Shawn Guo <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/zte,vou.txt
 -F:    drivers/gpu/drm/zte/
 -
  DRM PANEL DRIVERS
  M:    Thierry Reding <[email protected]>
  R:    Sam Ravnborg <[email protected]>
@@@ -6207,7 -6223,7 +6206,7 @@@ F:      include/linux/dim.
  F:    lib/dim/
  
  DZ DECSTATION DZ11 SERIAL DRIVER
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  S:    Maintained
  F:    drivers/tty/serial/dz.*
  
@@@ -6457,9 -6473,9 +6456,9 @@@ S:      Maintaine
  F:    drivers/edac/skx_*.[ch]
  
  EDAC-TI
 -M:    Tero Kristo <[email protected]>
 +M:    Tero Kristo <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/edac/ti_edac.c
  
  EDIROL UA-101/UA-1000 DRIVER
@@@ -6846,9 -6862,6 +6845,9 @@@ F:      include/linux/fs.
  F:    include/linux/fs_types.h
  F:    include/uapi/linux/fs.h
  F:    include/uapi/linux/openat2.h
 +X:    fs/io-wq.c
 +X:    fs/io-wq.h
 +X:    fs/io_uring.c
  
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    Riku Voipio <[email protected]>
@@@ -7349,6 -7362,7 +7348,6 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/kbuild/gcc-plugins.rst
  F:    scripts/Makefile.gcc-plugins
 -F:    scripts/gcc-plugin.sh
  F:    scripts/gcc-plugins/
  
  GCOV BASED KERNEL PROFILING
@@@ -7363,6 -7377,13 +7362,6 @@@ M:     Kieran Bingham <[email protected]
  S:    Supported
  F:    scripts/gdb/
  
 -GDT SCSI DISK ARRAY CONTROLLER DRIVER
 -M:    Achim Leubner <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://www.icp-vortex.com/
 -F:    drivers/scsi/gdt*
 -
  GEMTEK FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -7908,12 -7929,6 +7907,12 @@@ F:    drivers/hid
  F:    include/linux/hid*
  F:    include/uapi/linux/hid*
  
 +HID PLAYSTATION DRIVER
 +M:    Roderick Colenbrander <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/hid/hid-playstation.c
 +
  HID SENSOR HUB DRIVERS
  M:    Jiri Kosina <[email protected]>
  M:    Jonathan Cameron <[email protected]>
@@@ -8145,7 -8160,7 +8144,7 @@@ F:      net/hsr
  HT16K33 LED CONTROLLER DRIVER
  M:    Robin van der Gracht <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/ht16k33.txt
 +F:    Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml
  F:    drivers/auxdisplay/ht16k33.c
  
  HTCPEN TOUCHSCREEN DRIVER
@@@ -8419,8 -8434,11 +8418,8 @@@ F:     drivers/i3c
  F:    include/linux/i3c/
  
  IA64 (Itanium) PLATFORM
 -M:    Tony Luck <[email protected]>
 -M:    Fenghua Yu <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 +S:    Orphan
  F:    Documentation/ia64/
  F:    arch/ia64/
  
@@@ -8863,6 -8881,7 +8862,6 @@@ F:      drivers/mfd/intel_pmc_bxt.
  F:    include/linux/mfd/intel_pmc_bxt.h
  
  INTEL C600 SERIES SAS CONTROLLER DRIVER
 -M:    Intel SCU Linux support <[email protected]>
  M:    Artur Paszkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -8920,6 -8939,7 +8919,6 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-ich.c
 -F:    drivers/gpio/gpio-intel-mid.c
  F:    drivers/gpio/gpio-merrifield.c
  F:    drivers/gpio/gpio-ml-ioh.c
  F:    drivers/gpio/gpio-pch.c
@@@ -8992,11 -9012,9 +8991,11 @@@ INTEL IPU3 CSI-2 CIO2 DRIVE
  M:    Yong Zhi <[email protected]>
  M:    Sakari Ailus <[email protected]>
  M:    Bingbu Cao <[email protected]>
 +M:    Dan Scally <[email protected]>
  R:    Tianshu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
  F:    drivers/media/pci/intel/ipu3/
  
@@@ -9043,17 -9061,6 +9042,17 @@@ F:    drivers/crypto/keembay/keembay-ocs-a
  F:    drivers/crypto/keembay/ocs-aes.c
  F:    drivers/crypto/keembay/ocs-aes.h
  
 +INTEL KEEM BAY OCS HCU CRYPTO DRIVER
 +M:    Daniele Alessandrelli <[email protected]>
 +M:    Declan Murphy <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml
 +F:    drivers/crypto/keembay/Kconfig
 +F:    drivers/crypto/keembay/Makefile
 +F:    drivers/crypto/keembay/keembay-ocs-hcu-core.c
 +F:    drivers/crypto/keembay/ocs-hcu.c
 +F:    drivers/crypto/keembay/ocs-hcu.h
 +
  INTEL MANAGEMENT ENGINE (mei)
  M:    Tomas Winkler <[email protected]>
  L:    [email protected]
@@@ -9091,6 -9098,7 +9090,6 @@@ M:      Andy Shevchenko <[email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-*cove.c
 -F:    drivers/gpio/gpio-msic.c
  
  INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
  M:    Andy Shevchenko <[email protected]>
@@@ -9219,11 -9227,10 +9218,11 @@@ F:   include/linux/tboot.
  
  INTEL SGX
  M:    Jarkko Sakkinen <[email protected]>
 +R:    Dave Hansen <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/intel-sgx/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-sgx.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
  F:    Documentation/x86/sgx.rst
  F:    arch/x86/entry/vdso/vsgx.S
  F:    arch/x86/include/uapi/asm/sgx.h
@@@ -9232,7 -9239,7 +9231,7 @@@ F:      tools/testing/selftests/sgx/
  K:    \bSGX_
  
  INTERCONNECT API
 -M:    Georgi Djakov <georgi.djakov@linaro.org>
 +M:    Georgi Djakov <djakov@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/interconnect/
@@@ -9265,7 -9272,7 +9264,7 @@@ F:      drivers/net/ethernet/sgi/ioc3-eth.
  
  IOMAP FILESYSTEM LIBRARY
  M:    Christoph Hellwig <[email protected]>
 -M:    Darrick J. Wong <d[email protected]>
 +M:    Darrick J. Wong <d[email protected]>
  M:    [email protected]
  M:    [email protected]
  L:    [email protected]
@@@ -9291,7 -9298,6 +9290,7 @@@ F:      include/uapi/linux/iommu.
  
  IO_URING
  M:    Jens Axboe <[email protected]>
 +R:    Pavel Begunkov <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.dk/linux-block
@@@ -9299,7 -9305,6 +9298,7 @@@ T:      git git://git.kernel.dk/liburin
  F:    fs/io-wq.c
  F:    fs/io-wq.h
  F:    fs/io_uring.c
 +F:    include/linux/io_uring.h
  F:    include/uapi/linux/io_uring.h
  
  IPMI SUBSYSTEM
@@@ -9321,6 -9326,7 +9320,6 @@@ W:      http://www.adaptec.com
  F:    drivers/scsi/ips*
  
  IPVS
 -M:    Wensong Zhang <[email protected]>
  M:    Simon Horman <[email protected]>
  M:    Julian Anastasov <[email protected]>
  L:    [email protected]
@@@ -9557,18 -9563,16 +9556,18 @@@ F:   Documentation/hwmon/k8temp.rs
  F:    drivers/hwmon/k8temp.c
  
  KASAN
 -M:    Andrey Ryabinin <aryabinin@virtuozzo.com>
 +M:    Andrey Ryabinin <ryabinin.a.a@gmail.com>
  R:    Alexander Potapenko <[email protected]>
 +R:    Andrey Konovalov <[email protected]>
  R:    Dmitry Vyukov <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/dev-tools/kasan.rst
 -F:    arch/*/include/asm/kasan.h
 +F:    arch/*/include/asm/*kasan.h
  F:    arch/*/mm/kasan_init*
  F:    include/linux/kasan*.h
 -F:    lib/test_kasan.c
 +F:    lib/Kconfig.kasan
 +F:    lib/test_kasan*.c
  F:    mm/kasan/
  F:    scripts/Makefile.kasan
  
@@@ -9583,7 -9587,7 +9582,7 @@@ F:      scripts/kconfig
  
  KCOV
  R:    Dmitry Vyukov <[email protected]>
 -R:    Andrey Konovalov <andreyknvl@google.com>
 +R:    Andrey Konovalov <andreyknvl@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/dev-tools/kcov.rst
@@@ -9734,7 -9738,6 +9733,7 @@@ M:      Aleksandar Markovic <aleksandar.qemu
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
  F:    arch/mips/include/asm/kvm*
  F:    arch/mips/include/uapi/asm/kvm*
  F:    arch/mips/kvm/
@@@ -9772,7 -9775,7 +9771,7 @@@ F:      tools/testing/selftests/kvm/s390x
  
  KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
  M:    Paolo Bonzini <[email protected]>
 -R:    Sean Christopherson <sean.j.christopherson@intel.com>
 +R:    Sean Christopherson <seanjc@google.com>
  R:    Vitaly Kuznetsov <[email protected]>
  R:    Wanpeng Li <[email protected]>
  R:    Jim Mattson <[email protected]>
@@@ -10256,6 -10259,7 +10255,6 @@@ S:   Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/atomic_bitops.txt
  F:    Documentation/atomic_t.txt
 -F:    Documentation/core-api/atomic_ops.rst
  F:    Documentation/core-api/refcount-vs-atomic.rst
  F:    Documentation/litmus-tests/
  F:    Documentation/memory-barriers.txt
@@@ -10368,8 -10372,6 +10367,8 @@@ LOCKING PRIMITIVE
  M:    Peter Zijlstra <[email protected]>
  M:    Ingo Molnar <[email protected]>
  M:    Will Deacon <[email protected]>
 +R:    Waiman Long <[email protected]>
 +R:    Boqun Feng <[email protected]> (LOCKDEP)
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@@ -10690,8 -10692,6 +10689,8 @@@ M:   Sunil Goutham <[email protected]
  M:    Linu Cherian <[email protected]>
  M:    Geetha sowjanya <[email protected]>
  M:    Jerin Jacob <[email protected]>
 +M:    hariprasad <[email protected]>
 +M:    Subbaraya Sundeep <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
@@@ -10846,7 -10846,7 +10845,7 @@@ F:   drivers/media/radio/radio-maxiradio
  
  MCAN MMIO DEVICE DRIVER
  M:    Dan Murphy <[email protected]>
 -M:    Sriram Dash <sriram.dash@samsung.com>
 +M:    Pankaj Sharma <pankj.sharma@samsung.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
@@@ -11181,15 -11181,6 +11180,15 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
  F:    drivers/i2c/busses/i2c-mt65xx.c
  
 +MEDIATEK IOMMU DRIVER
 +M:    Yong Wu <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/iommu/mediatek*
 +F:    drivers/iommu/mtk_iommu*
 +F:    include/dt-bindings/memory/mt*-port.h
 +
  MEDIATEK JPEG DRIVER
  M:    Rick Chang <[email protected]>
  M:    Bin Liu <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/mediatek,*
 +F:    drivers/usb/host/xhci-mtk*
  F:    drivers/usb/mtu3/
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
 -F:    drivers/media/meson/ge2d/
 +F:    drivers/media/platform/meson/ge2d/
  
  MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
  M:    Liang Yang <[email protected]>
@@@ -11614,7 -11603,6 +11613,6 @@@ F:   drivers/dma/at_hdmac.
  F:    drivers/dma/at_hdmac_regs.h
  F:    drivers/dma/at_xdmac.c
  F:    include/dt-bindings/dma/at91.h
- F:    include/linux/platform_data/dma-atmel.h
  
  MICROCHIP AT91 SERIAL DRIVER
  M:    Richard Genoud <[email protected]>
@@@ -11677,7 -11665,7 +11675,7 @@@ F:   drivers/media/platform/atmel/atmel-i
  
  MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
  M:    Woojung Huh <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
@@@ -11687,7 -11675,7 +11685,7 @@@ F:   net/dsa/tag_ksz.
  
  MICROCHIP LAN743X ETHERNET DRIVER
  M:    Bryan Whitehead <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/microchip/lan743x_*
@@@ -11700,9 -11688,9 +11698,9 @@@ F:   drivers/video/fbdev/atmel_lcdfb.
  F:    include/video/atmel_lcdc.h
  
  MICROCHIP MCP16502 PMIC DRIVER
 -M:    Andrei Stefanescu <andrei.stefanescu@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 +S:    Supported
  F:    Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
  F:    drivers/regulator/mcp16502.c
  
@@@ -11781,7 -11769,7 +11779,7 @@@ F:   drivers/net/wireless/microchip/wilc1
  
  MICROSEMI MIPS SOCS
  M:    Alexandre Belloni <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/mips/mscc.txt
@@@ -11817,31 -11805,12 +11815,31 @@@ S:        Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/surface/
  
 +MICROSOFT SURFACE HOT-PLUG DRIVER
 +M:    Maximilian Luz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/surface/surface_hotplug.c
 +
  MICROSOFT SURFACE PRO 3 BUTTON DRIVER
  M:    Chen Yu <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/platform/surface/surfacepro3_button.c
  
 +MICROSOFT SURFACE SYSTEM AGGREGATOR SUBSYSTEM
 +M:    Maximilian Luz <[email protected]>
 +S:    Maintained
 +W:    https://github.com/linux-surface/surface-aggregator-module
 +C:    irc://chat.freenode.net/##linux-surface
 +F:    Documentation/driver-api/surface_aggregator/
 +F:    drivers/platform/surface/aggregator/
 +F:    drivers/platform/surface/surface_acpi_notify.c
 +F:    drivers/platform/surface/surface_aggregator_cdev.c
 +F:    include/linux/surface_acpi_notify.h
 +F:    include/linux/surface_aggregator/
 +F:    include/uapi/linux/surface_aggregator/
 +
  MICROTEK X6 SCANNER
  M:    Oliver Neukum <[email protected]>
  S:    Maintained
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
  F:    Documentation/driver-api/media/drivers/ccs/
 +F:    Documentation/userspace-api/media/drivers/ccs.rst
  F:    drivers/media/i2c/ccs-pll.c
  F:    drivers/media/i2c/ccs-pll.h
  F:    drivers/media/i2c/ccs/
 +F:    include/uapi/linux/ccs.h
  F:    include/uapi/linux/smiapp.h
  
  MIPS
  S:    Maintained
  F:    arch/mips/include/asm/mach-loongson2ef/
  F:    arch/mips/loongson2ef/
 -F:    drivers/*/*/*loongson2*
 -F:    drivers/*/*loongson2*
 +F:    drivers/cpufreq/loongson2_cpufreq.c
  
  MIPS/LOONGSON64 ARCHITECTURE
  M:    Huacai Chen <[email protected]>
  S:    Maintained
  F:    arch/mips/include/asm/mach-loongson64/
  F:    arch/mips/loongson64/
 -F:    drivers/*/*/*loongson3*
 -F:    drivers/*/*loongson3*
  F:    drivers/irqchip/irq-loongson*
  F:    drivers/platform/mips/cpu_hwmon.c
  
@@@ -12446,8 -12416,8 +12444,8 @@@ F:   tools/testing/selftests/net/ipsec.
  
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
 -M:    Alexey Kuznetsov <[email protected]>
  M:    Hideaki YOSHIFUJI <[email protected]>
 +M:    David Ahern <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
@@@ -12503,6 -12473,7 +12501,6 @@@ F:   net/ipv6/tcp*.
  
  NETWORKING [TLS]
  M:    Boris Pismenny <[email protected]>
 -M:    Aviad Yehezkel <[email protected]>
  M:    John Fastabend <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  M:    Jakub Kicinski <[email protected]>
@@@ -12551,14 -12522,6 +12549,14 @@@ F: include/net/nfc
  F:    include/uapi/linux/nfc.h
  F:    net/nfc/
  
 +NFC VIRTUAL NCI DEVICE DRIVER
 +M:    Bongsu Jeon <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/nfc/virtual_ncidev.c
 +F:    tools/testing/selftests/nci/
 +
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <[email protected]>
  M:    Anna Schumaker <[email protected]>
@@@ -12786,13 -12749,6 +12784,13 @@@ F: drivers/iio/gyro/fxas21002c_core.
  F:    drivers/iio/gyro/fxas21002c_i2c.c
  F:    drivers/iio/gyro/fxas21002c_spi.c
  
 +NXP i.MX CLOCK DRIVERS
 +M:    Abel Vesa <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/clk/imx/
 +
  NXP i.MX 8MQ DCSS DRIVER
  M:    Laurentiu Palcu <[email protected]>
  R:    Lucas Stach <[email protected]>
@@@ -12867,17 -12823,16 +12865,17 @@@ F:        tools/objtool
  F:    include/linux/objtool.h
  
  OCELOT ETHERNET SWITCH DRIVER
 -M:    Microchip Linux Driver Support <[email protected]>
  M:    Vladimir Oltean <[email protected]>
  M:    Claudiu Manoil <[email protected]>
  M:    Alexandre Belloni <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/dsa/ocelot/*
  F:    drivers/net/ethernet/mscc/
  F:    include/soc/mscc/ocelot*
  F:    net/dsa/tag_ocelot.c
 +F:    net/dsa/tag_ocelot_8021q.c
  F:    tools/testing/selftests/drivers/net/ocelot/*
  
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
@@@ -12893,7 -12848,7 +12891,7 @@@ F:   include/misc/ocxl
  F:    include/uapi/misc/ocxl.h
  
  OMAP AUDIO SUPPORT
 -M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
 +M:    Peter Ujfalusi <peter.ujfalusi@gmail.com>
  M:    Jarkko Nikula <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -12937,7 -12892,7 +12935,7 @@@ S:   Orpha
  F:    drivers/video/fbdev/omap/
  
  OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
 -M:    Roger Quadros <rogerq@ti.com>
 +M:    Roger Quadros <rogerq@kernel.org>
  M:    Tony Lindgren <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -13157,7 -13112,7 +13155,7 @@@ M:   Jacopo Mondi <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/ov5647.yaml
 +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml
  F:    drivers/media/i2c/ov5647.c
  
  OMNIVISION OV5670 SENSOR DRIVER
@@@ -13356,6 -13311,15 +13354,6 @@@ S:  Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  F:    sound/drivers/opl4/
  
 -OPROFILE
 -M:    Robert Richter <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    arch/*/include/asm/oprofile*.h
 -F:    arch/*/oprofile/
 -F:    drivers/oprofile/
 -F:    include/linux/oprofile.h
 -
  ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
  M:    Mark Fasheh <[email protected]>
  M:    Joel Becker <[email protected]>
@@@ -13924,7 -13888,7 +13922,7 @@@ F:   drivers/platform/x86/peaq-wmi.
  
  PENSANDO ETHERNET DRIVERS
  M:    Shannon Nelson <[email protected]>
 -M:    Pensando Drivers <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/pensando/ionic.rst
  S:    Maintained
  F:    drivers/hid/hid-picolcd*
  
 -PICOXCELL SUPPORT
 -M:    Jamie Iles <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 -T:    git git://github.com/jamieiles/linux-2.6-ji.git
 -F:    arch/arm/boot/dts/picoxcell*
 -F:    arch/arm/mach-picoxcell/
 -F:    drivers/crypto/picoxcell*
 -
  PIDFD API
  M:    Christian Brauner <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
  F:    arch/mips/boot/dts/img/pistachio*
  F:    arch/mips/configs/pistachio*_defconfig
 -F:    arch/mips/include/asm/mach-pistachio/
  F:    arch/mips/pistachio/
  
  PKTCDVD DRIVER
@@@ -14536,18 -14510,10 +14534,18 @@@ S:        Supporte
  F:    drivers/crypto/qat/
  
  QCOM AUDIO (ASoC) DRIVERS
 -M:    Patrick Lai <plai@codeaurora.org>
 +M:    Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
  M:    Banajit Goswami <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +F:    sound/soc/codecs/lpass-va-macro.c
 +F:    sound/soc/codecs/lpass-wsa-macro.*
 +F:    sound/soc/codecs/msm8916-wcd-analog.c
 +F:    sound/soc/codecs/msm8916-wcd-digital.c
 +F:    sound/soc/codecs/wcd9335.*
 +F:    sound/soc/codecs/wcd934x.c
 +F:    sound/soc/codecs/wcd-clsh-v2.*
 +F:    sound/soc/codecs/wsa881x.c
  F:    sound/soc/qcom/
  
  QCOM IPA DRIVER
  S:    Supported
  F:    drivers/staging/qlge/
  
 +QLOGIC QLGE 10Gb ETHERNET DRIVER
 +M:    Coiby Xu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/networking/device_drivers/qlogic/qlge.rst
 +
  QM1D1B0004 MEDIA DRIVER
  M:    Akihiro Tsukada <[email protected]>
  L:    [email protected]
@@@ -14707,7 -14667,7 +14705,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/net/wireless/ath/ath11k/
  
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 -M:    QCA ath9k Development <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
@@@ -14858,7 -14818,7 +14856,7 @@@ M:   Alex Deucher <alexander.deucher@amd.
  M:    Christian König <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://people.freedesktop.org/~agd5f/linux
 +T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    drivers/gpu/drm/amd/
  F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/amdgpu_drm.h
@@@ -15003,18 -14963,6 +15001,18 @@@ F: drivers/media/i2c/max9271.
  F:    drivers/media/i2c/max9271.h
  F:    drivers/media/i2c/rdacm20.c
  
 +RDACM21 Camera Sensor
 +M:    Jacopo Mondi <[email protected]>
 +M:    Kieran Bingham <[email protected]>
 +M:    Laurent Pinchart <[email protected]>
 +M:    Niklas Söderlund <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/rdacm2x-gmsl.yaml
 +F:    drivers/media/i2c/max9271.c
 +F:    drivers/media/i2c/max9271.h
 +F:    drivers/media/i2c/rdacm21.c
 +
  RDC R-321X SoC
  M:    Florian Fainelli <[email protected]>
  S:    Maintained
@@@ -15739,6 -15687,7 +15737,6 @@@ F:   drivers/media/i2c/s5k5baf.
  SAMSUNG S5P Security SubSystem (SSS) DRIVER
  M:    Krzysztof Kozlowski <[email protected]>
  M:    Vladimir Zapolskiy <[email protected]>
 -M:    Kamil Konieczny <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -16286,14 -16235,6 +16284,14 @@@ S: Maintaine
  F:    Documentation/fb/sm712fb.rst
  F:    drivers/video/fbdev/sm712*
  
 +SILVACO I3C DUAL-ROLE MASTER
 +M:    Miquel Raynal <[email protected]>
 +M:    Conor Culhane <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
 +F:    drivers/i3c/master/svc-i3c-master.c
 +
  SIMPLE FIRMWARE INTERFACE (SFI)
  S:    Obsolete
  W:    http://simplefirmware.org/
@@@ -16378,7 -16319,6 +16376,7 @@@ M:   Pekka Enberg <[email protected]
  M:    David Rientjes <[email protected]>
  M:    Joonsoo Kim <[email protected]>
  M:    Andrew Morton <[email protected]>
 +M:    Vlastimil Babka <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    include/linux/sl?b*.h
@@@ -16598,7 -16538,6 +16596,7 @@@ M:   Sakari Ailus <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/imx258.yaml
  F:    drivers/media/i2c/imx258.c
  
  SONY IMX274 SENSOR DRIVER
@@@ -16624,15 -16563,6 +16622,15 @@@ S: Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/imx319.c
  
 +SONY IMX334 SENSOR DRIVER
 +M:    Paul J. Murphy <[email protected]>
 +M:    Daniele Alessandrelli <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
 +F:    drivers/media/i2c/imx334.c
 +
  SONY IMX355 SENSOR DRIVER
  M:    Tianshu Qiu <[email protected]>
  L:    [email protected]
@@@ -16778,8 -16708,6 +16776,8 @@@ M:   Samuel Thibault <samuel.thibault@ens
  L:    [email protected]
  S:    Odd Fixes
  W:    http://www.linux-speakup.org/
 +W:    https://github.com/linux-speakup/speakup
 +B:    https://github.com/linux-speakup/speakup/issues
  F:    drivers/accessibility/speakup/
  
  SPEAR CLOCK FRAMEWORK SUPPORT
@@@ -17003,6 -16931,12 +17001,6 @@@ F:  include/linux/static_call*.
  F:    kernel/jump_label.c
  F:    kernel/static_call.c
  
 -STEC S1220 SKD DRIVER
 -M:    Damien Le Moal <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/block/skd*[ch]
 -
  STI AUDIO (ASoC) DRIVERS
  M:    Arnaud Pouliquen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -17028,7 -16962,7 +17026,7 @@@ M:   Olivier Moysan <[email protected]
  M:    Arnaud Pouliquen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/sound/st,stm32-*.txt
 +F:    Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
  F:    sound/soc/stm/
  
  STM32 TIMER/LPTIMER DRIVERS
@@@ -17272,7 -17206,6 +17270,7 @@@ F:   drivers/mfd/syscon.
  
  SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
  M:    Sudeep Holla <[email protected]>
 +R:    Cristian Marussi <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/arm,sc[mp]i.txt
@@@ -17280,7 -17213,6 +17278,7 @@@ F:   drivers/clk/clk-sc[mp]i.
  F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scmi/
  F:    drivers/firmware/arm_scpi.c
 +F:    drivers/regulator/scmi-regulator.c
  F:    drivers/reset/reset-scmi.c
  F:    include/linux/sc[mp]i_protocol.h
  F:    include/trace/events/scmi.h
@@@ -17564,14 -17496,6 +17562,14 @@@ M: Laxman Dewangan <[email protected]
  S:    Supported
  F:    drivers/spi/spi-tegra*
  
 +TEGRA QUAD SPI DRIVER
 +M:    Thierry Reding <[email protected]>
 +M:    Jonathan Hunter <[email protected]>
 +M:    Sowjanya Komatineni <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/spi/spi-tegra210-quad.c
 +
  TEGRA VIDEO DRIVER
  M:    Thierry Reding <[email protected]>
  M:    Jonathan Hunter <[email protected]>
@@@ -17615,7 -17539,7 +17613,7 @@@ F:   arch/xtensa
  F:    drivers/irqchip/irq-xtensa-*
  
  TEXAS INSTRUMENTS ASoC DRIVERS
 -M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
 +M:    Peter Ujfalusi <peter.ujfalusi@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    sound/soc/ti/
@@@ -17627,22 -17551,9 +17625,22 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
  F:    drivers/iio/dac/ti-dac7612.c
  
 +TEXAS INSTRUMENTS DMA DRIVERS
 +M:    Peter Ujfalusi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt
 +F:    Documentation/devicetree/bindings/dma/ti-edma.txt
 +F:    Documentation/devicetree/bindings/dma/ti/
 +F:    drivers/dma/ti/
 +X:    drivers/dma/ti/cppi41.c
 +F:    include/linux/dma/k3-udma-glue.h
 +F:    include/linux/dma/ti-cppi5.h
 +F:    include/linux/dma/k3-psil.h
 +
  TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER
  M:    Nishanth Menon <[email protected]>
 -M:    Tero Kristo <[email protected]>
 +M:    Tero Kristo <[email protected]>
  M:    Santosh Shilimkar <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -17664,15 -17575,6 +17662,15 @@@ F: include/dt-bindings/soc/ti,sci_pm_do
  F:    include/linux/soc/ti/ti_sci_inta_msi.h
  F:    include/linux/soc/ti/ti_sci_protocol.h
  
 +TEXAS INSTRUMENTS TPS23861 PoE PSE DRIVER
 +M:    Robert Marko <[email protected]>
 +M:    Luka Perkov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/ti,tps23861.yaml
 +F:    Documentation/hwmon/tps23861.rst
 +F:    drivers/hwmon/tps23861.c
 +
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -17726,7 -17628,7 +17724,7 @@@ F:   drivers/thermal/gov_power_allocator.
  F:    include/trace/events/thermal_power_allocator.h
  
  THINKPAD ACPI EXTRAS DRIVER
 -M:    Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
 +M:    Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -17795,9 -17697,9 +17793,9 @@@ S:   Maintaine
  F:    drivers/clk/clk-cdce706.c
  
  TI CLOCK DRIVER
 -M:    Tero Kristo <[email protected]>
 +M:    Tero Kristo <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/clk/ti/
  F:    include/linux/clk/ti.h
  
@@@ -17923,7 -17825,7 +17921,7 @@@ M:   Dan Murphy <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/can/tcan4x5x.txt
 -F:    drivers/net/can/m_can/tcan4x5x.c
 +F:    drivers/net/can/m_can/tcan4x5x*
  
  TI TRF7970A NFC DRIVER
  M:    Mark Greer <[email protected]>
@@@ -17934,7 -17836,7 +17932,7 @@@ F:   Documentation/devicetree/bindings/ne
  F:    drivers/nfc/trf7970a.c
  
  TI TWL4030 SERIES SOC CODEC DRIVER
 -M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
 +M:    Peter Ujfalusi <peter.ujfalusi@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    sound/soc/codecs/twl4030*
@@@ -18187,7 -18089,7 +18185,7 @@@ F:   Documentation/networking/tuntap.rs
  F:    arch/um/os-Linux/drivers/
  
  TURBOCHANNEL SUBSYSTEM
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -18466,7 -18368,7 +18464,7 @@@ F:   include/linux/usb/isp116x.
  
  USB LAN78XX ETHERNET DRIVER
  M:    Woojung Huh <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/microchip,lan78xx.txt
@@@ -18500,7 -18402,7 +18498,7 @@@ F:   Documentation/usb/ohci.rs
  F:    drivers/usb/host/ohci*
  
  USB OTG FSM (Finite State Machine)
 -M:    Peter Chen <[email protected]>
 +M:    Peter Chen <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
@@@ -18580,7 -18482,7 +18578,7 @@@ F:   drivers/net/usb/smsc75xx.
  
  USB SMSC95XX ETHERNET DRIVER
  M:    Steve Glendinning <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/usb/smsc95xx.*
@@@ -19127,7 -19029,7 +19125,7 @@@ F:   drivers/input/mouse/vmmouse.
  
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Ronak Doshi <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/vmxnet3/
@@@ -19154,6 -19056,7 +19152,6 @@@ K:   regulator_get_optiona
  
  VRF
  M:    David Ahern <[email protected]>
 -M:    Shrijeet Mukherjee <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/networking/vrf.rst
@@@ -19504,7 -19407,7 +19502,7 @@@ F:   drivers/net/ethernet/*/*/*xdp
  K:    (?:\b|_)xdp(?:\b|_)
  
  XDP SOCKETS (AF_XDP)
 -M:    Björn Töpel <bjorn[email protected]>
 +M:    Björn Töpel <bjorn@kernel.org>
  M:    Magnus Karlsson <[email protected]>
  R:    Jonathan Lemon <[email protected]>
  L:    [email protected]
@@@ -19600,7 -19503,7 +19598,7 @@@ F:   arch/x86/xen/*swiotlb
  F:    drivers/xen/*swiotlb*
  
  XFS FILESYSTEM
 -M:    Darrick J. Wong <d[email protected]>
 +M:    Darrick J. Wong <d[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -19820,7 -19723,7 +19818,7 @@@ F:   Documentation/admin-guide/blockdev/z
  F:    drivers/block/zram/
  
  ZS DECSTATION Z85C30 SERIAL DRIVER
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  S:    Maintained
  F:    drivers/tty/serial/zs.*
  
diff --combined drivers/dma/idxd/dma.c
index 71fd6e4c42cd7456cd61a81fd1198a0200d92752,90d19d06783a6ffb577957e69237d390f12b5465..a15e50126434e34e009da2cc4b33563dcc2f30d2
@@@ -165,6 -165,7 +165,7 @@@ int idxd_register_dma_device(struct idx
        INIT_LIST_HEAD(&dma->channels);
        dma->dev = &idxd->pdev->dev;
  
+       dma_cap_set(DMA_PRIVATE, dma->cap_mask);
        dma_cap_set(DMA_COMPLETION_NO_ORDER, dma->cap_mask);
        dma->device_release = idxd_dma_release;
  
@@@ -205,8 -206,5 +206,8 @@@ int idxd_register_dma_channel(struct id
  
  void idxd_unregister_dma_channel(struct idxd_wq *wq)
  {
 -      dma_async_device_channel_unregister(&wq->idxd->dma_dev, &wq->dma_chan);
 +      struct dma_chan *chan = &wq->dma_chan;
 +
 +      dma_async_device_channel_unregister(&wq->idxd->dma_dev, chan);
 +      list_del(&chan->device_node);
  }
diff --combined drivers/dma/idxd/init.c
index fa04acd5582a0a13b09e37933166eba68b35662b,9687a24ff98266d310defb70a9072653ba87f304..085a0c3b62c68190d86ceb75f355ec7a6e3c910a
@@@ -26,12 -26,16 +26,16 @@@ MODULE_VERSION(IDXD_DRIVER_VERSION)
  MODULE_LICENSE("GPL v2");
  MODULE_AUTHOR("Intel Corporation");
  
+ static bool sva = true;
+ module_param(sva, bool, 0644);
+ MODULE_PARM_DESC(sva, "Toggle SVA support on/off");
  #define DRV_NAME "idxd"
  
  bool support_enqcmd;
  
  static struct idr idxd_idrs[IDXD_TYPE_MAX];
- static struct mutex idxd_idr_lock;
+ static DEFINE_MUTEX(idxd_idr_lock);
  
  static struct pci_device_id idxd_pci_tbl[] = {
        /* DSA ver 1.0 platforms */
@@@ -335,18 -339,17 +339,20 @@@ static int idxd_probe(struct idxd_devic
        int rc;
  
        dev_dbg(dev, "%s entered and resetting device\n", __func__);
 -      idxd_device_init_reset(idxd);
 +      rc = idxd_device_init_reset(idxd);
 +      if (rc < 0)
 +              return rc;
 +
        dev_dbg(dev, "IDXD reset complete\n");
  
-       if (IS_ENABLED(CONFIG_INTEL_IDXD_SVM)) {
+       if (IS_ENABLED(CONFIG_INTEL_IDXD_SVM) && sva) {
                rc = idxd_enable_system_pasid(idxd);
                if (rc < 0)
                        dev_warn(dev, "Failed to enable PASID. No SVA support: %d\n", rc);
                else
                        set_bit(IDXD_FLAG_PASID_ENABLED, &idxd->flags);
+       } else if (!sva) {
+               dev_warn(dev, "User forced SVA off via module param.\n");
        }
  
        idxd_read_caps(idxd);
@@@ -547,7 -550,6 +553,6 @@@ static int __init idxd_init_module(void
        else
                support_enqcmd = true;
  
-       mutex_init(&idxd_idr_lock);
        for (i = 0; i < IDXD_TYPE_MAX; i++)
                idr_init(&idxd_idrs[i]);
  
index 88579857ca1d6c08a342c606001188a56157cf03,4c85a197e5fa9d1ea4a60956c514db9d39bc691d..c8a77b428b528b8d3508fe15c3b64bc560cc6036
@@@ -630,7 -630,7 +630,7 @@@ static struct dma_async_tx_descriptor *
                             GFP_NOWAIT);
  
        if (!async_desc)
 -              goto err_out;
 +              return NULL;
  
        if (flags & DMA_PREP_FENCE)
                async_desc->flags |= DESC_FLAG_NWD;
        }
  
        return vchan_tx_prep(&bchan->vc, &async_desc->vd, flags);
 -
 -err_out:
 -      kfree(async_desc);
 -      return NULL;
  }
  
  /**
@@@ -1270,13 -1274,13 +1270,13 @@@ static int bam_dma_probe(struct platfor
                        dev_err(bdev->dev, "num-ees unspecified in dt\n");
        }
  
-       bdev->bamclk = devm_clk_get(bdev->dev, "bam_clk");
-       if (IS_ERR(bdev->bamclk)) {
-               if (!bdev->controlled_remotely)
-                       return PTR_ERR(bdev->bamclk);
+       if (bdev->controlled_remotely)
+               bdev->bamclk = devm_clk_get_optional(bdev->dev, "bam_clk");
+       else
+               bdev->bamclk = devm_clk_get(bdev->dev, "bam_clk");
  
-               bdev->bamclk = NULL;
-       }
+       if (IS_ERR(bdev->bamclk))
+               return PTR_ERR(bdev->bamclk);
  
        ret = clk_prepare_enable(bdev->bamclk);
        if (ret) {
        if (ret)
                goto err_unregister_dma;
  
-       if (bdev->controlled_remotely) {
+       if (!bdev->bamclk) {
                pm_runtime_disable(&pdev->dev);
                return 0;
        }
@@@ -1438,10 -1442,10 +1438,10 @@@ static int __maybe_unused bam_dma_suspe
  {
        struct bam_device *bdev = dev_get_drvdata(dev);
  
-       if (!bdev->controlled_remotely)
+       if (bdev->bamclk) {
                pm_runtime_force_suspend(dev);
-       clk_unprepare(bdev->bamclk);
+               clk_unprepare(bdev->bamclk);
+       }
  
        return 0;
  }
@@@ -1451,12 -1455,13 +1451,13 @@@ static int __maybe_unused bam_dma_resum
        struct bam_device *bdev = dev_get_drvdata(dev);
        int ret;
  
-       ret = clk_prepare(bdev->bamclk);
-       if (ret)
-               return ret;
+       if (bdev->bamclk) {
+               ret = clk_prepare(bdev->bamclk);
+               if (ret)
+                       return ret;
  
-       if (!bdev->controlled_remotely)
                pm_runtime_force_resume(dev);
+       }
  
        return 0;
  }
diff --combined drivers/dma/qcom/gpi.c
index 1a0bf6b0567a55e6d4ec009daae813cf83eb78dc,be7fcc9a20927c34d016a0b26c9bcd0dd7403688..57f5ee4235c71b2b4424293b15fd8d7819156728
@@@ -584,7 -584,7 +584,7 @@@ static inline void gpi_write_reg_field(
        gpi_write_reg(gpii, addr, val);
  }
  
- static inline void
+ static __always_inline void
  gpi_update_reg(struct gpii *gpii, u32 offset, u32 mask, u32 val)
  {
        void __iomem *addr = gpii->regs + offset;
@@@ -1416,7 -1416,7 +1416,7 @@@ static int gpi_alloc_ring(struct gpi_ri
        len = 1 << bit;
        ring->alloc_size = (len + (len - 1));
        dev_dbg(gpii->gpi_dev->dev,
 -              "#el:%u el_size:%u len:%u actual_len:%llu alloc_size:%lu\n",
 +              "#el:%u el_size:%u len:%u actual_len:%llu alloc_size:%zu\n",
                  elements, el_size, (elements * el_size), len,
                  ring->alloc_size);
  
                                               ring->alloc_size,
                                               &ring->dma_handle, GFP_KERNEL);
        if (!ring->pre_aligned) {
 -              dev_err(gpii->gpi_dev->dev, "could not alloc size:%lu mem for ring\n",
 +              dev_err(gpii->gpi_dev->dev, "could not alloc size:%zu mem for ring\n",
                        ring->alloc_size);
                return -ENOMEM;
        }
        smp_wmb();
  
        dev_dbg(gpii->gpi_dev->dev,
 -              "phy_pre:0x%0llx phy_alig:0x%0llx len:%u el_size:%u elements:%u\n",
 -              ring->dma_handle, ring->phys_addr, ring->len,
 +              "phy_pre:%pad phy_alig:%pa len:%u el_size:%u elements:%u\n",
 +              &ring->dma_handle, &ring->phys_addr, ring->len,
                ring->el_size, ring->elements);
  
        return 0;
@@@ -1700,7 -1700,7 +1700,7 @@@ static int gpi_create_i2c_tre(struct gc
  
                tre->dword[3] = u32_encode_bits(TRE_TYPE_DMA, TRE_FLAGS_TYPE);
                tre->dword[3] |= u32_encode_bits(1, TRE_FLAGS_IEOT);
-       };
+       }
  
        for (i = 0; i < tre_idx; i++)
                dev_dbg(dev, "TRE:%d %x:%x:%x:%x\n", i, desc->tre[i].dword[0],
@@@ -1948,7 -1948,7 +1948,7 @@@ static int gpi_ch_init(struct gchan *gc
        return ret;
  
  error_start_chan:
 -      for (i = i - 1; i >= 0; i++) {
 +      for (i = i - 1; i >= 0; i--) {
                gpi_stop_chan(&gpii->gchan[i]);
                gpi_send_cmd(gpii, gchan, GPI_CH_CMD_RESET);
        }
diff --combined drivers/dma/ti/k3-udma.c
index f474a1232335450df6b4410c8cb298432a61f1ee,a0bf5121de9b901bbc5a37d3b26d4d2a9eb33719..96ad21869ba720ba6c630893a8bfd7acb8e289d2
@@@ -121,6 -121,11 +121,11 @@@ struct udma_oes_offsets 
  #define UDMA_FLAG_PDMA_ACC32          BIT(0)
  #define UDMA_FLAG_PDMA_BURST          BIT(1)
  #define UDMA_FLAG_TDTYPE              BIT(2)
+ #define UDMA_FLAG_BURST_SIZE          BIT(3)
+ #define UDMA_FLAGS_J7_CLASS           (UDMA_FLAG_PDMA_ACC32 | \
+                                        UDMA_FLAG_PDMA_BURST | \
+                                        UDMA_FLAG_TDTYPE | \
+                                        UDMA_FLAG_BURST_SIZE)
  
  struct udma_match_data {
        enum k3_dma_type type;
        bool enable_memcpy_support;
        u32 flags;
        u32 statictr_z_mask;
+       u8 burst_size[3];
  };
  
  struct udma_soc_data {
@@@ -436,6 -442,18 +442,18 @@@ static void k3_configure_chan_coherency
        }
  }
  
+ static u8 udma_get_chan_tpl_index(struct udma_tpl *tpl_map, int chan_id)
+ {
+       int i;
+       for (i = 0; i < tpl_map->levels; i++) {
+               if (chan_id >= tpl_map->start_idx[i])
+                       return i;
+       }
+       return 0;
+ }
  static void udma_reset_uchan(struct udma_chan *uc)
  {
        memset(&uc->config, 0, sizeof(uc->config));
@@@ -1811,13 -1829,21 +1829,21 @@@ static int udma_tisci_m2m_channel_confi
        const struct ti_sci_rm_udmap_ops *tisci_ops = tisci_rm->tisci_udmap_ops;
        struct udma_tchan *tchan = uc->tchan;
        struct udma_rchan *rchan = uc->rchan;
-       int ret = 0;
+       u8 burst_size = 0;
+       int ret;
+       u8 tpl;
  
        /* Non synchronized - mem to mem type of transfer */
        int tc_ring = k3_ringacc_get_ring_id(tchan->tc_ring);
        struct ti_sci_msg_rm_udmap_tx_ch_cfg req_tx = { 0 };
        struct ti_sci_msg_rm_udmap_rx_ch_cfg req_rx = { 0 };
  
+       if (ud->match_data->flags & UDMA_FLAG_BURST_SIZE) {
+               tpl = udma_get_chan_tpl_index(&ud->tchan_tpl, tchan->id);
+               burst_size = ud->match_data->burst_size[tpl];
+       }
        req_tx.valid_params = TISCI_UDMA_TCHAN_VALID_PARAMS;
        req_tx.nav_id = tisci_rm->tisci_dev_id;
        req_tx.index = tchan->id;
        req_tx.tx_fetch_size = sizeof(struct cppi5_desc_hdr_t) >> 2;
        req_tx.txcq_qnum = tc_ring;
        req_tx.tx_atype = ud->atype;
+       if (burst_size) {
+               req_tx.valid_params |= TI_SCI_MSG_VALUE_RM_UDMAP_CH_BURST_SIZE_VALID;
+               req_tx.tx_burst_size = burst_size;
+       }
  
        ret = tisci_ops->tx_ch_cfg(tisci_rm->tisci, &req_tx);
        if (ret) {
        req_rx.rxcq_qnum = tc_ring;
        req_rx.rx_chan_type = TI_SCI_RM_UDMAP_CHAN_TYPE_3RDP_BCOPY_PBRR;
        req_rx.rx_atype = ud->atype;
+       if (burst_size) {
+               req_rx.valid_params |= TI_SCI_MSG_VALUE_RM_UDMAP_CH_BURST_SIZE_VALID;
+               req_rx.rx_burst_size = burst_size;
+       }
  
        ret = tisci_ops->rx_ch_cfg(tisci_rm->tisci, &req_rx);
        if (ret)
@@@ -1854,12 -1888,24 +1888,24 @@@ static int bcdma_tisci_m2m_channel_conf
        const struct ti_sci_rm_udmap_ops *tisci_ops = tisci_rm->tisci_udmap_ops;
        struct ti_sci_msg_rm_udmap_tx_ch_cfg req_tx = { 0 };
        struct udma_bchan *bchan = uc->bchan;
-       int ret = 0;
+       u8 burst_size = 0;
+       int ret;
+       u8 tpl;
+       if (ud->match_data->flags & UDMA_FLAG_BURST_SIZE) {
+               tpl = udma_get_chan_tpl_index(&ud->bchan_tpl, bchan->id);
+               burst_size = ud->match_data->burst_size[tpl];
+       }
  
        req_tx.valid_params = TISCI_BCDMA_BCHAN_VALID_PARAMS;
        req_tx.nav_id = tisci_rm->tisci_dev_id;
        req_tx.extended_ch_type = TI_SCI_RM_BCDMA_EXTENDED_CH_TYPE_BCHAN;
        req_tx.index = bchan->id;
+       if (burst_size) {
+               req_tx.valid_params |= TI_SCI_MSG_VALUE_RM_UDMAP_CH_BURST_SIZE_VALID;
+               req_tx.tx_burst_size = burst_size;
+       }
  
        ret = tisci_ops->tx_ch_cfg(tisci_rm->tisci, &req_tx);
        if (ret)
@@@ -1877,7 -1923,7 +1923,7 @@@ static int udma_tisci_tx_channel_config
        int tc_ring = k3_ringacc_get_ring_id(tchan->tc_ring);
        struct ti_sci_msg_rm_udmap_tx_ch_cfg req_tx = { 0 };
        u32 mode, fetch_size;
-       int ret = 0;
+       int ret;
  
        if (uc->config.pkt_mode) {
                mode = TI_SCI_RM_UDMAP_CHAN_TYPE_PKT_PBRR;
@@@ -1918,7 -1964,7 +1964,7 @@@ static int bcdma_tisci_tx_channel_confi
        const struct ti_sci_rm_udmap_ops *tisci_ops = tisci_rm->tisci_udmap_ops;
        struct udma_tchan *tchan = uc->tchan;
        struct ti_sci_msg_rm_udmap_tx_ch_cfg req_tx = { 0 };
-       int ret = 0;
+       int ret;
  
        req_tx.valid_params = TISCI_BCDMA_TCHAN_VALID_PARAMS;
        req_tx.nav_id = tisci_rm->tisci_dev_id;
@@@ -1951,7 -1997,7 +1997,7 @@@ static int udma_tisci_rx_channel_config
        struct ti_sci_msg_rm_udmap_rx_ch_cfg req_rx = { 0 };
        struct ti_sci_msg_rm_udmap_flow_cfg flow_req = { 0 };
        u32 mode, fetch_size;
-       int ret = 0;
+       int ret;
  
        if (uc->config.pkt_mode) {
                mode = TI_SCI_RM_UDMAP_CHAN_TYPE_PKT_PBRR;
@@@ -2028,7 -2074,7 +2074,7 @@@ static int bcdma_tisci_rx_channel_confi
        const struct ti_sci_rm_udmap_ops *tisci_ops = tisci_rm->tisci_udmap_ops;
        struct udma_rchan *rchan = uc->rchan;
        struct ti_sci_msg_rm_udmap_rx_ch_cfg req_rx = { 0 };
-       int ret = 0;
+       int ret;
  
        req_rx.valid_params = TISCI_BCDMA_RCHAN_VALID_PARAMS;
        req_rx.nav_id = tisci_rm->tisci_dev_id;
@@@ -2048,7 -2094,7 +2094,7 @@@ static int pktdma_tisci_rx_channel_conf
        const struct ti_sci_rm_udmap_ops *tisci_ops = tisci_rm->tisci_udmap_ops;
        struct ti_sci_msg_rm_udmap_rx_ch_cfg req_rx = { 0 };
        struct ti_sci_msg_rm_udmap_flow_cfg flow_req = { 0 };
-       int ret = 0;
+       int ret;
  
        req_rx.valid_params = TISCI_BCDMA_RCHAN_VALID_PARAMS;
        req_rx.nav_id = tisci_rm->tisci_dev_id;
@@@ -2401,8 -2447,7 +2447,8 @@@ static int bcdma_alloc_chan_resources(s
                        dev_err(ud->ddev.dev,
                                "Descriptor pool allocation failed\n");
                        uc->use_dma_pool = false;
 -                      return -ENOMEM;
 +                      ret = -ENOMEM;
 +                      goto err_res_free;
                }
  
                uc->use_dma_pool = true;
@@@ -4168,6 -4213,11 +4214,11 @@@ static struct udma_match_data am654_mai
        .psil_base = 0x1000,
        .enable_memcpy_support = true,
        .statictr_z_mask = GENMASK(11, 0),
+       .burst_size = {
+               TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES, /* Normal Channels */
+               TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES, /* H Channels */
+               0, /* No UH Channels */
+       },
  };
  
  static struct udma_match_data am654_mcu_data = {
        .psil_base = 0x6000,
        .enable_memcpy_support = false,
        .statictr_z_mask = GENMASK(11, 0),
+       .burst_size = {
+               TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES, /* Normal Channels */
+               TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES, /* H Channels */
+               0, /* No UH Channels */
+       },
  };
  
  static struct udma_match_data j721e_main_data = {
        .type = DMA_TYPE_UDMA,
        .psil_base = 0x1000,
        .enable_memcpy_support = true,
-       .flags = UDMA_FLAG_PDMA_ACC32 | UDMA_FLAG_PDMA_BURST | UDMA_FLAG_TDTYPE,
+       .flags = UDMA_FLAGS_J7_CLASS,
        .statictr_z_mask = GENMASK(23, 0),
+       .burst_size = {
+               TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES, /* Normal Channels */
+               TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_256_BYTES, /* H Channels */
+               TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_256_BYTES, /* UH Channels */
+       },
  };
  
  static struct udma_match_data j721e_mcu_data = {
        .type = DMA_TYPE_UDMA,
        .psil_base = 0x6000,
        .enable_memcpy_support = false, /* MEM_TO_MEM is slow via MCU UDMA */
-       .flags = UDMA_FLAG_PDMA_ACC32 | UDMA_FLAG_PDMA_BURST | UDMA_FLAG_TDTYPE,
+       .flags = UDMA_FLAGS_J7_CLASS,
        .statictr_z_mask = GENMASK(23, 0),
+       .burst_size = {
+               TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES, /* Normal Channels */
+               TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_128_BYTES, /* H Channels */
+               0, /* No UH Channels */
+       },
  };
  
  static struct udma_match_data am64_bcdma_data = {
        .type = DMA_TYPE_BCDMA,
        .psil_base = 0x2000, /* for tchan and rchan, not applicable to bchan */
        .enable_memcpy_support = true, /* Supported via bchan */
-       .flags = UDMA_FLAG_PDMA_ACC32 | UDMA_FLAG_PDMA_BURST | UDMA_FLAG_TDTYPE,
+       .flags = UDMA_FLAGS_J7_CLASS,
        .statictr_z_mask = GENMASK(23, 0),
+       .burst_size = {
+               TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES, /* Normal Channels */
+               0, /* No H Channels */
+               0, /* No UH Channels */
+       },
  };
  
  static struct udma_match_data am64_pktdma_data = {
        .type = DMA_TYPE_PKTDMA,
        .psil_base = 0x1000,
        .enable_memcpy_support = false, /* PKTDMA does not support MEM_TO_MEM */
-       .flags = UDMA_FLAG_PDMA_ACC32 | UDMA_FLAG_PDMA_BURST | UDMA_FLAG_TDTYPE,
+       .flags = UDMA_FLAGS_J7_CLASS,
        .statictr_z_mask = GENMASK(23, 0),
+       .burst_size = {
+               TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES, /* Normal Channels */
+               0, /* No H Channels */
+               0, /* No UH Channels */
+       },
  };
  
  static const struct of_device_id udma_of_match[] = {
@@@ -4306,6 -4381,7 +4382,7 @@@ static int udma_get_mmrs(struct platfor
                ud->bchan_cnt = BCDMA_CAP2_BCHAN_CNT(cap2);
                ud->tchan_cnt = BCDMA_CAP2_TCHAN_CNT(cap2);
                ud->rchan_cnt = BCDMA_CAP2_RCHAN_CNT(cap2);
+               ud->rflow_cnt = ud->rchan_cnt;
                break;
        case DMA_TYPE_PKTDMA:
                cap4 = udma_read(ud->mmrs[MMR_GCFG], 0x30);
@@@ -4699,9 -4775,9 +4776,9 @@@ static int pktdma_setup_resources(struc
                ud->tchan_tpl.levels = 1;
        }
  
 -      ud->tchan_tpl.levels = ud->tchan_tpl.levels;
 -      ud->tchan_tpl.start_idx[0] = ud->tchan_tpl.start_idx[0];
 -      ud->tchan_tpl.start_idx[1] = ud->tchan_tpl.start_idx[1];
 +      ud->rchan_tpl.levels = ud->tchan_tpl.levels;
 +      ud->rchan_tpl.start_idx[0] = ud->tchan_tpl.start_idx[0];
 +      ud->rchan_tpl.start_idx[1] = ud->tchan_tpl.start_idx[1];
  
        ud->tchan_map = devm_kmalloc_array(dev, BITS_TO_LONGS(ud->tchan_cnt),
                                           sizeof(unsigned long), GFP_KERNEL);
@@@ -5046,6 -5122,34 +5123,34 @@@ static void udma_dbg_summary_show(struc
  }
  #endif /* CONFIG_DEBUG_FS */
  
+ static enum dmaengine_alignment udma_get_copy_align(struct udma_dev *ud)
+ {
+       const struct udma_match_data *match_data = ud->match_data;
+       u8 tpl;
+       if (!match_data->enable_memcpy_support)
+               return DMAENGINE_ALIGN_8_BYTES;
+       /* Get the highest TPL level the device supports for memcpy */
+       if (ud->bchan_cnt)
+               tpl = udma_get_chan_tpl_index(&ud->bchan_tpl, 0);
+       else if (ud->tchan_cnt)
+               tpl = udma_get_chan_tpl_index(&ud->tchan_tpl, 0);
+       else
+               return DMAENGINE_ALIGN_8_BYTES;
+       switch (match_data->burst_size[tpl]) {
+       case TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_256_BYTES:
+               return DMAENGINE_ALIGN_256_BYTES;
+       case TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_128_BYTES:
+               return DMAENGINE_ALIGN_128_BYTES;
+       case TI_SCI_RM_UDMAP_CHAN_BURST_SIZE_64_BYTES:
+       fallthrough;
+       default:
+               return DMAENGINE_ALIGN_64_BYTES;
+       }
+ }
  #define TI_UDMAC_BUSWIDTHS    (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \
                                 BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \
                                 BIT(DMA_SLAVE_BUSWIDTH_3_BYTES) | \
@@@ -5202,7 -5306,6 +5307,6 @@@ static int udma_probe(struct platform_d
        ud->ddev.dst_addr_widths = TI_UDMAC_BUSWIDTHS;
        ud->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
        ud->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
-       ud->ddev.copy_align = DMAENGINE_ALIGN_8_BYTES;
        ud->ddev.desc_metadata_modes = DESC_METADATA_CLIENT |
                                       DESC_METADATA_ENGINE;
        if (ud->match_data->enable_memcpy_support &&
                INIT_DELAYED_WORK(&uc->tx_drain.work, udma_check_tx_completion);
        }
  
+       /* Configure the copy_align to the maximum burst size the device supports */
+       ud->ddev.copy_align = udma_get_copy_align(ud);
        ret = dma_async_device_register(&ud->ddev);
        if (ret) {
                dev_err(dev, "failed to register slave DMA engine: %d\n", ret);
index 79777550a6ffc2e8db8e6fbb472f4b8fa55f9c12,fb046af9ac53f8efea7872f52160f35ed06622d4..3aded7861fef85bcc2b38de15dd4bbc2b42dedb1
@@@ -800,7 -800,7 +800,7 @@@ xilinx_dma_alloc_tx_descriptor(struct x
  {
        struct xilinx_dma_tx_descriptor *desc;
  
-       desc = kzalloc(sizeof(*desc), GFP_KERNEL);
+       desc = kzalloc(sizeof(*desc), GFP_NOWAIT);
        if (!desc)
                return NULL;
  
@@@ -2781,7 -2781,7 +2781,7 @@@ static int xilinx_dma_chan_probe(struc
                has_dre = false;
  
        if (!has_dre)
 -              xdev->common.copy_align = fls(width - 1);
 +              xdev->common.copy_align = (enum dmaengine_alignment)fls(width - 1);
  
        if (of_device_is_compatible(node, "xlnx,axi-vdma-mm2s-channel") ||
            of_device_is_compatible(node, "xlnx,axi-dma-mm2s-channel") ||
  static int xilinx_dma_child_probe(struct xilinx_dma_device *xdev,
                                    struct device_node *node)
  {
 -      int ret, i, nr_channels = 1;
 +      int ret, i;
 +      u32 nr_channels = 1;
  
        ret = of_property_read_u32(node, "dma-channels", &nr_channels);
        if (xdev->dma_config->dmatype == XDMA_TYPE_AXIMCDMA && ret < 0)
@@@ -3113,11 -3112,7 +3113,11 @@@ static int xilinx_dma_probe(struct plat
        }
  
        /* Register the DMA engine with the core */
 -      dma_async_device_register(&xdev->common);
 +      err = dma_async_device_register(&xdev->common);
 +      if (err) {
 +              dev_err(xdev->dev, "failed to register the dma device\n");
 +              goto error;
 +      }
  
        err = of_dma_controller_register(node, of_dma_xilinx_xlate,
                                         xdev);
This page took 0.227329 seconds and 4 git commands to generate.