Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Dec 2020 20:18:19 +0000 (12:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Dec 2020 20:18:19 +0000 (12:18 -0800)
Pull crypto updates from Herbert Xu:
 "API:
   - Add speed testing on 1420-byte blocks for networking

  Algorithms:
   - Improve performance of chacha on ARM for network packets
   - Improve performance of aegis128 on ARM for network packets

  Drivers:
   - Add support for Keem Bay OCS AES/SM4
   - Add support for QAT 4xxx devices
   - Enable crypto-engine retry mechanism in caam
   - Enable support for crypto engine on sdm845 in qce
   - Add HiSilicon PRNG driver support"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (161 commits)
  crypto: qat - add capability detection logic in qat_4xxx
  crypto: qat - add AES-XTS support for QAT GEN4 devices
  crypto: qat - add AES-CTR support for QAT GEN4 devices
  crypto: atmel-i2c - select CONFIG_BITREVERSE
  crypto: hisilicon/trng - replace atomic_add_return()
  crypto: keembay - Add support for Keem Bay OCS AES/SM4
  dt-bindings: Add Keem Bay OCS AES bindings
  crypto: aegis128 - avoid spurious references crypto_aegis128_update_simd
  crypto: seed - remove trailing semicolon in macro definition
  crypto: x86/poly1305 - Use TEST %reg,%reg instead of CMP $0,%reg
  crypto: x86/sha512 - Use TEST %reg,%reg instead of CMP $0,%reg
  crypto: aesni - Use TEST %reg,%reg instead of CMP $0,%reg
  crypto: cpt - Fix sparse warnings in cptpf
  hwrng: ks-sa - Add dependency on IOMEM and OF
  crypto: lib/blake2s - Move selftest prototype into header file
  crypto: arm/aes-ce - work around Cortex-A57/A72 silion errata
  crypto: ecdh - avoid unaligned accesses in ecdh_set_secret()
  crypto: ccree - rework cache parameters handling
  crypto: cavium - Use dma_set_mask_and_coherent to simplify code
  crypto: marvell/octeontx - Use dma_set_mask_and_coherent to simplify code
  ...

1  2 
MAINTAINERS
arch/arm64/configs/defconfig
arch/x86/crypto/poly1305_glue.c
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
drivers/tee/tee_core.c
fs/crypto/fname.c
fs/verity/fsverity_private.h
include/linux/filter.h
net/mptcp/subflow.c

diff --combined MAINTAINERS
@@@ -934,7 -934,7 +934,7 @@@ M: Evan Quan <evan.quan@amd.com
  L:    amd-gfx@lists.freedesktop.org
  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 <brijeshkumar.singh@amd.com>
@@@ -978,7 -978,7 +978,7 @@@ M: Michael Hennerich <Michael.Hennerich
  L:    linux-iio@vger.kernel.org
  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
@@@ -1073,7 -1073,6 +1073,7 @@@ M:      Hans Verkuil <hverkuil-cisco@xs4all.
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/i2c/adv7604*
 +F:    Documentation/devicetree/bindings/media/i2c/adv7604.yaml
  
  ANALOG DEVICES INC ADV7842 DRIVER
  M:    Hans Verkuil <hverkuil-cisco@xs4all.nl>
@@@ -1280,7 -1279,7 +1280,7 @@@ M:      Igor Russkikh <irusskikh@marvell.com
  L:    netdev@vger.kernel.org
  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/
  
@@@ -1487,20 -1486,10 +1487,20 @@@ F:   Documentation/devicetree/bindings/io
  F:    drivers/iommu/arm/
  F:    drivers/iommu/io-pgtable-arm*
  
 +ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS)
 +M:    Arnd Bergmann <arnd@arndb.de>
 +M:    Olof Johansson <olof@lixom.net>
 +M:    soc@kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
 +F:    arch/arm/boot/dts/Makefile
 +F:    arch/arm64/boot/dts/Makefile
 +
  ARM SUB-ARCHITECTURES
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
  F:    arch/arm/mach-*/
  F:    arch/arm/plat-*/
  
@@@ -1557,7 -1546,6 +1557,7 @@@ F:      drivers/clk/sunxi
  ARM/Allwinner sunXi SoC support
  M:    Maxime Ripard <mripard@kernel.org>
  M:    Chen-Yu Tsai <wens@csie.org>
 +R:    Jernej Skrabec <jernej.skrabec@siol.net>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
