]> Git Repo - linux.git/commitdiff
Merge 5.19-rc4 into char-misc-next
authorGreg Kroah-Hartman <[email protected]>
Mon, 27 Jun 2022 08:02:04 +0000 (10:02 +0200)
committerGreg Kroah-Hartman <[email protected]>
Mon, 27 Jun 2022 08:02:04 +0000 (10:02 +0200)
We need the IIO fixes in here as well.

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

diff --combined MAINTAINERS
index 76649c75fc726331980e66eb5d98cf5efc768d10,fe5daf14150136331d4ff1549397804d184ac7f3..74d9b27a9a521681c386ed6d15e10e0c3712d8c9
@@@ -427,6 -427,7 +427,7 @@@ ACPI VIOT DRIVE
  M:    Jean-Philippe Brucker <[email protected]>
  L:    [email protected]
  L:    [email protected]
+ L:    [email protected]
  S:    Maintained
  F:    drivers/acpi/viot.c
  F:    include/linux/acpi_viot.h
@@@ -960,6 -961,7 +961,7 @@@ 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
  F:    drivers/iommu/amd/
@@@ -2467,6 -2469,7 +2469,7 @@@ ARM/NXP S32G ARCHITECTUR
  M:    Chester Lin <[email protected]>
  R:    Andreas Färber <[email protected]>
  R:    Matthias Brugger <[email protected]>
+ R:    NXP S32 Linux Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm64/boot/dts/freescale/s32g*.dts*
@@@ -3662,7 -3665,7 +3665,7 @@@ BPF JIT for AR
  M:    Shubham Bansal <[email protected]>
  L:    [email protected]
  L:    [email protected]
- S:    Maintained
+ S:    Odd Fixes
  F:    arch/arm/net/
  
  BPF JIT for ARM64
@@@ -3686,14 -3689,15 +3689,15 @@@ BPF JIT for NFP NIC
  M:    Jakub Kicinski <[email protected]>
  L:    [email protected]
  L:    [email protected]
- S:    Supported
+ S:    Odd Fixes
  F:    drivers/net/ethernet/netronome/nfp/bpf/
  
  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:    Maintained
+ S:    Supported
  F:    arch/powerpc/net/
  
  BPF JIT for RISC-V (32-bit)
@@@ -3719,7 -3723,7 +3723,7 @@@ M:      Heiko Carstens <[email protected]
  M:    Vasily Gorbik <[email protected]>
  L:    [email protected]
  L:    [email protected]
- S:    Maintained
+ S:    Supported
  F:    arch/s390/net/
  X:    arch/s390/net/pnet.c
  
