Merge branches 'edac-spr', 'edac-igen6' and 'edac-misc' into edac-updates-for-v5.11

Signed-off-by: Borislav Petkov <[email protected]>

diff --combined MAINTAINERS
index 6f474153dbec578618dd3d8f75b2702f810879ad,86eb55697c8b9152b7aabd8778e6cb5e6d935d60,86eb55697c8b9152b7aabd8778e6cb5e6d935d60,aee8921cb470611b12f40beabb70b219fd31f7eb..4168301b159f4803a4c955def1d1dfb61f732442
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
+++ b/MAINTAINERS
@@@@@ -934,7 -934,7 -934,7 -934,7 +934,7 @@@@@ M:       Evan Quan <[email protected]
    L:  [email protected]
    S:  Supported
    T:  git git://people.freedesktop.org/~agd5f/linux
 ---F:  drivers/gpu/drm/amd/powerplay/
 +++F:  drivers/gpu/drm/amd/pm/powerplay/
    
    AMD SEATTLE DEVICE TREE SUPPORT
    M:  Brijesh Singh <[email protected]>
@@@@@ -978,7 -978,7 -978,7 -978,7 +978,7 @@@@@ M:       Michael Hennerich <Michael.Hennerich
    L:  [email protected]
    S:  Supported
    W:  http://ez.analog.com/community/linux-device-drivers
 ---F:  Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt
 +++F:  Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
    F:  drivers/iio/adc/ad7768-1.c
    
    ANALOG DEVICES INC AD7780 DRIVER
@@@@@ -1279,7 -1279,7 -1279,7 -1279,7 +1279,7 @@@@@ M:  Igor Russkikh <[email protected]
    L:  [email protected]
    S:  Supported
    W:  https://www.marvell.com/
 ---Q:  http://patchwork.ozlabs.org/project/netdev/list/
 +++Q:  https://patchwork.kernel.org/project/netdevbpf/list/
    F:  Documentation/networking/device_drivers/ethernet/aquantia/atlantic.rst
    F:  drivers/net/ethernet/aquantia/atlantic/
    