@@@ -1735,13 -1723,11 +1735,13 @@@ F:   arch/arm/mach-ep93xx/micro9.
  
  ARM/CORESIGHT FRAMEWORK AND DRIVERS
  M:    Mathieu Poirier <mathieu.poirier@linaro.org>
 -R:    Suzuki K Poulose <suzuki.poulose@arm.com>
 +M:    Suzuki K Poulose <suzuki.poulose@arm.com>
  R:    Mike Leach <mike.leach@linaro.org>
 +R:    Leo Yan <leo.yan@linaro.org>
  L:    coresight@lists.linaro.org (moderated for non-subscribers)
  L:    linux-arm-kernel@lists.infradead.org (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
@@@ -2008,6 -1994,7 +2008,6 @@@ N:      lpc18x
  
  ARM/LPC32XX SOC SUPPORT
  M:    Vladimir Zapolskiy <vz@mleia.com>
 -M:    Sylvain Lemieux <slemieux.tyco@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/vzapolskiy/linux-lpc32xx.git
@@@ -2025,6 -2012,7 +2025,6 @@@ M:      Philipp Zabel <philipp.zabel@gmail.c
  S:    Maintained
  
  ARM/Marvell Dove/MV78xx0/Orion SOC support
 -M:    Jason Cooper <jason@lakedaemon.net>
  M:    Andrew Lunn <andrew@lunn.ch>
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  M:    Gregory Clement <gregory.clement@bootlin.com>
@@@ -2041,6 -2029,7 +2041,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 <jason@lakedaemon.net>
  M:    Andrew Lunn <andrew@lunn.ch>
  M:    Gregory Clement <gregory.clement@bootlin.com>
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@@ -2385,7 -2374,8 +2385,7 @@@ F:      drivers/i2c/busses/i2c-rk3x.
  F:    sound/soc/rockchip/
  N:    rockchip
  
 -ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
 -M:    Kukjin Kim <kgene@kernel.org>
 +ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
  M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org
@@@ -2414,7 -2404,15 +2414,7 @@@ N:     s3c241
  N:    s3c64xx
  N:    s5pv210
  
 -ARM/SAMSUNG MOBILE MACHINE SUPPORT
 -M:    Kyungmin Park <kyungmin.park@samsung.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-s5pv210/
 -
  ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
 -M:    Kyungmin Park <kyungmin.park@samsung.com>
 -M:    Kamil Debski <kamil@wypas.org>
  M:    Andrzej Hajda <a.hajda@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org
  L:    linux-media@vger.kernel.org
@@@ -2439,6 -2437,9 +2439,6 @@@ S:      Maintaine
  F:    drivers/media/platform/s5p-jpeg/
  
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 -M:    Kyungmin Park <kyungmin.park@samsung.com>
 -M:    Kamil Debski <kamil@wypas.org>
 -M:    Jeongtae Park <jtp.park@samsung.com>
  M:    Andrzej Hajda <a.hajda@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org
  L:    linux-media@vger.kernel.org
@@@ -2641,8 -2642,10 +2641,8 @@@ F:     drivers/pinctrl/visconti
  N:    visconti
  
  ARM/UNIPHIER ARCHITECTURE
 -M:    Masahiro Yamada <yamada.masahiro@socionext.com>
  L:    linux-arm-kernel@lists.infradead.org (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
@@@ -3243,12 -3246,12 +3243,12 @@@ F:   drivers/iio/accel/bma400
  BPF (Safe dynamic programs and tools)
  M:    Alexei Starovoitov <ast@kernel.org>
  M:    Daniel Borkmann <daniel@iogearbox.net>
 +M:    Andrii Nakryiko <andrii@kernel.org>
  R:    Martin KaFai Lau <kafai@fb.com>
  R:    Song Liu <songliubraving@fb.com>
  R:    Yonghong Song <yhs@fb.com>
 -R:    Andrii Nakryiko <andrii@kernel.org>
  R:    John Fastabend <john.fastabend@gmail.com>
 -R:    KP Singh <kpsingh@chromium.org>
 +R:    KP Singh <kpsingh@kernel.org>
  L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Supported
@@@ -3366,17 -3369,6 +3366,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 <kpsingh@kernel.org>
 +R:    Florent Revest <revest@chromium.org>
 +R:    Brendan Jackman <jackmanb@chromium.org>
 +L:    bpf@vger.kernel.org
 +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 <michael.chan@broadcom.com>
  L:    netdev@vger.kernel.org
@@@ -3549,12 -3541,11 +3549,12 @@@ BROADCOM BRCM80211 IEEE802.11n WIRELES
  M:    Arend van Spriel <arend.vanspriel@broadcom.com>
  M:    Franky Lin <franky.lin@broadcom.com>
  M:    Hante Meuleman <hante.meuleman@broadcom.com>
 -M:    Chi-Hsien Lin <chi-hsien.lin@cypress.com>
 -M:    Wright Feng <wright.feng@cypress.com>
 +M:    Chi-hsien Lin <chi-hsien.lin@infineon.com>
 +M:    Wright Feng <wright.feng@infineon.com>
 +M:    Chung-hsien Hsu <chung-hsien.hsu@infineon.com>
  L:    linux-wireless@vger.kernel.org
  L:    brcm80211-dev-list.pdl@broadcom.com
 -L:    brcm80211-dev-list@cypress.com
 +L:    SHA-cyfmac-dev-list@infineon.com
  S:    Supported
  F:    drivers/net/wireless/broadcom/brcm80211/
  
@@@ -3869,7 -3860,7 +3869,7 @@@ M:      Roger Quadros <rogerq@ti.com
  L:    linux-usb@vger.kernel.org
  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
@@@ -3881,8 -3872,9 +3881,8 @@@ T:      git git://linuxtv.org/media_tree.gi
  F:    drivers/media/radio/radio-cadet*
  
  CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
 -M:    Jonathan Corbet <corbet@lwn.net>
  L:    linux-media@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/cafe_ccic*
  F:    drivers/media/platform/marvell-ccic/
@@@ -4295,7 -4287,6 +4295,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
@@@ -4363,7 -4354,7 +4363,7 @@@ CODA V4L2 MEM2MEM DRIVE
  M:    Philipp Zabel <p.zabel@pengutronix.de>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/media/coda.txt
 +F:    Documentation/devicetree/bindings/media/coda.yaml
  F:    drivers/media/platform/coda/
  
  CODE OF CONDUCT
@@@ -4722,7 -4713,7 +4722,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:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.chelsio.com
@@@ -4754,7 -4745,7 +4754,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:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.chelsio.com
@@@ -4776,7 -4767,7 +4776,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:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.chelsio.com
@@@ -5015,8 -5006,9 +5015,8 @@@ T:      git git://linuxtv.org/media_tree.gi
  F:    drivers/media/platform/sti/delta
  
  DENALI NAND DRIVER
 -M:    Masahiro Yamada <yamada.masahiro@socionext.com>
  L:    linux-mtd@lists.infradead.org
 -S:    Supported
 +S:    Orphan
  F:    drivers/mtd/nand/raw/denali*
  
  DESIGNWARE EDMA CORE IP DRIVER
@@@ -5588,13 -5580,6 +5588,13 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml
  F:    drivers/gpu/drm/panel/panel-novatek-nt35510.c
  
 +DRM DRIVER FOR NOVATEK NT36672A PANELS
 +M:    Sumit Semwal <sumit.semwal@linaro.org>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml
 +F:    drivers/gpu/drm/panel/panel-novatek-nt36672a.c
 +
  DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
  M:    Ben Skeggs <bskeggs@redhat.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -5882,7 -5867,6 +5882,7 @@@ S:      Supporte
  F:    Documentation/devicetree/bindings/display/mediatek/
  F:    drivers/gpu/drm/mediatek/
  F:    drivers/phy/mediatek/phy-mtk-hdmi*
 +F:    drivers/phy/mediatek/phy-mtk-mipi*
  
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <thierry.reding@gmail.com>
@@@ -5975,7 -5959,6 +5975,7 @@@ F:      include/uapi/drm/v3d_drm.
  
  DRM DRIVERS FOR VC4
  M:    Eric Anholt <eric@anholt.net>
 +M:    Maxime Ripard <mripard@kernel.org>
  S:    Supported
  T:    git git://github.com/anholt/linux
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6635,7 -6618,6 +6635,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 <zohar@linux.ibm.com>
@@@ -6933,9 -6915,10 +6933,9 @@@ F:     drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 -M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    dri-devel@lists.freedesktop.org
  L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/fb/
@@@ -7937,7 -7920,7 +7937,7 @@@ HISILICON LPC BUS DRIVE
  M:    john.garry@huawei.com
  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)
@@@ -8016,7 -7999,7 +8016,7 @@@ F:      drivers/staging/hikey9xx
  HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
  M:    Zaibo Xu <xuzaibo@huawei.com>
  S:    Maintained
- F:    drivers/char/hw_random/hisi-trng-v2.c
+ F:    drivers/crypto/hisilicon/trng/trng.c
  
  HISILICON V3XX SPI NOR FLASH Controller Driver
  M:    John Garry <john.garry@huawei.com>
@@@ -8850,8 -8833,8 +8850,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,13 -8958,16 +8975,23 @@@ M:   Deepak Saxena <dsaxena@plexity.net
  S:    Maintained
  F:    drivers/char/hw_random/ixp4xx-rng.c
  
- INTEL KEEMBAY DRM DRIVER
++INTEL KEEM BAY DRM DRIVER
 +M:    Anitha Chrisanthus <anitha.chrisanthus@intel.com>
 +M:    Edmund Dea <edmund.j.dea@intel.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/intel,kmb_display.yaml
 +F:    drivers/gpu/drm/kmb/
 +
+ INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
+ M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
+ F:    drivers/crypto/keembay/Kconfig
+ F:    drivers/crypto/keembay/Makefile
+ F:    drivers/crypto/keembay/keembay-ocs-aes-core.c
+ F:    drivers/crypto/keembay/ocs-aes.c
+ F:    drivers/crypto/keembay/ocs-aes.h
  INTEL MANAGEMENT ENGINE (mei)
  M:    Tomas Winkler <tomas.winkler@intel.com>
  L:    linux-kernel@vger.kernel.org
@@@ -9000,6 -8986,22 +9010,6 @@@ S:     Supporte
  W:    https://01.org/linux-acpi
  F:    drivers/platform/x86/intel_menlow.c
  
 -INTEL MIC DRIVERS (mic)
 -M:    Sudeep Dutt <sudeep.dutt@intel.com>
 -M:    Ashutosh Dixit <ashutosh.dixit@intel.com>
 -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 <qipeng.zha@intel.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -9104,7 -9106,10 +9114,7 @@@ S:     Supporte
  F:    drivers/net/wireless/intel/iwlegacy/
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
 -M:    Johannes Berg <johannes.berg@intel.com>
 -M:    Emmanuel Grumbach <emmanuel.grumbach@intel.com>
  M:    Luca Coelho <luciano.coelho@intel.com>
 -M:    Intel Linux Wireless <linuxwifi@intel.com>
  L:    linux-wireless@vger.kernel.org
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
@@@ -9196,7 -9201,6 +9206,7 @@@ F:      include/linux/iomap.
  
  IOMMU DRIVERS
  M:    Joerg Roedel <joro@8bytes.org>
 +M:    Will Deacon <will@kernel.org>
  L:    iommu@lists.linux-foundation.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@ -9280,6 -9284,7 +9290,6 @@@ F:      kernel/irq
  
  IRQCHIP DRIVERS
  M:    Thomas Gleixner <tglx@linutronix.de>
 -M:    Jason Cooper <jason@lakedaemon.net>
  M:    Marc Zyngier <maz@kernel.org>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
@@@ -9679,7 -9684,6 +9689,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/
@@@ -9868,6 -9872,13 +9878,6 @@@ S:     Maintaine
  F:    arch/mips/lantiq
  F:    drivers/soc/lantiq
  
 -LAPB module
 -L:    linux-x25@vger.kernel.org
 -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" <James.Bottomley@HansenPartnership.com>
  L:    linux-scsi@vger.kernel.org
@@@ -10578,13 -10589,6 +10588,13 @@@ S: Supporte
  F:    Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
  F:    drivers/net/ethernet/marvell/octeontx2/af/
  
 +MARVELL PRESTERA ETHERNET SWITCH DRIVER
 +M:    Vadym Kochan <vkochan@marvell.com>
 +M:    Taras Chornyi <tchornyi@marvell.com>
 +S:    Supported
 +W:    https://github.com/Marvell-switching/switchdev-prestera
 +F:    drivers/net/ethernet/marvell/prestera/
 +
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
  M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Odd Fixes
@@@ -10854,8 -10858,8 +10864,8 @@@ L:   linux-media@vger.kernel.or
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/imx7.rst
 -F:    Documentation/devicetree/bindings/media/imx7-csi.txt
 -F:    Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
 +F:    Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
 +F:    Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
  F:    drivers/staging/media/imx/imx7-media-csi.c
  F:    drivers/staging/media/imx/imx7-mipi-csis.c
  
@@@ -11189,7 -11193,7 +11199,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:    linux-i2c@vger.kernel.org
  S:    Supported
  F:    drivers/i2c/busses/i2c-mlxbf.c
@@@ -11199,7 -11203,7 +11209,7 @@@ M:   Tariq Toukan <tariqt@nvidia.com
  L:    netdev@vger.kernel.org
  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)