@@@ -3727,14 -3731,14 +3731,14 @@@ BPF JIT for SPARC (32-BIT AND 64-BIT
  M:    David S. Miller <[email protected]>
  L:    [email protected]
  L:    [email protected]
- S:    Maintained
+ 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:    Maintained
+ S:    Odd Fixes
  F:    arch/x86/net/bpf_jit_comp32.c
  
  BPF JIT for X86 64-BIT
@@@ -3757,6 -3761,19 +3761,19 @@@ F:    include/linux/bpf_lsm.
  F:    kernel/bpf/bpf_lsm.c
  F:    security/bpf/
  
+ BPF L7 FRAMEWORK
+ M:    John Fastabend <[email protected]>
+ M:    Jakub Sitnicki <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ S:    Maintained
+ F:    include/linux/skmsg.h
+ F:    net/core/skmsg.c
+ F:    net/core/sock_map.c
+ F:    net/ipv4/tcp_bpf.c
+ F:    net/ipv4/udp_bpf.c
+ F:    net/unix/unix_bpf.c
  BPFTOOL
  M:    Quentin Monnet <[email protected]>
  L:    [email protected]
@@@ -3796,12 -3813,12 +3813,12 @@@ N:   bcmbc
  N:    bcm[9]?47622
  
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
- M:    Nicolas Saenz Julienne <[email protected]>
+ M:    Florian Fainelli <[email protected]>
  R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git
+ T:    git git://github.com/broadcom/stblinux.git
  F:    Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
  F:    drivers/pci/controller/pcie-brcmstb.c
  F:    drivers/staging/vc04_services
@@@ -5962,6 -5979,7 +5979,7 @@@ 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
  T:    git git://git.infradead.org/users/hch/dma-mapping.git
@@@ -5974,6 -5992,7 +5992,7 @@@ 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/
  
@@@ -7558,6 -7577,7 +7577,7 @@@ 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
  
@@@ -7815,13 -7835,6 +7835,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
@@@ -8486,6 -8499,7 +8506,7 @@@ F:      Documentation/devicetree/bindings/gp
  F:    Documentation/driver-api/gpio/
  F:    drivers/gpio/
  F:    include/asm-generic/gpio.h
+ F:    include/dt-bindings/gpio/
  F:    include/linux/gpio.h
  F:    include/linux/gpio/
  F:    include/linux/of_gpio.h
@@@ -9139,6 -9153,7 +9160,7 @@@ F:      drivers/media/platform/st/sti/hv
  
  HWPOISON MEMORY FAILURE HANDLING
  M:    Naoya Horiguchi <[email protected]>
+ R:    Miaohe Lin <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    mm/hwpoison-inject.c
@@@ -9984,6 -9999,7 +10006,7 @@@ 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
  F:    drivers/iommu/intel/
@@@ -10363,6 -10379,7 +10386,7 @@@ IOMMU DRIVER
  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
  F:    Documentation/devicetree/bindings/iommu/
@@@ -10839,6 -10856,7 +10863,7 @@@ M:   Marc Zyngier <[email protected]
  R:    James Morse <[email protected]>
  R:    Alexandru Elisei <[email protected]>
  R:    Suzuki K Poulose <[email protected]>
+ R:    Oliver Upton <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -10905,28 -10923,51 +10930,51 @@@ F:        tools/testing/selftests/kvm/*/s390x
  F:    tools/testing/selftests/kvm/s390x/
  
  KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
+ M:    Sean Christopherson <[email protected]>
  M:    Paolo Bonzini <[email protected]>
- R:    Sean Christopherson <[email protected]>
- R:    Vitaly Kuznetsov <[email protected]>
- R:    Wanpeng Li <[email protected]>
- R:    Jim Mattson <[email protected]>
- R:    Joerg Roedel <[email protected]>
  L:    [email protected]
  S:    Supported
- W:    http://www.linux-kvm.org
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
  F:    arch/x86/include/asm/kvm*
- F:    arch/x86/include/asm/pvclock-abi.h
  F:    arch/x86/include/asm/svm.h
  F:    arch/x86/include/asm/vmx*.h
  F:    arch/x86/include/uapi/asm/kvm*
  F:    arch/x86/include/uapi/asm/svm.h
  F:    arch/x86/include/uapi/asm/vmx.h
- F:    arch/x86/kernel/kvm.c
- F:    arch/x86/kernel/kvmclock.c
  F:    arch/x86/kvm/
  F:    arch/x86/kvm/*/
  
+ KVM PARAVIRT (KVM/paravirt)
+ M:    Paolo Bonzini <[email protected]>
+ R:    Wanpeng Li <[email protected]>
+ R:    Vitaly Kuznetsov <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+ F:    arch/x86/kernel/kvm.c
+ F:    arch/x86/kernel/kvmclock.c
+ F:    arch/x86/include/asm/pvclock-abi.h
+ F:    include/linux/kvm_para.h
+ F:    include/uapi/linux/kvm_para.h
+ F:    include/uapi/asm-generic/kvm_para.h
+ F:    include/asm-generic/kvm_para.h
+ F:    arch/um/include/asm/kvm_para.h
+ F:    arch/x86/include/asm/kvm_para.h
+ F:    arch/x86/include/uapi/asm/kvm_para.h
+ KVM X86 HYPER-V (KVM/hyper-v)
+ M:    Vitaly Kuznetsov <[email protected]>
+ M:    Sean Christopherson <[email protected]>
+ M:    Paolo Bonzini <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+ F:    arch/x86/kvm/hyperv.*
+ F:    arch/x86/kvm/kvm_onhyperv.*
+ F:    arch/x86/kvm/svm/hyperv.*
+ F:    arch/x86/kvm/svm/svm_onhyperv.*
+ F:    arch/x86/kvm/vmx/evmcs.*
  KERNFS
  M:    Greg Kroah-Hartman <[email protected]>
  M:    Tejun Heo <[email protected]>
@@@ -11105,20 -11146,6 +11153,6 @@@ S:  Maintaine
  F:    include/net/l3mdev.h
  F:    net/l3mdev
  
- L7 BPF FRAMEWORK
- M:    John Fastabend <[email protected]>
- M:    Daniel Borkmann <[email protected]>
- M:    Jakub Sitnicki <[email protected]>
- L:    [email protected]
- L:    [email protected]
- S:    Maintained
- F:    include/linux/skmsg.h
- F:    net/core/skmsg.c
- F:    net/core/sock_map.c
- F:    net/ipv4/tcp_bpf.c
- F:    net/ipv4/udp_bpf.c
- F:    net/unix/unix_bpf.c
  LANDLOCK SECURITY MODULE
  M:    Mickaël Salaün <[email protected]>
  L:    [email protected]
@@@ -11598,6 -11625,7 +11632,7 @@@ F:   drivers/gpu/drm/bridge/lontium-lt891
  LOONGARCH
  M:    Huacai Chen <[email protected]>
  R:    WANG Xuerui <[email protected]>
+ L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git
  F:    arch/loongarch/
@@@ -12511,6 -12539,7 +12546,7 @@@ 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
  F:    Documentation/devicetree/bindings/iommu/mediatek*
@@@ -12853,9 -12882,8 +12889,8 @@@ M:   Andrew Morton <akpm@linux-foundation
  L:    [email protected]
  S:    Maintained
  W:    http://www.linux-mm.org
- T:    quilt https://ozlabs.org/~akpm/mmotm/
- T:    quilt https://ozlabs.org/~akpm/mmots/
- T:    git git://github.com/hnaz/linux-mm.git
+ T:    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+ T:    quilt git://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new
  F:    include/linux/gfp.h
  F:    include/linux/memory_hotplug.h
  F:    include/linux/mm.h
@@@ -12865,6 -12893,18 +12900,18 @@@ F: include/linux/vmalloc.
  F:    mm/
  F:    tools/testing/selftests/vm/
  
+ MEMORY HOT(UN)PLUG
+ M:    David Hildenbrand <[email protected]>
+ M:    Oscar Salvador <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/admin-guide/mm/memory-hotplug.rst
+ F:    Documentation/core-api/memory-hotplug.rst
+ F:    drivers/base/memory.c
+ F:    include/linux/memory_hotplug.h
+ F:    mm/memory_hotplug.c
+ F:    tools/testing/selftests/memory-hotplug/
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    Miquel Raynal <[email protected]>
  M:    Richard Weinberger <[email protected]>
@@@ -13961,7 -14001,6 +14008,6 @@@ F:   net/ipv6/tcp*.
  NETWORKING [TLS]
  M:    Boris Pismenny <[email protected]>
  M:    John Fastabend <[email protected]>
- M:    Daniel Borkmann <[email protected]>
  M:    Jakub Kicinski <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14270,7 -14309,7 +14316,7 @@@ F:   drivers/iio/gyro/fxas21002c_i2c.
  F:    drivers/iio/gyro/fxas21002c_spi.c
  
  NXP i.MX CLOCK DRIVERS
- M:    Abel Vesa <abel[email protected]>
+ M:    Abel Vesa <abel[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -14878,6 -14917,7 +14924,7 @@@ F:   include/dt-bindings
  
  OPENCOMPUTE PTP CLOCK DRIVER
  M:    Jonathan Lemon <[email protected]>
+ M:    Vadim Fedorenko <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/ptp/ptp_ocp.c
@@@ -16497,7 -16537,7 +16544,7 @@@ F:   Documentation/devicetree/bindings/op
  F:    drivers/cpufreq/qcom-cpufreq-nvmem.c
  
  QUALCOMM CRYPTO DRIVERS
- M:    Thara Gopinath <thara.gopinath@linaro.org>
+ M:    Thara Gopinath <thara.gopinath@gmail.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -16552,6 -16592,7 +16599,7 @@@ 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
  F:    drivers/iommu/arm/arm-smmu/qcom_iommu.c
@@@ -16607,7 -16648,7 +16655,7 @@@ F:   include/linux/if_rmnet.
  
  QUALCOMM TSENS THERMAL DRIVER
  M:    Amit Kucheria <[email protected]>
- M:    Thara Gopinath <thara.gopinath@linaro.org>
+ M:    Thara Gopinath <thara.gopinath@gmail.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -19177,6 -19218,7 +19225,7 @@@ 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
  T:    git git://git.infradead.org/users/hch/dma-mapping.git
@@@ -20721,6 -20763,7 +20770,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/usb/
  F:    Documentation/usb/
  F:    drivers/usb/
+ F:    include/dt-bindings/usb/
  F:    include/linux/usb.h
  F:    include/linux/usb/
  
@@@ -21851,6 -21894,7 +21901,7 @@@ 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*
  F:    drivers/xen/*swiotlb*
This page took 0.177396 seconds and 4 git commands to generate.