@@@@@ -1546,7 -1546,6 -1546,6 -1546,6 +1546,7 @@@@@ F:  drivers/clk/sunxi
    ARM/Allwinner sunXi SoC support
    M:  Maxime Ripard <[email protected]>
    M:  Chen-Yu Tsai <[email protected]>
 +++R:  Jernej Skrabec <[email protected]>
    L:  [email protected] (moderated for non-subscribers)
    S:  Maintained
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
@@@@@ -1724,13 -1723,11 -1723,11 -1723,11 +1724,13 @@@@@ F:     arch/arm/mach-ep93xx/micro9.
    
    ARM/CORESIGHT FRAMEWORK AND DRIVERS
    M:  Mathieu Poirier <[email protected]>
 ---R:  Suzuki K Poulose <[email protected]>
 +++M:  Suzuki K Poulose <[email protected]>
    R:  Mike Leach <[email protected]>
 +++R:  Leo Yan <[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/coresight/linux.git
    F:  Documentation/ABI/testing/sysfs-bus-coresight-devices-*
    F:  Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
    F:  Documentation/devicetree/bindings/arm/coresight-cti.yaml
@@@@@ -1997,6 -1994,7 -1994,7 -1994,7 +1997,6 @@@@@ N:  lpc18x
    
    ARM/LPC32XX SOC SUPPORT
    M:  Vladimir Zapolskiy <[email protected]>
 ---M:  Sylvain Lemieux <[email protected]>
    L:  [email protected] (moderated for non-subscribers)
    S:  Maintained
    T:  git git://github.com/vzapolskiy/linux-lpc32xx.git
@@@@@ -2014,6 -2012,7 -2012,7 -2012,7 +2014,6 @@@@@ M:  Philipp Zabel <[email protected]
    S:  Maintained
    
    ARM/Marvell Dove/MV78xx0/Orion SOC support
 ---M:  Jason Cooper <[email protected]>
    M:  Andrew Lunn <[email protected]>
    M:  Sebastian Hesselbarth <[email protected]>
    M:  Gregory Clement <[email protected]>
@@@@@ -2030,6 -2029,7 -2029,7 -2029,7 +2030,6 @@@@@ F:  arch/arm/plat-orion
    F:  drivers/soc/dove/
    
    ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SOC support
 ---M:  Jason Cooper <[email protected]>
    M:  Andrew Lunn <[email protected]>
    M:  Gregory Clement <[email protected]>
    M:  Sebastian Hesselbarth <[email protected]>
@@@@@ -2374,7 -2374,8 -2374,8 -2374,8 +2374,7 @@@@@ F:  drivers/i2c/busses/i2c-rk3x.
    F:  sound/soc/rockchip/
    N:  rockchip
    
 ---ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
 ---M:  Kukjin Kim <[email protected]>
 +++ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
    M:  Krzysztof Kozlowski <[email protected]>
    L:  [email protected] (moderated for non-subscribers)
    L:  [email protected]
@@@@@ -2403,7 -2404,15 -2404,15 -2404,15 +2403,7 @@@@@ N:       s3c241
    N:  s3c64xx
    N:  s5pv210
    
 ---ARM/SAMSUNG MOBILE MACHINE SUPPORT
 ---M:  Kyungmin Park <[email protected]>
 ---L:  [email protected] (moderated for non-subscribers)
 ---S:  Maintained
 ---F:  arch/arm/mach-s5pv210/
 ---
    ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
 ---M:  Kyungmin Park <[email protected]>
 ---M:  Kamil Debski <[email protected]>
    M:  Andrzej Hajda <[email protected]>
    L:  [email protected]
    L:  [email protected]
@@@@@ -2428,6 -2437,9 -2437,9 -2437,9 +2428,6 @@@@@ S:  Maintaine
    F:  drivers/media/platform/s5p-jpeg/
    
    ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 ---M:  Kyungmin Park <[email protected]>
 ---M:  Kamil Debski <[email protected]>
 ---M:  Jeongtae Park <[email protected]>
    M:  Andrzej Hajda <[email protected]>
    L:  [email protected]
    L:  [email protected]
@@@@@ -2474,7 -2486,7 -2486,7 -2486,7 +2474,7 @@@@@ F:  drivers/clk/socfpga
    ARM/SOCFPGA EDAC SUPPORT
    M:  Dinh Nguyen <[email protected]>
    S:  Maintained
--- F:  drivers/edac/altera_edac.
+++ F:  drivers/edac/altera_edac.[ch]
    
    ARM/SPREADTRUM SoC SUPPORT
    M:  Orson Zhai <[email protected]>
@@@@@ -2630,8 -2642,10 -2642,10 -2642,10 +2630,8 @@@@@ F:       drivers/pinctrl/visconti
    N:  visconti
    
    ARM/UNIPHIER ARCHITECTURE
 ---M:  Masahiro Yamada <[email protected]>
    L:  [email protected] (moderated for non-subscribers)
 ---S:  Maintained
 ---T:  git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
 +++S:  Orphan
    F:  Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
    F:  Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml
    F:  Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
@@@@@ -3232,10 -3246,10 -3246,10 -3246,10 +3232,10 @@@@@ F:     drivers/iio/accel/bma400
    BPF (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 <[email protected]>
    R:  Yonghong Song <[email protected]>
 ---R:  Andrii Nakryiko <[email protected]>
    R:  John Fastabend <[email protected]>
    R:  KP Singh <[email protected]>
    L:  [email protected]
@@@@@ -3355,17 -3369,6 -3369,6 -3369,6 +3355,17 @@@@@ S:        Supporte
    F:  arch/x86/net/
    X:  arch/x86/net/bpf_jit_comp32.c
    
 +++BPF LSM (Security Audit and Enforcement using BPF)
 +++M:  KP Singh <[email protected]>
 +++R:  Florent Revest <[email protected]>
 +++R:  Brendan Jackman <[email protected]>
 +++L:  [email protected]
 +++S:  Maintained
 +++F:  Documentation/bpf/bpf_lsm.rst
 +++F:  include/linux/bpf_lsm.h
 +++F:  kernel/bpf/bpf_lsm.c
 +++F:  security/bpf/
 +++
    BROADCOM B44 10/100 ETHERNET DRIVER
    M:  Michael Chan <[email protected]>
    L:  [email protected]
@@@@@ -3538,12 -3541,11 -3541,11 -3541,11 +3538,12 @@@@@ BROADCOM BRCM80211 IEEE802.11n WIRELES
    M:  Arend van Spriel <[email protected]>
    M:  Franky Lin <[email protected]>
    M:  Hante Meuleman <[email protected]>
 ---M:  Chi-Hsien Lin <[email protected]>
 ---M:  Wright Feng <[email protected]>
 +++M:  Chi-hsien Lin <[email protected]>
 +++M:  Wright Feng <[email protected]>
 +++M:  Chung-hsien Hsu <[email protected]>
    L:  [email protected]
    L:  [email protected]
 ---L:  brcm80211-dev-list@cypress.com
 +++L:  SHA-cyfmac-dev-list@infineon.com
    S:  Supported
    F:  drivers/net/wireless/broadcom/brcm80211/
    
@@@@@ -3858,7 -3860,7 -3860,7 -3860,7 +3858,7 @@@@@ M:  Roger Quadros <[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.txt
 +++F:  Documentation/devicetree/bindings/usb/cdns,usb3.yaml
    F:  drivers/usb/cdns3/
    
    CADET FM/AM RADIO RECEIVER DRIVER
@@@@@ -4285,7 -4287,6 -4287,6 -4287,6 +4285,7 @@@@@ B:  https://github.com/ClangBuiltLinux/l
    C:  irc://chat.freenode.net/clangbuiltlinux
    F:  Documentation/kbuild/llvm.rst
    F:  scripts/clang-tools/
 +++F:  scripts/lld-version.sh
    K:  \b(?i:clang|llvm)\b
    
    CLEANCACHE API
@@@@@ -4712,7 -4713,7 -4713,7 -4713,7 +4712,7 @@@@@ T:  git git://linuxtv.org/anttip/media_t
    F:  drivers/media/dvb-frontends/cxd2820r*
    
    CXGB3 ETHERNET DRIVER (CXGB3)
 ---M:  Vishal Kulkarni <vishal@chelsio.com>
 +++M:  Raju Rangoju <rajur@chelsio.com>
    L:  [email protected]
    S:  Supported
    W:  http://www.chelsio.com
@@@@@ -4744,7 -4745,7 -4745,7 -4745,7 +4744,7 @@@@@ W:  http://www.chelsio.co
    F:  drivers/net/ethernet/chelsio/inline_crypto/
    
    CXGB4 ETHERNET DRIVER (CXGB4)
 ---M:  Vishal Kulkarni <vishal@chelsio.com>
 +++M:  Raju Rangoju <rajur@chelsio.com>
    L:  [email protected]
    S:  Supported
    W:  http://www.chelsio.com
@@@@@ -4766,7 -4767,7 -4767,7 -4767,7 +4766,7 @@@@@ F:  drivers/infiniband/hw/cxgb4
    F:  include/uapi/rdma/cxgb4-abi.h
    
    CXGB4VF ETHERNET DRIVER (CXGB4VF)
 ---M:  Vishal Kulkarni <vishal@gmail.com>
 +++M:  Raju Rangoju <rajur@chelsio.com>
    L:  [email protected]
    S:  Supported
    W:  http://www.chelsio.com
@@@@@ -5005,8 -5006,9 -5006,9 -5006,9 +5005,8 @@@@@ T:  git git://linuxtv.org/media_tree.gi
    F:  drivers/media/platform/sti/delta
    
    DENALI NAND DRIVER
 ---M:  Masahiro Yamada <[email protected]>
    L:  [email protected]
 ---S:  Supported
 +++S:  Orphan
    F:  drivers/mtd/nand/raw/denali*
    
    DESIGNWARE EDMA CORE IP DRIVER
@@@@@ -6351,6 -6353,13 -6353,13 -6353,6 +6351,13 @@@@@ L:       [email protected]
    S:  Maintained
    F:  drivers/edac/ie31200_edac.c
    
+  +EDAC-IGEN6
+  +M:  Tony Luck <[email protected]>
+  +R:  Qiuxu Zhuo <[email protected]>
+  +L:  [email protected]
+  +S:  Maintained
+  +F:  drivers/edac/igen6_edac.c
+  +
    EDAC-MPC85XX
    M:  Johannes Thumshirn <[email protected]>
    L:  [email protected]
@@@@@ -6400,7 -6409,7 -6409,7 -6402,7 +6407,7 @@@@@ EDAC-SKYLAK
    M:  Tony Luck <[email protected]>
    L:  [email protected]
    S:  Maintained
--- F:  drivers/edac/skx_*.c
+++ F:  drivers/edac/skx_*.[ch]
    
    EDAC-TI
    M:  Tero Kristo <[email protected]>
@@@@@ -6616,7 -6625,6 -6625,6 -6618,6 +6623,7 @@@@@ Q:  http://patchwork.ozlabs.org/project/
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
    F:  Documentation/filesystems/ext4/
    F:  fs/ext4/
 +++F:  include/trace/events/ext4.h
    
    Extended Verification Module (EVM)
    M:  Mimi Zohar <[email protected]>
@@@@@ -7919,7 -7927,7 -7927,7 -7920,7 +7926,7 @@@@@ HISILICON LPC BUS DRIVE
    M:  [email protected]
    S:  Maintained
    W:  http://www.hisilicon.com
 ---F:  Documentation/devicetree/bindings/arm/hisilicon/hisilicon-low-pin-count.txt
 +++F:  Documentation/devicetree/bindings/arm/hisilicon/low-pin-count.yaml
    F:  drivers/bus/hisi_lpc.c
    
    HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
@@@@@ -8832,8 -8840,8 -8840,8 -8833,8 +8839,8 @@@@@ S:  Supporte
    W:  http://www.intel.com/support/feedback.htm
    W:  http://e1000.sourceforge.net/
    Q:  http://patchwork.ozlabs.org/project/intel-wired-lan/list/
 ---T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
 ---T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
 +++T:  git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue.git
 +++T:  git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git
    F:  Documentation/networking/device_drivers/ethernet/intel/
    F:  drivers/net/ethernet/intel/
    F:  drivers/net/ethernet/intel/*/
@@@@@ -8975,6 -8983,22 -8983,22 -8976,22 +8982,6 @@@@@ S:       Supporte
    W:  https://01.org/linux-acpi
    F:  drivers/platform/x86/intel_menlow.c
    
 ---INTEL MIC DRIVERS (mic)
 ---M:  Sudeep Dutt <[email protected]>
 ---M:  Ashutosh Dixit <[email protected]>
 ---S:  Supported
 ---W:  https://github.com/sudeepdutt/mic
 ---W:  http://software.intel.com/en-us/mic-developer
 ---F:  Documentation/misc-devices/mic/
 ---F:  drivers/dma/mic_x100_dma.c
 ---F:  drivers/dma/mic_x100_dma.h
 ---F:  drivers/misc/mic/
 ---F:  include/linux/mic_bus.h
 ---F:  include/linux/scif.h
 ---F:  include/uapi/linux/mic_common.h
 ---F:  include/uapi/linux/mic_ioctl.h
 ---F:  include/uapi/linux/scif_ioctl.h
 ---
    INTEL P-Unit IPC DRIVER
    M:  Zha Qipeng <[email protected]>
    L:  [email protected]
@@@@@ -9079,7 -9103,10 -9103,10 -9096,10 +9086,7 @@@@@ S:       Supporte
    F:  drivers/net/wireless/intel/iwlegacy/
    
    INTEL WIRELESS WIFI LINK (iwlwifi)
 ---M:  Johannes Berg <[email protected]>
 ---M:  Emmanuel Grumbach <[email protected]>
    M:  Luca Coelho <[email protected]>
 ---M:  Intel Linux Wireless <[email protected]>
    L:  [email protected]
    S:  Supported
    W:  https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
@@@@@ -9171,7 -9198,6 -9198,6 -9191,6 +9178,7 @@@@@ F:  include/linux/iomap.
    
    IOMMU DRIVERS
    M:  Joerg Roedel <[email protected]>
 +++M:  Will Deacon <[email protected]>
    L:  [email protected]
    S:  Maintained
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@@@ -9255,6 -9281,7 -9281,7 -9274,7 +9262,6 @@@@@ F:  kernel/irq
    
    IRQCHIP DRIVERS
    M:  Thomas Gleixner <[email protected]>
 ---M:  Jason Cooper <[email protected]>
    M:  Marc Zyngier <[email protected]>
    L:  [email protected]
    S:  Maintained
@@@@@ -9654,7 -9681,6 -9681,6 -9674,6 +9661,7 @@@@@ F:  Documentation/virt/kvm/s390
    F:  arch/s390/include/asm/gmap.h
    F:  arch/s390/include/asm/kvm*
    F:  arch/s390/include/uapi/asm/kvm*
 +++F:  arch/s390/kernel/uv.c
    F:  arch/s390/kvm/
    F:  arch/s390/mm/gmap.c
    F:  tools/testing/selftests/kvm/*/s390x/
@@@@@ -9843,6 -9869,13 -9869,13 -9862,13 +9850,6 @@@@@ S:       Maintaine
    F:  arch/mips/lantiq
    F:  drivers/soc/lantiq
    
 ---LAPB module
 ---L:  [email protected]
 ---S:  Orphan
 ---F:  Documentation/networking/lapb-module.rst
 ---F:  include/*/lapb.h
 ---F:  net/lapb/
 ---
    LASI 53c700 driver for PARISC
    M:  "James E.J. Bottomley" <[email protected]>
    L:  [email protected]
@@@@@ -11157,7 -11190,7 -11190,7 -11183,7 +11164,7 @@@@@ F:     Documentation/devicetree/bindings/in
    F:  drivers/input/touchscreen/melfas_mip4.c
    
    MELLANOX BLUEFIELD I2C DRIVER
 ---M:  Khalil Blaiech <kblaiech@mellanox.com>
 +++M:  Khalil Blaiech <kblaiech@nvidia.com>
    L:  [email protected]
    S:  Supported
    F:  drivers/i2c/busses/i2c-mlxbf.c
@@@@@ -11167,7 -11200,7 -11200,7 -11193,7 +11174,7 @@@@@ M:     Tariq Toukan <[email protected]
    L:  [email protected]
    S:  Supported
    W:  http://www.mellanox.com
 ---Q:  http://patchwork.ozlabs.org/project/netdev/list/
 +++Q:  https://patchwork.kernel.org/project/netdevbpf/list/
    F:  drivers/net/ethernet/mellanox/mlx4/en_*
    
    MELLANOX ETHERNET DRIVER (mlx5e)
@@@@@ -11175,7 -11208,7 -11208,7 -11201,7 +11182,7 @@@@@ M:     Saeed Mahameed <[email protected]
    L:  [email protected]
    S:  Supported
    W:  http://www.mellanox.com
 ---Q:  http://patchwork.ozlabs.org/project/netdev/list/
 +++Q:  https://patchwork.kernel.org/project/netdevbpf/list/
    F:  drivers/net/ethernet/mellanox/mlx5/core/en_*
    
    MELLANOX ETHERNET INNOVA DRIVERS
@@@@@ -11183,7 -11216,7 -11216,7 -11209,7 +11190,7 @@@@@ R:     Boris Pismenny <[email protected]
    L:  [email protected]
    S:  Supported
    W:  http://www.mellanox.com
 ---Q:  http://patchwork.ozlabs.org/project/netdev/list/
 +++Q:  https://patchwork.kernel.org/project/netdevbpf/list/
    F:  drivers/net/ethernet/mellanox/mlx5/core/accel/*
    F:  drivers/net/ethernet/mellanox/mlx5/core/en_accel/*
    F:  drivers/net/ethernet/mellanox/mlx5/core/fpga/*
@@@@@ -11195,7 -11228,7 -11228,7 -11221,7 +11202,7 @@@@@ M:     Ido Schimmel <[email protected]
    L:  [email protected]
    S:  Supported
    W:  http://www.mellanox.com
 ---Q:  http://patchwork.ozlabs.org/project/netdev/list/
 +++Q:  https://patchwork.kernel.org/project/netdevbpf/list/
    F:  drivers/net/ethernet/mellanox/mlxsw/
    F:  tools/testing/selftests/drivers/net/mlxsw/
    
@@@@@ -11204,7 -11237,7 -11237,7 -11230,7 +11211,7 @@@@@ M:     [email protected]
    L:  [email protected]
    S:  Supported
    W:  http://www.mellanox.com
 ---Q:  http://patchwork.ozlabs.org/project/netdev/list/
 +++Q:  https://patchwork.kernel.org/project/netdevbpf/list/
    F:  drivers/net/ethernet/mellanox/mlxfw/
    
    MELLANOX HARDWARE PLATFORM SUPPORT
@@@@@ -11223,7 -11256,7 -11256,7 -11249,7 +11230,7 @@@@@ L:     [email protected]
    L:  [email protected]
    S:  Supported
    W:  http://www.mellanox.com
 ---Q:  http://patchwork.ozlabs.org/project/netdev/list/
 +++Q:  https://patchwork.kernel.org/project/netdevbpf/list/
    F:  drivers/net/ethernet/mellanox/mlx4/
    F:  include/linux/mlx4/
    
@@@@@ -11244,7 -11277,7 -11277,7 -11270,7 +11251,7 @@@@@ L:     [email protected]
    L:  [email protected]
    S:  Supported
    W:  http://www.mellanox.com
 ---Q:  http://patchwork.ozlabs.org/project/netdev/list/
 +++Q:  https://patchwork.kernel.org/project/netdevbpf/list/
    F:  Documentation/networking/device_drivers/ethernet/mellanox/
    F:  drivers/net/ethernet/mellanox/mlx5/core/
    F:  include/linux/mlx5/
@@@@@ -12124,7 -12157,7 -12157,7 -12150,7 +12131,7 @@@@@ M:     Jakub Kicinski <[email protected]
    L:  [email protected]
    S:  Maintained
    W:  http://www.linuxfoundation.org/en/Net
 ---Q:  http://patchwork.ozlabs.org/project/netdev/list/
 +++Q:  https://patchwork.kernel.org/project/netdevbpf/list/
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
    F:  Documentation/devicetree/bindings/net/
@@@@@ -12169,7 -12202,7 -12202,7 -12195,7 +12176,7 @@@@@ M:     Jakub Kicinski <[email protected]
    L:  [email protected]
    S:  Maintained
    W:  http://www.linuxfoundation.org/en/Net
 ---Q:  http://patchwork.ozlabs.org/project/netdev/list/
 +++Q:  https://patchwork.kernel.org/project/netdevbpf/list/
    B:  mailto:[email protected]
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
@@@@@ -13170,9 -13203,7 -13203,7 -13196,7 +13177,9 @@@@@ M:     Jesper Dangaard Brouer <hawk@kernel.
    M:  Ilias Apalodimas <[email protected]>
    L:  [email protected]
    S:  Supported
 +++F:  Documentation/networking/page_pool.rst
    F:  include/net/page_pool.h
 +++F:  include/trace/events/page_pool.h
    F:  net/core/page_pool.c
    
    PANASONIC LAPTOP ACPI EXTRAS DRIVER
@@@@@ -13400,6 -13431,7 -13431,7 -13424,7 +13407,6 @@@@@ F:     drivers/pci/controller/mobiveil/pcie
    
    PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
    M:  Thomas Petazzoni <[email protected]>
 ---M:  Jason Cooper <[email protected]>
    L:  [email protected]
    L:  [email protected] (moderated for non-subscribers)
    S:  Maintained
@@@@@ -14205,6 -14237,7 -14237,7 -14230,7 +14212,6 @@@@@ F:     drivers/media/usb/pwc/
    F:  include/trace/events/pwc.h
    
    PWM FAN DRIVER
 ---M:  Kamil Debski <[email protected]>
    M:  Bartlomiej Zolnierkiewicz <[email protected]>
    L:  [email protected]
    S:  Supported
@@@@@ -14521,14 -14554,6 -14554,6 -14547,6 +14528,14 @@@@@ F:   Documentation/devicetree/bindings/ma
    F:  drivers/mailbox/qcom-ipcc.c
    F:  include/dt-bindings/mailbox/qcom-ipcc.h
    
 +++QUALCOMM IPQ4019 VQMMC REGULATOR DRIVER
 +++M:  Robert Marko <[email protected]>
 +++M:  Luka Perkov <[email protected]>
 +++L:  [email protected]
 +++S:  Maintained
 +++F:  Documentation/devicetree/bindings/regulator/vqmmc-ipq4019-regulator.yaml
 +++F:  drivers/regulator/vqmmc-ipq4019-regulator.c
 +++
    QUALCOMM RMNET DRIVER
    M:  Subash Abhinov Kasiviswanathan <[email protected]>
    M:  Sean Tranchetti <[email protected]>
@@@@@ -14813,7 -14838,7 -14838,7 -14831,7 +14820,7 @@@@@ T:     git git://git.kernel.org/pub/scm/lin
    F:  drivers/net/wireless/realtek/rtlwifi/
    
    REALTEK WIRELESS DRIVER (rtw88)
 ---M:  Yan-Hsuan Chuang <yhchuang@realtek.com>
 +++M:  Yan-Hsuan Chuang <tony0620emma@gmail.com>
    L:  [email protected]
    S:  Maintained
    F:  drivers/net/wireless/realtek/rtw88/
@@@@@ -14884,6 -14909,7 -14909,7 -14902,7 +14891,6 @@@@@ RENESAS ETHERNET DRIVER
    R:  Sergei Shtylyov <[email protected]>
    L:  [email protected]
    L:  [email protected]
 ---F:  Documentation/devicetree/bindings/net/renesas,*.txt
    F:  Documentation/devicetree/bindings/net/renesas,*.yaml
    F:  drivers/net/ethernet/renesas/
    F:  include/linux/sh_eth.h
@@@@@ -15240,6 -15266,7 -15266,7 -15259,7 +15247,6 @@@@@ F:     drivers/iommu/s390-iommu.
    S390 IUCV NETWORK LAYER
    M:  Julian Wiedmann <[email protected]>
    M:  Karsten Graul <[email protected]>
 ---M:  Ursula Braun <[email protected]>
    L:  [email protected]
    S:  Supported
    W:  http://www.ibm.com/developerworks/linux/linux390/
@@@@@ -15250,6 -15277,7 -15277,7 -15270,7 +15257,6 @@@@@ F:     net/iucv
    S390 NETWORK DRIVERS
    M:  Julian Wiedmann <[email protected]>
    M:  Karsten Graul <[email protected]>
 ---M:  Ursula Braun <[email protected]>
    L:  [email protected]
    S:  Supported
    W:  http://www.ibm.com/developerworks/linux/linux390/
@@@@@ -15351,6 -15379,7 -15379,7 -15372,7 +15358,6 @@@@@ F:     security/safesetid
    
    SAMSUNG AUDIO (ASoC) DRIVERS
    M:  Krzysztof Kozlowski <[email protected]>
 ---M:  Sangbeom Kim <[email protected]>
    M:  Sylwester Nawrocki <[email protected]>
    L:  [email protected] (moderated for non-subscribers)
    S:  Supported
@@@@@ -15385,6 -15414,7 -15414,7 -15407,7 +15392,6 @@@@@ S:     Maintaine
    F:  drivers/platform/x86/samsung-laptop.c
    
    SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
 ---M:  Sangbeom Kim <[email protected]>
    M:  Krzysztof Kozlowski <[email protected]>
    M:  Bartlomiej Zolnierkiewicz <[email protected]>
    L:  [email protected]
@@@@@ -15418,12 -15448,14 -15448,14 -15441,14 +15425,12 @@@@@ F:        Documentation/devicetree/bindings/ne
    F:  drivers/nfc/s3fwrn5
    
    SAMSUNG S5C73M3 CAMERA DRIVER
 ---M:  Kyungmin Park <[email protected]>
    M:  Andrzej Hajda <[email protected]>
    L:  [email protected]
    S:  Supported
    F:  drivers/media/i2c/s5c73m3/*
    
    SAMSUNG S5K5BAF CAMERA DRIVER
 ---M:  Kyungmin Park <[email protected]>
    M:  Andrzej Hajda <[email protected]>
    L:  [email protected]
    S:  Supported
@@@@@ -15441,6 -15473,7 -15473,7 -15466,7 +15448,6 @@@@@ F:     Documentation/devicetree/bindings/cr
    F:  drivers/crypto/s5p-sss.c
    
    SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
 ---M:  Kyungmin Park <[email protected]>
    M:  Sylwester Nawrocki <[email protected]>
    L:  [email protected]
    S:  Supported
@@@@@ -15463,6 -15496,7 -15496,7 -15489,7 +15470,6 @@@@@ F:     include/linux/clk/samsung.
    F:  include/linux/platform_data/clk-s3c2410.h
    
    SAMSUNG SPI DRIVERS
 ---M:  Kukjin Kim <[email protected]>
    M:  Krzysztof Kozlowski <[email protected]>
    M:  Andi Shyti <[email protected]>
    L:  [email protected]
@@@@@ -15488,6 -15522,7 -15522,7 -15515,7 +15495,6 @@@@@ T:     git https://github.com/lmajewski/lin
    F:  drivers/thermal/samsung/
    
    SAMSUNG USB2 PHY DRIVER
 ---M:  Kamil Debski <[email protected]>
    M:  Sylwester Nawrocki <[email protected]>
    L:  [email protected]
    S:  Supported
@@@@@ -15786,8 -15821,9 -15821,9 -15814,9 +15793,8 @@@@@ F:     drivers/slimbus
    F:  include/linux/slimbus.h
    
    SFC NETWORK DRIVER
 ---M:  Solarflare linux maintainers <[email protected]>
 ---M:  Edward Cree <[email protected]>
 ---M:  Martin Habets <[email protected]>
 +++M:  Edward Cree <[email protected]>
 +++M:  Martin Habets <[email protected]>
    L:  [email protected]
    S:  Supported
    F:  drivers/net/ethernet/sfc/
@@@@@ -15815,6 -15851,7 -15851,7 -15844,7 +15822,6 @@@@@ S:     Maintaine
    F:  drivers/misc/sgi-xp/
    
    SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 ---M:  Ursula Braun <[email protected]>
    M:  Karsten Graul <[email protected]>
    L:  [email protected]
    S:  Supported
@@@@@ -18076,7 -18113,7 -18113,7 -18106,7 +18083,7 @@@@@ M:     Yu Chen <[email protected]
    M:  Binghui Wang <[email protected]>
    L:  [email protected]
    S:  Maintained
 ---F:  Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt
 +++F:  Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml
    F:  drivers/phy/hisilicon/phy-hi3660-usb3.c
    
    USB ISP116X DRIVER
@@@@@ -18161,14 -18198,6 -18198,6 -18191,6 +18168,14 @@@@@ L:   [email protected]
    S:  Supported
    F:  drivers/usb/class/usblp.c
    
 +++USB RAW GADGET DRIVER
 +++R:  Andrey Konovalov <[email protected]>
 +++L:  [email protected]
 +++S:  Maintained
 +++F:  Documentation/usb/raw-gadget.rst
 +++F:  drivers/usb/gadget/legacy/raw_gadget.c
 +++F:  include/uapi/linux/usb/raw_gadget.h
 +++
    USB QMI WWAN NETWORK DRIVER
    M:  Bjørn Mork <[email protected]>
    L:  [email protected]
@@@@@ -18994,18 -19023,12 -19023,12 -19016,12 +19001,18 @@@@@ L:        [email protected]
    S:  Maintained
    N:  axp[128]
    
 ---X.25 NETWORK LAYER
 ---M:  Andrew Hendry <[email protected]>
 +++X.25 STACK
 +++M:  Martin Schiller <[email protected]>
    L:  [email protected]
 ---S:  Odd Fixes
 +++S:  Maintained
 +++F:  Documentation/networking/lapb-module.rst
    F:  Documentation/networking/x25*
 +++F:  drivers/net/wan/hdlc_x25.c
 +++F:  drivers/net/wan/lapbether.c
 +++F:  include/*/lapb.h
    F:  include/net/x25*
 +++F:  include/uapi/linux/x25.h
 +++F:  net/lapb/
    F:  net/x25/
    
    X86 ARCHITECTURE (32-BIT AND 64-BIT)
@@@@@ -19119,17 -19142,12 -19142,12 -19135,12 +19126,17 @@@@@ L:        [email protected]
    L:  [email protected]
    S:  Supported
    F:  include/net/xdp.h
 +++F:  include/net/xdp_priv.h
    F:  include/trace/events/xdp.h
    F:  kernel/bpf/cpumap.c
    F:  kernel/bpf/devmap.c
    F:  net/core/xdp.c
 ---N:  xdp
 ---K:  xdp
 +++F:  samples/bpf/xdp*
 +++F:  tools/testing/selftests/bpf/*xdp*
 +++F:  tools/testing/selftests/bpf/*/*xdp*
 +++F:  drivers/net/ethernet/*/*/*/*/*xdp*
 +++F:  drivers/net/ethernet/*/*/*xdp*
 +++K:  (?:\b|_)xdp(?:\b|_)
    
    XDP SOCKETS (AF_XDP)
    M:  Björn Töpel <[email protected]>
@@@@@ -19138,12 -19156,9 -19156,9 -19149,9 +19145,12 @@@@@ R:   Jonathan Lemon <jonathan.lemon@gmail
    L:  [email protected]
    L:  [email protected]
    S:  Maintained
 +++F:  Documentation/networking/af_xdp.rst
    F:  include/net/xdp_sock*
    F:  include/net/xsk_buff_pool.h
    F:  include/uapi/linux/if_xdp.h
 +++F:  include/uapi/linux/xdp_diag.h
 +++F:  include/net/netns/xdp.h
    F:  net/xdp/
    F:  samples/bpf/xdpsock*
    F:  tools/lib/bpf/xsk*

diff --combined drivers/edac/Kconfig
index 2864a32c7d17918b55a901de2c082583df986a7c,fa0c3b5797e4b966c99b5f67fa82f4375adcf90f,fa0c3b5797e4b966c99b5f67fa82f4375adcf90f,7a47680d6f0786058201d2f02904b1211807c84b..81c42664f21baf889e2c7f72cc0c142671595e73
--- 1/drivers/edac/Kconfig
--- 2/drivers/edac/Kconfig
--- 3/drivers/edac/Kconfig
--- 4/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@@@@ -269,6 -269,15 -269,15 -269,6 +269,15 @@@@@ config EDAC_PND
          first used on the Apollo Lake platform and Denverton
          micro-server but may appear on others in the future.
    
+  +config EDAC_IGEN6
+  +    tristate "Intel client SoC Integrated MC"
+  +    depends on PCI && X86_64 && PCI_MMCONFIG && ARCH_HAVE_NMI_SAFE_CMPXCHG
+  +    help
+  +      Support for error detection and correction on the Intel
+  +      client SoC Integrated Memory Controller using In-Band ECC IP.
+  +      This In-Band ECC is first used on the Elkhart Lake SoC but
+  +      may appear on others in the future.
+  +
    config EDAC_MPC85XX
        bool "Freescale MPC83xx / MPC85xx"
        depends on FSL_SOC && EDAC=y
@@@@@ -283,6 -292,13 -292,13 -283,13 +292,6 @@@@@ config EDAC_LAYERSCAP
          Support for error detection and correction on Freescale memory
          controllers on Layerscape SoCs.
    
 ---config EDAC_MV64X60
 ---    tristate "Marvell MV64x60"
 ---    depends on MV64X60
 ---    help
 ---      Support for error detection and correction on the Marvell
 ---      MV64360 and MV64460 chipsets.
 ---
    config EDAC_PASEMI
        tristate "PA Semi PWRficient"
        depends on PPC_PASEMI && PCI
@@@@@ -508,10 -524,10 -524,10 -515,10 +517,10 @@@@@ config EDAC_QCO
          health, you should probably say 'Y' here.
    
    config EDAC_ASPEED
 ---    tristate "Aspeed AST 2500 SoC"
 ---    depends on MACH_ASPEED_G5
 +++    tristate "Aspeed AST BMC SoC"
 +++    depends on ARCH_ASPEED
        help
 ---      Support for error detection and correction on the Aspeed AST 2500 SoC.
 +++      Support for error detection and correction on the Aspeed AST BMC SoC.
    
          First, ECC must be configured in the bootloader. Then, this driver
          will expose error counters via the EDAC kernel framework.

diff --combined drivers/edac/Makefile
index 28edee9dca66b18ed71ca5858f7bc2eac5c58eab,3cd1aeb0a916082807ec90bdcd0fee5865786d09,3cd1aeb0a916082807ec90bdcd0fee5865786d09,3a849168780dd1680a6e9e55e3500d276be87f2d..464d3d8d850abe852a51294c14d650ef0d504cb6
--- 1/drivers/edac/Makefile
--- 2/drivers/edac/Makefile
--- 3/drivers/edac/Makefile
--- 4/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
@@@@@ -32,6 -32,7 -32,7 -32,6 +32,7 @@@@@ obj-$(CONFIG_EDAC_I7300)              += i7300_edac
    obj-$(CONFIG_EDAC_I7CORE)           += i7core_edac.o
    obj-$(CONFIG_EDAC_SBRIDGE)          += sb_edac.o
    obj-$(CONFIG_EDAC_PND2)                     += pnd2_edac.o
+  +obj-$(CONFIG_EDAC_IGEN6)                    += igen6_edac.o
    obj-$(CONFIG_EDAC_E7XXX)            += e7xxx_edac.o
    obj-$(CONFIG_EDAC_E752X)            += e752x_edac.o
    obj-$(CONFIG_EDAC_I82443BXGX)               += i82443bxgx_edac.o
@@@@@ -64,6 -65,7 -65,7 -64,7 +65,6 @@@@@ obj-$(CONFIG_EDAC_SKX)                        += skx_edac.
    i10nm_edac-y                                := skx_common.o i10nm_base.o
    obj-$(CONFIG_EDAC_I10NM)            += i10nm_edac.o
    
 ---obj-$(CONFIG_EDAC_MV64X60)          += mv64x60_edac.o
    obj-$(CONFIG_EDAC_CELL)                     += cell_edac.o
    obj-$(CONFIG_EDAC_PPC4XX)           += ppc4xx_edac.o
    obj-$(CONFIG_EDAC_AMD8111)          += amd8111_edac.o

diff --combined include/linux/edac.h
index 15e8f3d8a895e01130929fbe37aaa9bab8c1aa3a,e64b73b556eb5d512cb60fd06e8a8bf8481868a0,8f63245f7f7c18125c8e397d59628a4a0379429d,52d7487f6bd4fcde4ca6ff1bb532a43c19a9c8ba..76d3562d30061912070f9103941317e65b5b3c32
--- 1/include/linux/edac.h
--- 2/include/linux/edac.h
--- 3/include/linux/edac.h
--- 4/include/linux/edac.h
+++ b/include/linux/edac.h
@@@@@ -175,11 -175,15 -175,14 -175,11 +175,15 @@@@@ static inline char *mc_event_error_type
     * @MEM_RDDR3:              Registered DDR3 RAM
     *                  This is a variant of the DDR3 memories.
     * @MEM_LRDDR3:             Load-Reduced DDR3 memory.
+  + * @MEM_LPDDR3:             Low-Power DDR3 memory.
     * @MEM_DDR4:               Unbuffered DDR4 RAM
     * @MEM_RDDR4:              Registered DDR4 RAM
     *                  This is a variant of the DDR4 memories.
     * @MEM_LRDDR4:             Load-Reduced DDR4 memory.
+  + * @MEM_LPDDR4:             Low-Power DDR4 memory.
+ ++ * @MEM_DDR5:               Unbuffered DDR5 RAM
     * @MEM_NVDIMM:             Non-volatile RAM
+  + * @MEM_WIO2:               Wide I/O 2.
     */
    enum mem_type {
        MEM_EMPTY = 0,
@@@@@ -200,10 -204,14 -203,13 -200,10 +204,14 @@@@@
        MEM_DDR3,
        MEM_RDDR3,
        MEM_LRDDR3,
+  +    MEM_LPDDR3,
        MEM_DDR4,
        MEM_RDDR4,
        MEM_LRDDR4,
+  +    MEM_LPDDR4,
+ ++    MEM_DDR5,
        MEM_NVDIMM,
+  +    MEM_WIO2,
    };
    
    #define MEM_FLAG_EMPTY              BIT(MEM_EMPTY)
@@@@@ -223,13 -231,17 -229,16 -223,13 +231,17 @@@@@
    #define MEM_FLAG_XDR            BIT(MEM_XDR)
    #define MEM_FLAG_DDR3           BIT(MEM_DDR3)
    #define MEM_FLAG_RDDR3          BIT(MEM_RDDR3)
+  +#define MEM_FLAG_LPDDR3         BIT(MEM_LPDDR3)
    #define MEM_FLAG_DDR4           BIT(MEM_DDR4)
    #define MEM_FLAG_RDDR4          BIT(MEM_RDDR4)
    #define MEM_FLAG_LRDDR4         BIT(MEM_LRDDR4)
+  +#define MEM_FLAG_LPDDR4         BIT(MEM_LPDDR4)
+ ++#define MEM_FLAG_DDR5           BIT(MEM_DDR5)
    #define MEM_FLAG_NVDIMM         BIT(MEM_NVDIMM)
+  +#define MEM_FLAG_WIO2               BIT(MEM_WIO2)
    
    /**
---  * enum edac-type - Error Detection and Correction capabilities and mode
+++  * enum edac_type - Error Detection and Correction capabilities and mode
     * @EDAC_UNKNOWN:   Unknown if ECC is available
     * @EDAC_NONE:              Doesn't support ECC
     * @EDAC_RESERVED:  Reserved ECC type
@@@@@ -309,7 -321,7 -318,7 -309,7 +321,7 @@@@@ enum scrub_type 
    #define OP_OFFLINE          0x300
    
    /**
---  * enum edac_mc_layer - memory controller hierarchy layer
+++  * enum edac_mc_layer_type - memory controller hierarchy layer
     *
     * @EDAC_MC_LAYER_BRANCH:   memory layer is named "branch"
     * @EDAC_MC_LAYER_CHANNEL:  memory layer is named "channel"