@@@ -11207,7 -11211,7 +11217,7 @@@ M:   Saeed Mahameed <saeedm@nvidia.com
  L:    netdev@vger.kernel.org
  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
@@@ -11215,7 -11219,7 +11225,7 @@@ R:   Boris Pismenny <borisp@nvidia.com
  L:    netdev@vger.kernel.org
  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/*
@@@ -11227,7 -11231,7 +11237,7 @@@ M:   Ido Schimmel <idosch@nvidia.com
  L:    netdev@vger.kernel.org
  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/
  
@@@ -11236,7 -11240,7 +11246,7 @@@ M:   mlxsw@nvidia.co
  L:    netdev@vger.kernel.org
  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
@@@ -11255,7 -11259,7 +11265,7 @@@ L:   netdev@vger.kernel.or
  L:    linux-rdma@vger.kernel.org
  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/
  
@@@ -11276,7 -11280,7 +11286,7 @@@ L:   netdev@vger.kernel.or
  L:    linux-rdma@vger.kernel.org
  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/
@@@ -11418,15 -11422,6 +11428,15 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/cec/platform/meson/ao-cec-g12a.c
  F:    drivers/media/cec/platform/meson/ao-cec.c
  
 +MESON GE2D DRIVER FOR AMLOGIC SOCS
 +M:    Neil Armstrong <narmstrong@baylibre.com>
 +L:    linux-media@vger.kernel.org
 +L:    linux-amlogic@lists.infradead.org
 +S:    Supported
 +T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
 +F:    drivers/media/meson/ge2d/
 +
  MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
  M:    Liang Yang <liang.yang@amlogic.com>
  L:    linux-mtd@lists.infradead.org
@@@ -11676,17 -11671,6 +11686,17 @@@ M: Oliver Neukum <oliver@neukum.org
  S:    Maintained
  F:    drivers/usb/image/microtek.*
  
 +MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
 +F:    Documentation/driver-api/media/drivers/ccs/
 +F:    drivers/media/i2c/ccs-pll.c
 +F:    drivers/media/i2c/ccs-pll.h
 +F:    drivers/media/i2c/ccs/
 +F:    include/uapi/linux/smiapp.h
 +
  MIPS
  M:    Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  L:    linux-mips@vger.kernel.org
@@@ -11957,7 -11941,7 +11967,7 @@@ M:   Jacopo Mondi <jacopo@jmondi.org
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt
 +F:    Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml
  F:    drivers/media/i2c/mt9v111.c
  
  MULTIFUNCTION DEVICES (MFD)
@@@ -12176,7 -12160,7 +12186,7 @@@ M:   Jakub Kicinski <kuba@kernel.org
  L:    netdev@vger.kernel.org
  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/
@@@ -12221,7 -12205,7 +12231,7 @@@ M:   Jakub Kicinski <kuba@kernel.org
  L:    netdev@vger.kernel.org
  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:netdev@vger.kernel.org
  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
@@@ -12902,14 -12886,6 +12912,14 @@@ M: Harald Welte <laforge@gnumonks.org
  S:    Maintained
  F:    drivers/char/pcmcia/cm4040_cs.*
  
 +OMNIVISION OV02A10 SENSOR DRIVER
 +M:    Dongchun Zhu <dongchun.zhu@mediatek.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml
 +F:    drivers/media/i2c/ov02a10.c
 +
  OMNIVISION OV13858 SENSOR DRIVER
  M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
@@@ -12922,7 -12898,7 +12932,7 @@@ M:   Rui Miguel Silva <rmfrfs@gmail.com
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/ov2680.txt
 +F:    Documentation/devicetree/bindings/media/i2c/ov2680.yaml
  F:    drivers/media/i2c/ov2680.c
  
  OMNIVISION OV2685 SENSOR DRIVER
@@@ -12980,8 -12956,9 +12990,8 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/i2c/ov5695.c
  
  OMNIVISION OV7670 SENSOR DRIVER
 -M:    Jonathan Corbet <corbet@lwn.net>
  L:    linux-media@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/i2c/ov7670.txt
  F:    drivers/media/i2c/ov7670.c
@@@ -12991,7 -12968,7 +13001,7 @@@ M:   Jacopo Mondi <jacopo@jmondi.org
  L:    linux-media@vger.kernel.org
  S:    Odd fixes
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/ov772x.txt
 +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml
  F:    drivers/media/i2c/ov772x.c
  F:    include/media/i2c/ov772x.h
  
@@@ -13027,14 -13004,6 +13037,14 @@@ T: git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/i2c/ov9650.txt
  F:    drivers/media/i2c/ov9650.c
  
 +OMNIVISION OV9734 SENSOR DRIVER
 +M:    Tianshu Qiu <tian.shu.qiu@intel.com>
 +R:    Bingbu Cao <bingbu.cao@intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/ov9734.c
 +
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    linux-mtd@lists.infradead.org
@@@ -13237,9 -13206,7 +13247,9 @@@ M:   Jesper Dangaard Brouer <hawk@kernel.
  M:    Ilias Apalodimas <ilias.apalodimas@linaro.org>
  L:    netdev@vger.kernel.org
  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
@@@ -13467,6 -13434,7 +13477,6 @@@ F:   drivers/pci/controller/mobiveil/pcie
  
  PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
  M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 -M:    Jason Cooper <jason@lakedaemon.net>
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -14272,6 -14240,7 +14282,6 @@@ F:   drivers/media/usb/pwc/
  F:    include/trace/events/pwc.h
  
  PWM FAN DRIVER
 -M:    Kamil Debski <kamil@wypas.org>
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Supported
@@@ -14507,7 -14476,6 +14517,7 @@@ W:   https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/ath/ath9k/
  
  QUALCOMM CAMERA SUBSYSTEM DRIVER
 +M:    Robert Foss <robert.foss@linaro.org>
  M:    Todor Tomov <todor.too@gmail.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
@@@ -14589,14 -14557,6 +14599,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 <robert.marko@sartura.hr>
 +M:    Luka Perkov <luka.perkov@sartura.hr>
 +L:    linux-arm-msm@vger.kernel.org
 +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 <subashab@codeaurora.org>
  M:    Sean Tranchetti <stranche@codeaurora.org>
@@@ -14881,7 -14841,7 +14891,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:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtw88/
@@@ -14952,6 -14912,7 +14962,6 @@@ RENESAS ETHERNET DRIVER
  R:    Sergei Shtylyov <sergei.shtylyov@gmail.com>
  L:    netdev@vger.kernel.org
  L:    linux-renesas-soc@vger.kernel.org
 -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
@@@ -15081,13 -15042,10 +15091,13 @@@ ROCKCHIP ISP V1 DRIVE
  M:    Helen Koike <helen.koike@collabora.com>
  M:    Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
  L:    linux-media@vger.kernel.org
 +L:    linux-rockchip@lists.infradead.org
  S:    Maintained
  F:    Documentation/admin-guide/media/rkisp1.rst
 +F:    Documentation/devicetree/bindings/media/rockchip-isp1.yaml
  F:    Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
 -F:    drivers/staging/media/rkisp1/
 +F:    drivers/media/platform/rockchip/rkisp1
 +F:    include/uapi/linux/rkisp1-config.h
  
  ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
  M:    Jacob Chen <jacob-chen@iotwrt.com>
@@@ -15311,6 -15269,7 +15321,6 @@@ F:   drivers/iommu/s390-iommu.
  S390 IUCV NETWORK LAYER
  M:    Julian Wiedmann <jwi@linux.ibm.com>
  M:    Karsten Graul <kgraul@linux.ibm.com>
 -M:    Ursula Braun <ubraun@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -15321,6 -15280,7 +15331,6 @@@ F:   net/iucv
  S390 NETWORK DRIVERS
  M:    Julian Wiedmann <jwi@linux.ibm.com>
  M:    Karsten Graul <kgraul@linux.ibm.com>
 -M:    Ursula Braun <ubraun@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -15422,6 -15382,7 +15432,6 @@@ F:   security/safesetid
  
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Krzysztof Kozlowski <krzk@kernel.org>
 -M:    Sangbeom Kim <sbkim73@samsung.com>
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
@@@ -15456,6 -15417,7 +15466,6 @@@ S:   Maintaine
  F:    drivers/platform/x86/samsung-laptop.c
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
 -M:    Sangbeom Kim <sbkim73@samsung.com>
  M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    linux-kernel@vger.kernel.org
@@@ -15489,12 -15451,14 +15499,12 @@@ F:        Documentation/devicetree/bindings/ne
  F:    drivers/nfc/s3fwrn5
  
  SAMSUNG S5C73M3 CAMERA DRIVER
 -M:    Kyungmin Park <kyungmin.park@samsung.com>
  M:    Andrzej Hajda <a.hajda@samsung.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
  F:    drivers/media/i2c/s5c73m3/*
  
  SAMSUNG S5K5BAF CAMERA DRIVER
 -M:    Kyungmin Park <kyungmin.park@samsung.com>
  M:    Andrzej Hajda <a.hajda@samsung.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
@@@ -15512,6 -15476,7 +15522,6 @@@ F:   Documentation/devicetree/bindings/cr
  F:    drivers/crypto/s5p-sss.c
  
  SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
 -M:    Kyungmin Park <kyungmin.park@samsung.com>
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
@@@ -15534,6 -15499,7 +15544,6 @@@ F:   include/linux/clk/samsung.
  F:    include/linux/platform_data/clk-s3c2410.h
  
  SAMSUNG SPI DRIVERS
 -M:    Kukjin Kim <kgene@kernel.org>
  M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Andi Shyti <andi@etezian.org>
  L:    linux-spi@vger.kernel.org
@@@ -15559,6 -15525,7 +15569,6 @@@ T:   git https://github.com/lmajewski/lin
  F:    drivers/thermal/samsung/
  
  SAMSUNG USB2 PHY DRIVER
 -M:    Kamil Debski <kamil@wypas.org>
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
@@@ -15857,8 -15824,9 +15867,8 @@@ F:   drivers/slimbus
  F:    include/linux/slimbus.h
  
  SFC NETWORK DRIVER
 -M:    Solarflare linux maintainers <linux-net-drivers@solarflare.com>
 -M:    Edward Cree <ecree@solarflare.com>
 -M:    Martin Habets <mhabets@solarflare.com>
 +M:    Edward Cree <ecree.xilinx@gmail.com>
 +M:    Martin Habets <habetsm.xilinx@gmail.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/sfc/
@@@ -15886,6 -15854,7 +15896,6 @@@ S:   Maintaine
  F:    drivers/misc/sgi-xp/
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 -M:    Ursula Braun <ubraun@linux.ibm.com>
  M:    Karsten Graul <kgraul@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
@@@ -16166,6 -16135,16 +16176,6 @@@ S:  Maintaine
  F:    drivers/firmware/smccc/
  F:    include/linux/arm-smccc.h
  
 -SMIA AND SMIA++ IMAGE SENSOR DRIVER
 -M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 -L:    linux-media@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
 -F:    drivers/media/i2c/smiapp-pll.c
 -F:    drivers/media/i2c/smiapp-pll.h
 -F:    drivers/media/i2c/smiapp/
 -F:    include/uapi/linux/smiapp.h
 -
  SMM665 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
@@@ -16328,7 -16307,7 +16338,7 @@@ M:   Ricardo Ribalda <ribalda@kernel.org
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/sony,imx214.txt
 +F:    Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
  F:    drivers/media/i2c/imx214.c
  
  SONY IMX219 SENSOR DRIVER
@@@ -18137,7 -18116,7 +18147,7 @@@ M:   Yu Chen <chenyu56@huawei.com
  M:    Binghui Wang <wangbinghui@hisilicon.com>
  L:    linux-usb@vger.kernel.org
  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
@@@ -18222,14 -18201,6 +18232,14 @@@ L: linux-usb@vger.kernel.or
  S:    Supported
  F:    drivers/usb/class/usblp.c
  
 +USB RAW GADGET DRIVER
 +R:    Andrey Konovalov <andreyknvl@gmail.com>
 +L:    linux-usb@vger.kernel.org
 +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 <bjorn@mork.no>
  L:    netdev@vger.kernel.org
@@@ -19055,18 -19026,12 +19065,18 @@@ L:        linux-kernel@vger.kernel.or
  S:    Maintained
  N:    axp[128]
  
 -X.25 NETWORK LAYER
 -M:    Andrew Hendry <andrew.hendry@gmail.com>
 +X.25 STACK
 +M:    Martin Schiller <ms@dev.tdt.de>
  L:    linux-x25@vger.kernel.org
 -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)
@@@ -19180,17 -19145,12 +19190,17 @@@ L:        netdev@vger.kernel.or
  L:    bpf@vger.kernel.org
  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 <bjorn.topel@intel.com>
@@@ -19199,12 -19159,9 +19209,12 @@@ R: Jonathan Lemon <jonathan.lemon@gmail
  L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  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*
@@@ -19472,13 -19429,6 +19482,13 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    Documentation/filesystems/zonefs.rst
  F:    fs/zonefs/
  
 +ZPOOL COMPRESSED PAGE STORAGE API
 +M:    Dan Streetman <ddstreet@ieee.org>
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +F:    include/linux/zpool.h
 +F:    mm/zpool.c
 +
  ZR36067 VIDEO FOR LINUX DRIVER
  M:    Corentin Labbe <clabbe@baylibre.com>
  L:    mjpeg-users@lists.sourceforge.net
@@@ -19489,6 -19439,13 +19499,6 @@@ Q:  https://patchwork.linuxtv.org/projec
  F:    Documentation/driver-api/media/drivers/zoran.rst
  F:    drivers/staging/media/zoran/
  
 -ZPOOL COMPRESSED PAGE STORAGE API
 -M:    Dan Streetman <ddstreet@ieee.org>
 -L:    linux-mm@kvack.org
 -S:    Maintained
 -F:    include/linux/zpool.h
 -F:    mm/zpool.c
 -
  ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
  M:    Minchan Kim <minchan@kernel.org>
  M:    Nitin Gupta <ngupta@vflare.org>
@@@ -500,7 -500,6 +500,7 @@@ CONFIG_GPIO_ALTERA=
  CONFIG_GPIO_DWAPB=y
  CONFIG_GPIO_MB86S7X=y
  CONFIG_GPIO_MPC8XXX=y
 +CONFIG_GPIO_MXC=y
  CONFIG_GPIO_PL061=y
  CONFIG_GPIO_RCAR=y
  CONFIG_GPIO_UNIPHIER=y
@@@ -1082,6 -1081,7 +1082,7 @@@ CONFIG_CRYPTO_DEV_CCREE=
  CONFIG_CRYPTO_DEV_HISI_SEC2=m
  CONFIG_CRYPTO_DEV_HISI_ZIP=m
  CONFIG_CRYPTO_DEV_HISI_HPRE=m
+ CONFIG_CRYPTO_DEV_HISI_TRNG=m
  CONFIG_CMA_SIZE_MBYTES=32
  CONFIG_PRINTK_TIME=y
  CONFIG_DEBUG_INFO=y
@@@ -158,7 -158,6 +158,7 @@@ static unsigned int crypto_poly1305_set
                        dctx->s[1] = get_unaligned_le32(&inp[4]);
                        dctx->s[2] = get_unaligned_le32(&inp[8]);
                        dctx->s[3] = get_unaligned_le32(&inp[12]);
 +                      acc += POLY1305_BLOCK_SIZE;
                        dctx->sset = true;
                }
        }
@@@ -210,7 -209,7 +210,7 @@@ void poly1305_final_arch(struct poly130
        }
  
        poly1305_simd_emit(&dctx->h, dst, dctx->s);
-       *dctx = (struct poly1305_desc_ctx){};
+       memzero_explicit(dctx, sizeof(*dctx));
  }
  EXPORT_SYMBOL(poly1305_final_arch);
  
@@@ -7,13 -7,14 +7,14 @@@
   *
   * This file add support for MD5 and SHA1/SHA224/SHA256/SHA384/SHA512.
   *
 - * You could find the datasheet in Documentation/arm/sunxi/README
 + * You could find the datasheet in Documentation/arm/sunxi.rst
   */
  #include <linux/dma-mapping.h>
  #include <linux/pm_runtime.h>
  #include <linux/scatterlist.h>
  #include <crypto/internal/hash.h>
