Merge 5.19-rc6 into char-misc-next

We need the misc driver fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --combined MAINTAINERS
index 889cdb9c803a593eb97a88e1235fcc9a3102594f,f679152bdbadf9a2ef67d6b3aad70509ab46f453..9fb4ec35f6fc368c2de4f7de08ed67990f0112b9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -426,7 -426,6 +426,6 @@@ F: drivers/acpi/*thermal
  ACPI VIOT DRIVER
  M:    Jean-Philippe Brucker <[email protected]>
  L:    [email protected]
- L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/acpi/viot.c
@@@ -960,7 -959,6 +959,6 @@@ F: drivers/video/fbdev/geode
  AMD IOMMU (AMD-VI)
  M:    Joerg Roedel <[email protected]>
  R:    Suravee Suthikulpanit <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@ -1329,7 -1327,7 +1327,7 @@@ M:      Todd Kjos <[email protected]
  M:    Martijn Coenen <[email protected]>
  M:    Joel Fernandes <[email protected]>
  M:    Christian Brauner <[email protected]>
 -M:    Hridya Valsaraju <hridya@google.com>
 +M:    Carlos Llamas <cmllamas@google.com>
  M:    Suren Baghdasaryan <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -2540,6 -2538,7 +2538,7 @@@ W:      http://www.armlinux.org.uk
  ARM/QUALCOMM SUPPORT
  M:    Andy Gross <[email protected]>
  M:    Bjorn Andersson <[email protected]>
+ R:    Konrad Dybcio <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
@@@ -3617,16 -3616,18 +3616,18 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
  F:    drivers/iio/accel/bma400*
  
- BPF (Safe dynamic programs and tools)
+ BPF [GENERAL] (Safe Dynamic Programs and Tools)
  M:    Alexei Starovoitov <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  M:    Andrii Nakryiko <[email protected]>
- R:    Martin KaFai Lau <[email protected]>
- R:    Song Liu <song[email protected]>
+ R:    Martin KaFai Lau <[email protected]>
+ R:    Song Liu <song@kernel.org>
  R:    Yonghong Song <[email protected]>
  R:    John Fastabend <[email protected]>
  R:    KP Singh <[email protected]>
- L:    [email protected]
+ R:    Stanislav Fomichev <[email protected]>
+ R:    Hao Luo <[email protected]>
+ R:    Jiri Olsa <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://bpf.io/
@@@ -3658,12 -3659,9 +3659,9 @@@ F:     scripts/pahole-version.s
  F:    tools/bpf/
  F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
- N:    bpf
- K:    bpf
  
  BPF JIT for ARM
  M:    Shubham Bansal <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Odd Fixes
  F:    arch/arm/net/
@@@ -3672,7 -3670,6 +3670,6 @@@ BPF JIT for ARM6
  M:    Daniel Borkmann <[email protected]>
  M:    Alexei Starovoitov <[email protected]>
  M:    Zi Shen Lim <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/arm64/net/
@@@ -3680,14 -3677,12 +3677,12 @@@
  BPF JIT for MIPS (32-BIT AND 64-BIT)
  M:    Johan Almbladh <[email protected]>
  M:    Paul Burton <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/mips/net/
  
  BPF JIT for NFP NICs
  M:    Jakub Kicinski <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Odd Fixes
  F:    drivers/net/ethernet/netronome/nfp/bpf/
@@@ -3695,7 -3690,6 +3690,6 @@@
  BPF JIT for POWERPC (32-BIT AND 64-BIT)
  M:    Naveen N. Rao <[email protected]>
  M:    Michael Ellerman <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/powerpc/net/
@@@ -3703,7 -3697,6 +3697,6 @@@
  BPF JIT for RISC-V (32-bit)
  M:    Luke Nelson <[email protected]>
  M:    Xi Wang <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/riscv/net/
@@@ -3711,7 -3704,6 +3704,6 @@@ X:      arch/riscv/net/bpf_jit_comp64.
  
  BPF JIT for RISC-V (64-bit)
  M:    Björn Töpel <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/riscv/net/
@@@ -3721,7 -3713,6 +3713,6 @@@ BPF JIT for S39
  M:    Ilya Leoshkevich <[email protected]>
  M:    Heiko Carstens <[email protected]>
  M:    Vasily Gorbik <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/s390/net/
@@@ -3729,14 -3720,12 +3720,12 @@@ X:   arch/s390/net/pnet.
  
  BPF JIT for SPARC (32-BIT AND 64-BIT)
  M:    David S. Miller <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Odd Fixes
  F:    arch/sparc/net/
  
  BPF JIT for X86 32-BIT
  M:    Wang YanQing <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Odd Fixes
  F:    arch/x86/net/bpf_jit_comp32.c
@@@ -3744,13 -3733,60 +3733,60 @@@
  BPF JIT for X86 64-BIT
  M:    Alexei Starovoitov <[email protected]>
  M:    Daniel Borkmann <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/x86/net/
  X:    arch/x86/net/bpf_jit_comp32.c
  
- BPF LSM (Security Audit and Enforcement using BPF)
+ BPF [CORE]
+ M:    Alexei Starovoitov <[email protected]>
+ M:    Daniel Borkmann <[email protected]>
+ R:    John Fastabend <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    kernel/bpf/verifier.c
+ F:    kernel/bpf/tnum.c
+ F:    kernel/bpf/core.c
+ F:    kernel/bpf/syscall.c
+ F:    kernel/bpf/dispatcher.c
+ F:    kernel/bpf/trampoline.c
+ F:    include/linux/bpf*
+ F:    include/linux/filter.h
+ 
+ BPF [BTF]
+ M:    Martin KaFai Lau <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    kernel/bpf/btf.c
+ F:    include/linux/btf*
+ 
+ BPF [TRACING]
+ M:    Song Liu <[email protected]>
+ R:    Jiri Olsa <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    kernel/trace/bpf_trace.c
+ F:    kernel/bpf/stackmap.c
+ 
+ BPF [NETWORKING] (tc BPF, sock_addr)
+ M:    Martin KaFai Lau <[email protected]>
+ M:    Daniel Borkmann <[email protected]>
+ R:    John Fastabend <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ S:    Maintained
+ F:    net/core/filter.c
+ F:    net/sched/act_bpf.c
+ F:    net/sched/cls_bpf.c
+ 
+ BPF [NETWORKING] (struct_ops, reuseport)
+ M:    Martin KaFai Lau <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ S:    Maintained
+ F:    kernel/bpf/bpf_struct*
+ 
+ BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
  M:    KP Singh <[email protected]>
  R:    Florent Revest <[email protected]>
  R:    Brendan Jackman <[email protected]>
@@@ -3761,7 -3797,27 +3797,27 @@@ F:    include/linux/bpf_lsm.
  F:    kernel/bpf/bpf_lsm.c
  F:    security/bpf/
  
- BPF L7 FRAMEWORK
+ BPF [STORAGE & CGROUPS]
+ M:    Martin KaFai Lau <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    kernel/bpf/cgroup.c
+ F:    kernel/bpf/*storage.c
+ F:    kernel/bpf/bpf_lru*
+ 
+ BPF [RINGBUF]
+ M:    Andrii Nakryiko <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    kernel/bpf/ringbuf.c
+ 
+ BPF [ITERATOR]
+ M:    Yonghong Song <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    kernel/bpf/*iter.c
+ 
+ BPF [L7 FRAMEWORK] (sockmap)
  M:    John Fastabend <[email protected]>
  M:    Jakub Sitnicki <[email protected]>
  L:    [email protected]
@@@ -3774,13 -3830,31 +3830,31 @@@ F:   net/ipv4/tcp_bpf.
  F:    net/ipv4/udp_bpf.c
  F:    net/unix/unix_bpf.c
  
- BPFTOOL
+ BPF [LIBRARY] (libbpf)
+ M:    Andrii Nakryiko <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    tools/lib/bpf/
+ 
+ BPF [TOOLING] (bpftool)
  M:    Quentin Monnet <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    kernel/bpf/disasm.*
  F:    tools/bpf/bpftool/
  
+ BPF [SELFTESTS] (Test Runners & Infrastructure)
+ M:    Andrii Nakryiko <[email protected]>
+ R:    Mykola Lysenko <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    tools/testing/selftests/bpf/
+ 
+ BPF [MISC]
+ L:    [email protected]
+ S:    Odd Fixes
+ K:    (?:\b|_)bpf(?:\b|_)
+ 
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Michael Chan <[email protected]>
  L:    [email protected]
@@@ -4976,6 -5050,7 +5050,7 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
  F:    Documentation/devicetree/bindings/clock/
  F:    drivers/clk/
+ F:    include/dt-bindings/clock/
  F:    include/linux/clk-pr*
  F:    include/linux/clk/
  F:    include/linux/of_clk.h
@@@ -5026,7 -5101,7 +5101,7 @@@ COMPUTE EXPRESS LINK (CXL
  M:    Alison Schofield <[email protected]>
  M:    Vishal Verma <[email protected]>
  M:    Ira Weiny <[email protected]>
- M:    Ben Widawsky <b[email protected]>
+ M:    Ben Widawsky <b[email protected]>
  M:    Dan Williams <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5978,7 -6053,6 +6053,6 @@@ DMA MAPPING HELPER
  M:    Christoph Hellwig <[email protected]>
  M:    Marek Szyprowski <[email protected]>
  R:    Robin Murphy <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    http://git.infradead.org/users/hch/dma-mapping.git
@@@ -5991,7 -6065,6 +6065,6 @@@ F:      kernel/dma
  
  DMA MAPPING BENCHMARK
  M:    Xiang Chen <[email protected]>
- L:    [email protected]
  L:    [email protected]
  F:    kernel/dma/map_benchmark.c
  F:    tools/testing/selftests/dma/
@@@ -7576,7 -7649,6 +7649,6 @@@ F:      drivers/gpu/drm/exynos/exynos_dp
  
  EXYNOS SYSMMU (IOMMU) driver
  M:    Marek Szyprowski <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/iommu/exynos-iommu.c
@@@ -7835,13 -7907,6 +7907,13 @@@ F:    Documentation/fpga
  F:    drivers/fpga/
  F:    include/linux/fpga/
  
 +INTEL MAX10 BMC SECURE UPDATES
 +M:    Russ Weight <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
 +F:    drivers/fpga/intel-m10-bmc-sec-update.c
 +
  FPU EMULATOR
  M:    Bill Metzenthen <[email protected]>
  S:    Maintained
@@@ -9842,7 -9907,10 +9914,10 @@@ INTEL ASoC DRIVER
  M:    Cezary Rojewski <[email protected]>
  M:    Pierre-Louis Bossart <[email protected]>
  M:    Liam Girdwood <[email protected]>
- M:    Jie Yang <[email protected]>
+ M:    Peter Ujfalusi <[email protected]>
+ M:    Bard Liao <[email protected]>
+ M:    Ranjani Sridharan <[email protected]>
+ M:    Kai Vehmanen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/intel/
@@@ -10005,7 -10073,6 +10080,6 @@@ F:   drivers/hid/intel-ish-hid
  INTEL IOMMU (VT-d)
  M:    David Woodhouse <[email protected]>
  M:    Lu Baolu <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@ -10385,7 -10452,6 +10459,6 @@@ F:   include/linux/iomap.
  IOMMU DRIVERS
  M:    Joerg Roedel <[email protected]>
  M:    Will Deacon <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@ -12545,7 -12611,6 +12618,6 @@@ F:   drivers/i2c/busses/i2c-mt65xx.
  
  MEDIATEK IOMMU DRIVER
  M:    Yong Wu <[email protected]>
- L:    [email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -13164,14 -13229,6 +13236,14 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
  F:    drivers/mtd/nand/raw/atmel/*
  
 +MICROCHIP OTPC DRIVER
 +M:    Claudiu Beznea <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/nvmem/microchip,sama7g5-otpc.yaml
 +F:    drivers/nvmem/microchip-otpc.c
 +F:    include/dt-bindings/nvmem/microchip,sama7g5-otpc.h
 +
  MICROCHIP PWM DRIVER
  M:    Claudiu Beznea <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -14412,9 -14469,8 +14484,8 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/tfa989x.c
  
  NXP-NCI NFC DRIVER
- R:    Charles Gorand <[email protected]>
  L:    [email protected] (subscribers-only)
- S:    Supported
+ S:    Orphan
  F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
  F:    drivers/nfc/nxp-nci
  
@@@ -15803,7 -15859,7 +15874,7 @@@ F:   drivers/pinctrl/freescale
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <[email protected]>
  M:    Andy Shevchenko <[email protected]>
- S:    Maintained
+ S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  F:    drivers/pinctrl/intel/
  
@@@ -16325,7 -16381,7 +16396,7 @@@ F:   drivers/crypto/qat
  
  QCOM AUDIO (ASoC) DRIVERS
  M:    Srinivas Kandagatla <[email protected]>
- M:    Banajit Goswami <bgoswami@codeaurora.org>
+ M:    Banajit Goswami <bgoswami@quicinc.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/codecs/lpass-va-macro.c
@@@ -16606,7 -16662,6 +16677,6 @@@ F:   drivers/i2c/busses/i2c-qcom-cci.
  
  QUALCOMM IOMMU
  M:    Rob Clark <[email protected]>
- L:    [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -18120,6 -18175,7 +18190,7 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Karsten Graul <[email protected]>
+ M:    Wenjia Zhang <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -18752,8 -18808,10 +18823,10 @@@ F: sound/soc
  SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
  M:    Pierre-Louis Bossart <[email protected]>
  M:    Liam Girdwood <[email protected]>
+ M:    Peter Ujfalusi <[email protected]>
+ M:    Bard Liao <[email protected]>
  M:    Ranjani Sridharan <[email protected]>
- M:    Kai Vehmanen <[email protected]>
+ R:    Kai Vehmanen <[email protected]>
  M:    Daniel Baluta <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -19232,7 -19290,6 +19305,6 @@@ F:   arch/x86/boot/video
  
  SWIOTLB SUBSYSTEM
  M:    Christoph Hellwig <[email protected]>
- L:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    http://git.infradead.org/users/hch/dma-mapping.git
@@@ -21133,7 -21190,6 +21205,7 @@@ M:   Jason Wang <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-vdpa
 +F:    Documentation/ABI/testing/sysfs-class-vduse
  F:    Documentation/devicetree/bindings/virtio/
  F:    drivers/block/virtio_blk.c
  F:    drivers/crypto/virtio/
@@@ -21909,7 -21965,6 +21981,6 @@@ XEN SWIOTLB SUBSYSTE
  M:    Juergen Gross <[email protected]>
  M:    Stefano Stabellini <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
- L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/x86/xen/*swiotlb*