- #include <crypto/sha.h>
+ #include <crypto/sha1.h>
+ #include <crypto/sha2.h>
  #include <crypto/md5.h>
  #include "sun8i-ce.h"
  
@@@ -262,13 -263,13 +263,13 @@@ int sun8i_ce_hash_run(struct crypto_eng
        u32 common;
        u64 byte_count;
        __le32 *bf;
-       void *buf;
+       void *buf = NULL;
        int j, i, todo;
        int nbw = 0;
        u64 fill, min_fill;
        __be64 *bebits;
        __le64 *lebits;
-       void *result;
+       void *result = NULL;
        u64 bs;
        int digestsize;
        dma_addr_t addr_res, addr_pad;
  
        /* the padding could be up to two block. */
        buf = kzalloc(bs * 2, GFP_KERNEL | GFP_DMA);
-       if (!buf)
-               return -ENOMEM;
+       if (!buf) {
+               err = -ENOMEM;
+               goto theend;
+       }
        bf = (__le32 *)buf;
  
        result = kzalloc(digestsize, GFP_KERNEL | GFP_DMA);
-       if (!result)
-               return -ENOMEM;
+       if (!result) {
+               err = -ENOMEM;
+               goto theend;
+       }
  
        flow = rctx->flow;
        chan = &ce->chanlist[flow];
        dma_unmap_sg(ce->dev, areq->src, nr_sgs, DMA_TO_DEVICE);
        dma_unmap_single(ce->dev, addr_res, digestsize, DMA_FROM_DEVICE);
  
-       kfree(buf);
  
        memcpy(areq->result, result, algt->alg.hash.halg.digestsize);
-       kfree(result);
  theend:
+       kfree(buf);
+       kfree(result);
        crypto_finalize_hash_request(engine, breq, err);
        return 0;
  }
diff --combined drivers/tee/tee_core.c
@@@ -14,7 -14,7 +14,7 @@@
  #include <linux/tee_drv.h>
  #include <linux/uaccess.h>
  #include <crypto/hash.h>
- #include <crypto/sha.h>
+ #include <crypto/sha1.h>
  #include "tee_private.h"
  
  #define TEE_NUM_DEVICES       32
@@@ -200,8 -200,7 +200,8 @@@ int tee_session_calc_client_uuid(uuid_
        int name_len;
        int rc;
  
 -      if (connection_method == TEE_IOCTL_LOGIN_PUBLIC) {
 +      if (connection_method == TEE_IOCTL_LOGIN_PUBLIC ||
 +          connection_method == TEE_IOCTL_LOGIN_REE_KERNEL) {
                /* Nil UUID to be passed to TEE environment */
                uuid_copy(uuid, &uuid_null);
                return 0;
diff --combined fs/crypto/fname.c
@@@ -14,7 -14,7 +14,7 @@@
  #include <linux/namei.h>
  #include <linux/scatterlist.h>
  #include <crypto/hash.h>
- #include <crypto/sha.h>
+ #include <crypto/sha2.h>
  #include <crypto/skcipher.h>
  #include "fscrypt_private.h"
  
@@@ -404,7 -404,7 +404,7 @@@ int fscrypt_setup_filename(struct inod
                fname->disk_name.len = iname->len;
                return 0;
        }
 -      ret = fscrypt_get_encryption_info(dir);
 +      ret = fscrypt_get_encryption_info(dir, lookup);
        if (ret)
                return ret;
  
@@@ -560,11 -560,7 +560,11 @@@ int fscrypt_d_revalidate(struct dentry 
                return -ECHILD;
  
        dir = dget_parent(dentry);
 -      err = fscrypt_get_encryption_info(d_inode(dir));
 +      /*
 +       * Pass allow_unsupported=true, so that files with an unsupported
 +       * encryption policy can be deleted.
 +       */
 +      err = fscrypt_get_encryption_info(d_inode(dir), true);
        valid = !fscrypt_has_encryption_key(d_inode(dir));
        dput(dir);
  
@@@ -14,7 -14,7 +14,7 @@@
  
  #define pr_fmt(fmt) "fs-verity: " fmt
  
- #include <crypto/sha.h>
+ #include <crypto/sha2.h>
  #include <linux/fsverity.h>
  #include <linux/mempool.h>
  
@@@ -67,22 -67,52 +67,22 @@@ struct merkle_tree_params 
   * When a verity file is first opened, an instance of this struct is allocated
   * and stored in ->i_verity_info; it remains until the inode is evicted.  It
   * caches information about the Merkle tree that's needed to efficiently verify
 - * data read from the file.  It also caches the file measurement.  The Merkle
 - * tree pages themselves are not cached here, but the filesystem may cache them.
 + * data read from the file.  It also caches the file digest.  The Merkle tree
 + * pages themselves are not cached here, but the filesystem may cache them.
   */
  struct fsverity_info {
        struct merkle_tree_params tree_params;
        u8 root_hash[FS_VERITY_MAX_DIGEST_SIZE];
 -      u8 measurement[FS_VERITY_MAX_DIGEST_SIZE];
 +      u8 file_digest[FS_VERITY_MAX_DIGEST_SIZE];
        const struct inode *inode;
  };
  
 -/*
 - * Merkle tree properties.  The file measurement is the hash of this structure
 - * excluding the signature and with the sig_size field set to 0.
 - */
 -struct fsverity_descriptor {
 -      __u8 version;           /* must be 1 */
 -      __u8 hash_algorithm;    /* Merkle tree hash algorithm */
 -      __u8 log_blocksize;     /* log2 of size of data and tree blocks */
 -      __u8 salt_size;         /* size of salt in bytes; 0 if none */
 -      __le32 sig_size;        /* size of signature in bytes; 0 if none */
 -      __le64 data_size;       /* size of file the Merkle tree is built over */
 -      __u8 root_hash[64];     /* Merkle tree root hash */
 -      __u8 salt[32];          /* salt prepended to each hashed block */
 -      __u8 __reserved[144];   /* must be 0's */
 -      __u8 signature[];       /* optional PKCS#7 signature */
 -};
 -
  /* Arbitrary limit to bound the kmalloc() size.  Can be changed. */
  #define FS_VERITY_MAX_DESCRIPTOR_SIZE 16384
  
  #define FS_VERITY_MAX_SIGNATURE_SIZE  (FS_VERITY_MAX_DESCRIPTOR_SIZE - \
                                         sizeof(struct fsverity_descriptor))
  
 -/*
 - * Format in which verity file measurements are signed.  This is the same as
 - * 'struct fsverity_digest', except here some magic bytes are prepended to
 - * provide some context about what is being signed in case the same key is used
 - * for non-fsverity purposes, and here the fields have fixed endianness.
 - */
 -struct fsverity_signed_digest {
 -      char magic[8];                  /* must be "FSVerity" */
 -      __le16 digest_algorithm;
 -      __le16 digest_size;
 -      __u8 digest[];
 -};
 -
  /* hash_algs.c */
  
  extern struct fsverity_hash_alg fsverity_hash_algs[];
diff --combined include/linux/filter.h
@@@ -21,7 -21,7 +21,7 @@@
  #include <linux/if_vlan.h>
  #include <linux/vmalloc.h>
  #include <linux/sockptr.h>
- #include <crypto/sha.h>
+ #include <crypto/sha1.h>
  
  #include <net/sch_generic.h>
  
@@@ -558,21 -558,21 +558,21 @@@ struct sk_filter 
  DECLARE_STATIC_KEY_FALSE(bpf_stats_enabled_key);
  
  #define __BPF_PROG_RUN(prog, ctx, dfunc)      ({                      \
 -      u32 ret;                                                        \
 +      u32 __ret;                                                      \
        cant_migrate();                                                 \
        if (static_branch_unlikely(&bpf_stats_enabled_key)) {           \
 -              struct bpf_prog_stats *stats;                           \
 -              u64 start = sched_clock();                              \
 -              ret = dfunc(ctx, (prog)->insnsi, (prog)->bpf_func);     \
 -              stats = this_cpu_ptr(prog->aux->stats);                 \
 -              u64_stats_update_begin(&stats->syncp);                  \
 -              stats->cnt++;                                           \
 -              stats->nsecs += sched_clock() - start;                  \
 -              u64_stats_update_end(&stats->syncp);                    \
 +              struct bpf_prog_stats *__stats;                         \
 +              u64 __start = sched_clock();                            \
 +              __ret = dfunc(ctx, (prog)->insnsi, (prog)->bpf_func);   \
 +              __stats = this_cpu_ptr(prog->aux->stats);               \
 +              u64_stats_update_begin(&__stats->syncp);                \
 +              __stats->cnt++;                                         \
 +              __stats->nsecs += sched_clock() - __start;              \
 +              u64_stats_update_end(&__stats->syncp);                  \
        } else {                                                        \
 -              ret = dfunc(ctx, (prog)->insnsi, (prog)->bpf_func);     \
 +              __ret = dfunc(ctx, (prog)->insnsi, (prog)->bpf_func);   \
        }                                                               \
 -      ret; })
 +      __ret; })
  
  #define BPF_PROG_RUN(prog, ctx)                                               \
        __BPF_PROG_RUN(prog, ctx, bpf_dispatcher_nop_func)
diff --combined net/mptcp/subflow.c
@@@ -10,7 -10,7 +10,7 @@@
  #include <linux/module.h>
  #include <linux/netdevice.h>
  #include <crypto/algapi.h>
- #include <crypto/sha.h>
+ #include <crypto/sha2.h>
  #include <net/sock.h>
  #include <net/inet_common.h>
  #include <net/inet_hashtables.h>
@@@ -543,8 -543,9 +543,8 @@@ create_msk
                        fallback = true;
        } else if (subflow_req->mp_join) {
                mptcp_get_options(skb, &mp_opt);
 -              if (!mp_opt.mp_join ||
 -                  !mptcp_can_accept_new_subflow(subflow_req->msk) ||
 -                  !subflow_hmac_valid(req, &mp_opt)) {
 +              if (!mp_opt.mp_join || !subflow_hmac_valid(req, &mp_opt) ||
 +                  !mptcp_can_accept_new_subflow(subflow_req->msk)) {
                        SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINACKMAC);
                        fallback = true;
                }