Merge tag 'kbuild-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

Pull Kbuild updates from Masahiro Yamada:

 - Support 'make compile_commands.json' to generate the compilation
   database more easily, avoiding stale entries

 - Support 'make clang-analyzer' and 'make clang-tidy' for static checks
   using clang-tidy

 - Preprocess scripts/modules.lds.S to allow CONFIG options in the
   module linker script

 - Drop cc-option tests from compiler flags supported by our minimal
   GCC/Clang versions

 - Use always 12-digits commit hash for CONFIG_LOCALVERSION_AUTO=y

 - Use sha1 build id for both BFD linker and LLD

 - Improve deb-pkg for reproducible builds and rootless builds

 - Remove stale, useless scripts/namespace.pl

 - Turn -Wreturn-type warning into error

 - Fix build error of deb-pkg when CONFIG_MODULES=n

 - Replace 'hostname' command with more portable 'uname -n'

 - Various Makefile cleanups

* tag 'kbuild-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (34 commits)
  kbuild: Use uname for LINUX_COMPILE_HOST detection
  kbuild: Only add -fno-var-tracking-assignments for old GCC versions
  kbuild: remove leftover comment for filechk utility
  treewide: remove DISABLE_LTO
  kbuild: deb-pkg: clean up package name variables
  kbuild: deb-pkg: do not build linux-headers package if CONFIG_MODULES=n
  kbuild: enforce -Werror=return-type
  scripts: remove namespace.pl
  builddeb: Add support for all required debian/rules targets
  builddeb: Enable rootless builds
  builddeb: Pass -n to gzip for reproducible packages
  kbuild: split the build log of kallsyms
  kbuild: explicitly specify the build id style
  scripts/setlocalversion: make git describe output more reliable
  kbuild: remove cc-option test of -Werror=date-time
  kbuild: remove cc-option test of -fno-stack-check
  kbuild: remove cc-option test of -fno-strict-overflow
  kbuild: move CFLAGS_{KASAN,UBSAN,KCSAN} exports to relevant Makefiles
  kbuild: remove redundant CONFIG_KASAN check from scripts/Makefile.kasan
  kbuild: do not create built-in objects for external module builds
  ...

diff --combined Documentation/process/submit-checklist.rst
index b681e862a33555cce2a838c5149873573128c66e,e201a6033469385ef66d5ee9ba4d0b9915c7e823..1879f881c300d6d57c12a036d5d5f34c0ad7cb6d
--- 1/Documentation/process/submit-checklist.rst
--- 2/Documentation/process/submit-checklist.rst
+++ b/Documentation/process/submit-checklist.rst
@@@ -24,10 -24,6 +24,10 @@@ and elsewhere regarding submitting Linu
  
    c) Builds successfully when using ``O=builddir``
  
 +  d) Any Documentation/ changes build successfully without new warnings/errors.
 +     Use ``make htmldocs`` or ``make pdfdocs`` to check the build and
 +     fix any issues.
 +
  3) Builds on multiple CPU architectures by using local cross-compile tools
     or some other build farm.
  
@@@ -53,8 -49,7 +53,7 @@@
  
  9) Check cleanly with sparse.
  
- 10) Use ``make checkstack`` and ``make namespacecheck`` and fix any problems
-     that they find.
+ 10) Use ``make checkstack`` and fix any problems that it finds.
  
      .. note::
  

diff --combined MAINTAINERS
index f5570ae5f451eb265e341bb1a5b06897ff8ec266,05bebba204cff587de6f7f485b3d18bedc5e7181..fcb3b83f9c1aa5fbb95aa08fae139b31575d5333
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -405,7 -405,7 +405,7 @@@ F: drivers/platform/x86/i2c-multi-insta
  ACPI PMIC DRIVERS
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Len Brown <[email protected]>
 -R:    Andy Shevchenko <and[email protected]>
 +R:    Andy Shevchenko <and[email protected]>
  R:    Mika Westerberg <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -802,13 -802,6 +802,13 @@@ S:       Maintaine
  F:    Documentation/devicetree/bindings/interrupt-controller/amazon,al-fic.txt
  F:    drivers/irqchip/irq-al-fic.c
  
 +AMAZON ANNAPURNA LABS MEMORY CONTROLLER EDAC
 +M:    Talel Shenhar <[email protected]>
 +M:    Talel Shenhar <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/edac/amazon,al-mc-edac.yaml
 +F:    drivers/edac/al_mc_edac.c
 +
  AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
  M:    Talel Shenhar <[email protected]>
  S:    Maintained
@@@ -950,12 -943,37 +950,12 @@@ S:      Supporte
  F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
  F:    drivers/net/ethernet/amd/xgbe/
  
 -ANALOG DEVICES INC AD5686 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    drivers/iio/dac/ad5686*
 -F:    drivers/iio/dac/ad5696*
 -
 -ANALOG DEVICES INC AD5758 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
 -F:    drivers/iio/dac/ad5758.c
 -
 -ANALOG DEVICES INC AD7091R5 DRIVER
 -M:    Beniamin Bia <[email protected]>
 +AMS AS73211 DRIVER
 +M:    Christian Eggers <[email protected]>
  L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml
 -F:    drivers/iio/adc/ad7091r5.c
 -
 -ANALOG DEVICES INC AD7124 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
 -F:    drivers/iio/adc/ad7124.c
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
 +F:    drivers/iio/light/as73211.c
  
  ANALOG DEVICES INC AD7192 DRIVER
  M:    Alexandru Tachici <[email protected]>
@@@ -973,6 -991,15 +973,6 @@@ W:        http://ez.analog.com/community/linux
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
  F:    drivers/iio/adc/ad7292.c
  
 -ANALOG DEVICES INC AD7606 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -M:    Beniamin Bia <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
 -F:    drivers/iio/adc/ad7606.c
 -
  ANALOG DEVICES INC AD7768-1 DRIVER
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
@@@ -1034,6 -1061,7 +1034,6 @@@ F:      drivers/iio/imu/adis16475.
  F:    Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
  
  ANALOG DEVICES INC ADM1177 DRIVER
 -M:    Beniamin Bia <[email protected]>
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -1080,13 -1108,6 +1080,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/adv7842*
  
 +ANALOG DEVICES INC ADXRS290 DRIVER
 +M:    Nishant Malpani <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/iio/gyro/adxrs290.c
 +F:    Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml
 +
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  M:    Nuno Sá <[email protected]>
@@@ -1107,6 -1128,15 +1107,6 @@@ S:     Supporte
  W:    http://ez.analog.com/community/linux-device-drivers
  F:    drivers/dma/dma-axi-dmac.c
  
 -ANALOG DEVICES INC HMC425A DRIVER
 -M:    Beniamin Bia <[email protected]>
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/amplifiers/adi,hmc425a.yaml
 -F:    drivers/iio/amplifiers/hmc425a.c
 -
  ANALOG DEVICES INC IIO DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  M:    Michael Hennerich <[email protected]>
@@@ -1115,11 -1145,8 +1115,11 @@@ W:    http://wiki.analog.com
  W:    http://ez.analog.com/community/linux-device-drivers
  F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
  F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
 +F:    Documentation/devicetree/bindings/iio/*/adi,*
 +F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
  F:    drivers/iio/*/ad*
  F:    drivers/iio/adc/ltc249*
 +F:    drivers/iio/amplifiers/hmc425a.c
  F:    drivers/staging/iio/*/ad*
  X:    drivers/iio/*/adjd*
  
@@@ -1259,7 -1286,7 +1259,7 @@@ S:      Supporte
  F:    Documentation/devicetree/bindings/net/apm-xgene-enet.txt
  F:    Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
  F:    drivers/net/ethernet/apm/xgene/
 -F:    drivers/net/phy/mdio-xgene.c
 +F:    drivers/net/mdio/mdio-xgene.c
  
  APPLIED MICRO (APM) X-GENE SOC PMU
  M:    Khuong Dinh <[email protected]>
@@@ -1433,11 -1460,6 +1433,11 @@@ S:    Odd Fixe
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
 +ARM PRIMECELL CLCD PL110 DRIVER
 +M:    Russell King <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/video/fbdev/amba-clcd.*
 +
  ARM PRIMECELL KMI PL050 DRIVER
  M:    Russell King <[email protected]>
  S:    Odd Fixes
@@@ -1484,7 -1506,8 +1484,7 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/iommu/arm,smmu*
  F:    drivers/iommu/arm/
 -F:    drivers/iommu/io-pgtable-arm-v7s.c
 -F:    drivers/iommu/io-pgtable-arm.c
 +F:    drivers/iommu/io-pgtable-arm*
  
  ARM SUB-ARCHITECTURES
  L:    [email protected] (moderated for non-subscribers)
@@@ -1500,11 -1523,10 +1500,11 @@@ L:   [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/actions.yaml
  F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
 -F:    Documentation/devicetree/bindings/dma/owl-dma.txt
 +F:    Documentation/devicetree/bindings/dma/owl-dma.yaml
  F:    Documentation/devicetree/bindings/i2c/i2c-owl.txt
 +F:    Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml
  F:    Documentation/devicetree/bindings/mmc/owl-mmc.yaml
 -F:    Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt
 +F:    Documentation/devicetree/bindings/pinctrl/actions,*
  F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
  F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
  F:    arch/arm/boot/dts/owl-*
@@@ -1514,7 -1536,6 +1514,7 @@@ F:      drivers/clk/actions
  F:    drivers/clocksource/timer-owl*
  F:    drivers/dma/owl-dma.c
  F:    drivers/i2c/busses/i2c-owl.c
 +F:    drivers/irqchip/irq-owl-sirq.c
  F:    drivers/mmc/host/owl-mmc.c
  F:    drivers/pinctrl/actions/*
  F:    drivers/soc/actions/
@@@ -1602,7 -1623,7 +1602,7 @@@ N:      meso
  
  ARM/Annapurna Labs ALPINE ARCHITECTURE
  M:    Tsahee Zidenberg <[email protected]>
 -M:    Antoine Tenart <a[email protected]>
 +M:    Antoine Tenart <a[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/alpine*
@@@ -1673,6 -1694,7 +1673,6 @@@ F:      arch/arm/mach-cns3xxx
  
  ARM/CAVIUM THUNDER NETWORK DRIVER
  M:    Sunil Goutham <[email protected]>
 -M:    Robert Richter <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    drivers/net/ethernet/cavium/thunder/
@@@ -1725,7 -1747,6 +1725,7 @@@ ARM/CORESIGHT FRAMEWORK AND DRIVER
  M:    Mathieu Poirier <[email protected]>
  R:    Suzuki K Poulose <[email protected]>
  R:    Mike Leach <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
@@@ -2425,7 -2446,7 +2425,7 @@@ L:      [email protected] (m
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/s5p-cec.txt
 -F:    drivers/media/platform/s5p-cec/
 +F:    drivers/media/cec/platform/s5p/
  
  ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
  M:    Andrzej Pietrasiewicz <[email protected]>
@@@ -2484,7 -2505,7 +2484,7 @@@ S:      Maintaine
  F:    drivers/clk/socfpga/
  
  ARM/SOCFPGA EDAC SUPPORT
 -M:    Thor Thayer <[email protected]>
 +M:    Dinh Nguyen <[email protected]>
  S:    Maintained
  F:    drivers/edac/altera_edac.
  
@@@ -2570,7 -2591,7 +2570,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/tegra-cec.txt
 -F:    drivers/media/platform/tegra-cec/
 +F:    drivers/media/cec/platform/tegra/
  
  ARM/TETON BGA MACHINE SUPPORT
  M:    "Mark F. Brown" <[email protected]>
@@@ -3184,7 -3205,6 +3184,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  F:    block/
  F:    drivers/block/
 +F:    include/linux/blk*
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
  
@@@ -3238,7 -3258,7 +3238,7 @@@ M:      Daniel Borkmann <[email protected]
  R:    Martin KaFai Lau <[email protected]>
  R:    Song Liu <[email protected]>
  R:    Yonghong Song <[email protected]>
 -R:    Andrii Nakryiko <andrii[email protected]>
 +R:    Andrii Nakryiko <andrii@kernel.org>
  R:    John Fastabend <[email protected]>
  R:    KP Singh <[email protected]>
  L:    [email protected]
@@@ -3368,7 -3388,6 +3368,7 @@@ M:      Florian Fainelli <[email protected]
  L:    [email protected]
  L:    [email protected] (subscribers-only)
  S:    Supported
 +F:    Documentation/devicetree/bindings/net/dsa/b53.txt
  F:    drivers/net/dsa/b53/*
  F:    include/linux/platform_data/b53.h
  
@@@ -3455,14 -3474,6 +3455,14 @@@ F:    drivers/bus/brcmstb_gisb.
  F:    drivers/pci/controller/pcie-brcmstb.c
  N:    brcmstb
  
 +BROADCOM BDC DRIVER
 +M:    Al Cooper <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/brcm,bdc.txt
 +F:    drivers/usb/gadget/udc/bdc/
 +
  BROADCOM BMIPS CPUFREQ DRIVER
  M:    Markus Mayer <[email protected]>
  M:    [email protected]
@@@ -3495,17 -3506,13 +3495,17 @@@ F:   drivers/net/ethernet/broadcom/bnx2.
  F:    drivers/net/ethernet/broadcom/bnx2_*
  
  BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 -M:    [email protected]
 +M:    Saurav Kashyap <[email protected]>
 +M:    Javed Hasan <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2fc/
  
  BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
 -M:    [email protected]
 +M:    Nilesh Javali <[email protected]>
 +M:    Manish Rangankar <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2i/
@@@ -3566,28 -3573,13 +3566,28 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/phy/broadcom/phy-brcm-usb*
  
 +BROADCOM ETHERNET PHY DRIVERS
 +M:    Florian Fainelli <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
 +F:    drivers/net/phy/bcm*.[ch]
 +F:    drivers/net/phy/broadcom.c
 +F:    include/linux/brcmphy.h
 +
  BROADCOM GENET ETHERNET DRIVER
  M:    Doug Berger <[email protected]>
  M:    Florian Fainelli <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
 +F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
  F:    drivers/net/ethernet/broadcom/genet/
 +F:    drivers/net/mdio/mdio-bcm-unimac.c
 +F:    include/linux/platform_data/bcmgenet.h
 +F:    include/linux/platform_data/mdio-bcm-unimac.h
  
  BROADCOM IPROC ARM ARCHITECTURE
  M:    Ray Jui <[email protected]>
@@@ -3840,16 -3832,6 +3840,16 @@@ S:    Orpha
  F:    Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt
  F:    drivers/mtd/nand/raw/cadence-nand-controller.c
  
 +CADENCE USB3 DRD IP DRIVER
 +M:    Peter Chen <[email protected]>
 +M:    Pawel Laszczak <[email protected]>
 +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:    drivers/usb/cdns3/
 +
  CADET FM/AM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -3914,7 -3896,6 +3914,7 @@@ F:      include/net/netns/can.
  F:    include/uapi/linux/can.h
  F:    include/uapi/linux/can/bcm.h
  F:    include/uapi/linux/can/gw.h
 +F:    include/uapi/linux/can/isotp.h
  F:    include/uapi/linux/can/raw.h
  F:    net/can/
  
@@@ -3950,8 -3931,8 +3950,8 @@@ W:      https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/ath/carl9170/
  
  CAVIUM I2C DRIVER
 -M:    Robert Richter <rric[email protected]>
 -S:    Supported
 +M:    Robert Richter <rric@kernel.org>
 +S:    Odd Fixes
  W:    http://www.marvell.com
  F:    drivers/i2c/busses/i2c-octeon*
  F:    drivers/i2c/busses/i2c-thunderx*
@@@ -3966,8 -3947,8 +3966,8 @@@ W:      http://www.marvell.co
  F:    drivers/net/ethernet/cavium/liquidio/
  
  CAVIUM MMC DRIVER
 -M:    Robert Richter <rric[email protected]>
 -S:    Supported
 +M:    Robert Richter <rric@kernel.org>
 +S:    Odd Fixes
  W:    http://www.marvell.com
  F:    drivers/mmc/host/cavium*
  
@@@ -3979,9 -3960,9 +3979,9 @@@ W:      http://www.marvell.co
  F:    drivers/crypto/cavium/cpt/
  
  CAVIUM THUNDERX2 ARM64 SOC
 -M:    Robert Richter <rric[email protected]>
 +M:    Robert Richter <rric@kernel.org>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/devicetree/bindings/arm/cavium-thunder2.txt
  F:    arch/arm64/boot/dts/cavium/thunder2-99xx*
  
@@@ -4033,7 -4014,7 +4033,7 @@@ S:      Supporte
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/cec-gpio.txt
 -F:    drivers/media/platform/cec-gpio/
 +F:    drivers/media/cec/platform/cec-gpio/
  
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <[email protected]>
@@@ -4103,11 -4084,6 +4103,11 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    drivers/char/
  F:    drivers/misc/
  F:    include/linux/miscdevice.h
 +X:    drivers/char/agp/
 +X:    drivers/char/hw_random/
 +X:    drivers/char/ipmi/
 +X:    drivers/char/random.c
 +X:    drivers/char/tpm/
  
  CHECKPATCH
  M:    Andy Whitcroft <[email protected]>
@@@ -4178,7 -4154,6 +4178,7 @@@ CIRRUS LOGIC AUDIO CODEC DRIVER
  M:    James Schulman <[email protected]>
  M:    David Rhodes <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    sound/soc/codecs/cs*
  
@@@ -4256,6 -4231,7 +4256,6 @@@ F:      drivers/net/ethernet/cisco/enic
  CISCO VIC LOW LATENCY NIC DRIVER
  M:    Christian Benvenuti <[email protected]>
  M:    Nelson Escobar <[email protected]>
 -M:    Parvi Kaustubhi <[email protected]>
  S:    Supported
  F:    drivers/infiniband/hw/usnic/
  
@@@ -4265,14 -4241,13 +4265,15 @@@ S:   Maintaine
  F:    .clang-format
  
  CLANG/LLVM BUILD SUPPORT
 +M:    Nathan Chancellor <[email protected]>
 +M:    Nick Desaulniers <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://clangbuiltlinux.github.io/
  B:    https://github.com/ClangBuiltLinux/linux/issues
  C:    irc://chat.freenode.net/clangbuiltlinux
  F:    Documentation/kbuild/llvm.rst
+ F:    scripts/clang-tools/
  K:    \b(?i:clang|llvm)\b
  
  CLEANCACHE API
@@@ -4415,7 -4390,12 +4416,7 @@@ S:     Supporte
  T:    git git://git.infradead.org/users/hch/configfs.git
  F:    fs/configfs/
  F:    include/linux/configfs.h
 -
 -CONNECTOR
 -M:    Evgeniy Polyakov <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/connector/
 +F:    samples/configfs/
  
  CONSOLE SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -4713,15 -4693,6 +4714,15 @@@ S:    Supporte
  W:    http://www.chelsio.com
  F:    drivers/crypto/chelsio
  
 +CXGB4 INLINE CRYPTO DRIVER
 +M:    Ayush Sawal <[email protected]>
 +M:    Vinay Kumar Yadav <[email protected]>
 +M:    Rohit Maheshwari <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    http://www.chelsio.com
 +F:    drivers/net/ethernet/chelsio/inline_crypto/
 +
  CXGB4 ETHERNET DRIVER (CXGB4)
  M:    Vishal Kulkarni <[email protected]>
  L:    [email protected]
@@@ -5024,12 -4995,6 +5025,12 @@@ S:    Maintaine
  F:    drivers/base/devcoredump.c
  F:    include/linux/devcoredump.h
  
 +DEVICE DEPENDENCY HELPER SCRIPT
 +M:    Saravana Kannan <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    scripts/dev-needs.sh
 +
  DEVICE DIRECT ACCESS (DAX)
  M:    Dan Williams <[email protected]>
  M:    Vishal Verma <[email protected]>
@@@ -5226,11 -5191,12 +5227,11 @@@ T:   git git://git.infradead.org/users/hc
  F:    include/asm-generic/dma-mapping.h
  F:    include/linux/dma-direct.h
  F:    include/linux/dma-mapping.h
 -F:    include/linux/dma-noncoherent.h
 +F:    include/linux/dma-map-ops.h
  F:    kernel/dma/
  
  DMA-BUF HEAPS FRAMEWORK
  M:    Sumit Semwal <[email protected]>
 -R:    Andrew F. Davis <[email protected]>
  R:    Benjamin Gaignard <[email protected]>
  R:    Liam Mark <[email protected]>
  R:    Laura Abbott <[email protected]>
@@@ -5274,7 -5240,6 +5275,7 @@@ DOCUMENTATIO
  M:    Jonathan Corbet <[email protected]>
  L:    [email protected]
  S:    Maintained
 +P:    Documentation/doc-guide/maintainer-profile.rst
  T:    git git://git.lwn.net/linux.git docs-next
  F:    Documentation/
  F:    scripts/documentation-file-ref-check
@@@ -5397,6 -5362,7 +5398,6 @@@ F:      include/linux/kobj
  F:    lib/kobj*
  
  DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
 -M:    Kevin Hilman <[email protected]>
  M:    Nishanth Menon <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5427,7 -5393,7 +5428,7 @@@ F:      drivers/gpu/drm/panel/panel-arm-vers
  
  DRM DRIVER FOR ASPEED BMC GFX
  M:    Joel Stanley <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
@@@ -5435,10 -5401,7 +5436,10 @@@ F:    drivers/gpu/drm/aspeed
  
  DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
 -S:    Odd Fixes
 +R:    Thomas Zimmermann <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/ast/
  
  DRM DRIVER FOR BOCHS VIRTUAL GPU
@@@ -5512,24 -5475,14 +5513,24 @@@ S:   Maintaine
  F:    drivers/gpu/drm/panel/panel-lvds.c
  F:    Documentation/devicetree/bindings/display/panel/lvds.yaml
  
 +DRM DRIVER FOR MANTIX MLAF057WE51 PANELS
 +M:    Guido Günther <[email protected]>
 +R:    Purism Kernel Team <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml
 +F:    drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
 +
  DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/mga/
  F:    include/uapi/drm/mga_drm.h
  
 -DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
 +DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
 -S:    Odd Fixes
 +R:    Thomas Zimmermann <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/mgag200/
  
  DRM DRIVER FOR MI0283QT
@@@ -5610,13 -5563,12 +5611,13 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml
  F:    drivers/gpu/drm/panel/panel-raydium-rm67191.c
  
 -DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
 +DRM DRIVER FOR SITRONIX ST7703 PANELS
  M:    Guido Günther <[email protected]>
  R:    Purism Kernel Team <[email protected]>
 +R:    Ondrej Jirman <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
 -F:    drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
 +F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
 +F:    drivers/gpu/drm/panel/panel-sitronix-st7703.c
  
  DRM DRIVER FOR SAVAGE VIDEO CARDS
  S:    Orphan / Obsolete
@@@ -5675,15 -5627,13 +5676,15 @@@ F:   drivers/gpu/drm/panel/panel-tpo-tpg1
  DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
  M:    Dave Airlie <[email protected]>
  R:    Sean Paul <[email protected]>
 +R:    Thomas Zimmermann <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 +S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/udl/
  
  DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
  M:    Rodrigo Siqueira <[email protected]>
 +M:    Melissa Wen <[email protected]>
  R:    Haneen Mohammed <[email protected]>
  R:    Daniel Vetter <[email protected]>
  L:    [email protected]
@@@ -5818,7 -5768,7 +5819,7 @@@ F:      drivers/gpu/drm/gma500
  
  DRM DRIVERS FOR HISILICON
  M:    Xinliang Liu <[email protected]>
 -M:    Rongrong Zou <zourongrong@gmail.com>
 +M:    Tian Tao  <tiantao6@hisilicon.com>
  R:    John Stultz <[email protected]>
  R:    Xinwei Kong <[email protected]>
  R:    Chen Feng <[email protected]>
@@@ -5844,7 -5794,6 +5845,7 @@@ L:      [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/display/mediatek/
  F:    drivers/gpu/drm/mediatek/
 +F:    drivers/phy/mediatek/phy-mtk-hdmi*
  
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <[email protected]>
@@@ -5866,7 -5815,7 +5867,7 @@@ L:      [email protected]
  S:    Supported
  T:    git git://linuxtv.org/pinchartl/media drm/du/next
  F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
 -F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
 +F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
  F:    Documentation/devicetree/bindings/display/renesas,du.txt
  F:    drivers/gpu/drm/rcar-du/
  F:    drivers/gpu/drm/shmobile/
@@@ -6213,27 -6162,28 +6214,27 @@@ F:   Documentation/devicetree/bindings/ed
  F:    drivers/edac/aspeed_edac.c
  
  EDAC-BLUEFIELD
 -M:    Shravan Kumar Ramani <sramani@nvidia.com>
 +M:    Shravan Kumar Ramani <shravankr@nvidia.com>
  S:    Supported
  F:    drivers/edac/bluefield_edac.c
  
  EDAC-CALXEDA
 -M:    Robert Richter <[email protected]>
 +M:    Andre Przywara <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/highbank*
  
  EDAC-CAVIUM OCTEON
  M:    Ralf Baechle <[email protected]>
 -M:    Robert Richter <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/edac/octeon_edac*
  
  EDAC-CAVIUM THUNDERX
 -M:    Robert Richter <rric[email protected]>
 +M:    Robert Richter <rric@kernel.org>
  L:    [email protected]
 -S:    Supported
 +S:    Odd Fixes
  F:    drivers/edac/thunderx_edac*
  
  EDAC-CORE
@@@ -6241,7 -6191,7 +6242,7 @@@ M:      Borislav Petkov <[email protected]
  M:    Mauro Carvalho Chehab <[email protected]>
  M:    Tony Luck <[email protected]>
  R:    James Morse <[email protected]>
 -R:    Robert Richter <rric[email protected]>
 +R:    Robert Richter <rric@kernel.org>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
@@@ -6545,6 -6495,7 +6546,6 @@@ F:      net/bridge
  
  ETHERNET PHY LIBRARY
  M:    Andrew Lunn <[email protected]>
 -M:    Florian Fainelli <[email protected]>
  M:    Heiner Kallweit <[email protected]>
  R:    Russell King <[email protected]>
  L:    [email protected]
@@@ -6554,14 -6505,11 +6555,14 @@@ F:   Documentation/devicetree/bindings/ne
  F:    Documentation/devicetree/bindings/net/mdio*
  F:    Documentation/devicetree/bindings/net/qca,ar803x.yaml
  F:    Documentation/networking/phy.rst
 +F:    drivers/net/mdio/
 +F:    drivers/net/mdio/of_mdio.c
 +F:    drivers/net/pcs/
  F:    drivers/net/phy/
 -F:    drivers/of/of_mdio.c
  F:    drivers/of/of_net.c
  F:    include/dt-bindings/net/qca-ar803x.h
  F:    include/linux/*mdio*.h
 +F:    include/linux/mdio/*.h
  F:    include/linux/of_net.h
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
@@@ -6637,7 -6585,6 +6638,7 @@@ F:      fs/proc/bootconfig.
  F:    include/linux/bootconfig.h
  F:    lib/bootconfig.c
  F:    tools/bootconfig/*
 +F:    tools/bootconfig/scripts/*
  
  EXYNOS DP DRIVER
  M:    Jingoo Han <[email protected]>
@@@ -6651,6 -6598,13 +6652,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/iommu/exynos-iommu.c
  
 -EZchip NPS platform support
 -M:    Vineet Gupta <[email protected]>
 -M:    Ofer Levi <[email protected]>
 -S:    Supported
 -F:    arch/arc/boot/dts/eznps.dts
 -F:    arch/arc/plat-eznps
 -
  F2FS FILE SYSTEM
  M:    Jaegeuk Kim <[email protected]>
  M:    Chao Yu <[email protected]>
@@@ -6858,17 -6812,14 +6859,17 @@@ F:   drivers/net/ethernet/nvidia/
  
  FPGA DFL DRIVERS
  M:    Wu Hao <[email protected]>
 +R:    Tom Rix <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-dfl
  F:    Documentation/fpga/dfl.rst
  F:    drivers/fpga/dfl*
  F:    include/uapi/linux/fpga-dfl.h
  
  FPGA MANAGER FRAMEWORK
  M:    Moritz Fischer <[email protected]>
 +R:    Tom Rix <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://www.rocketboards.org
@@@ -6934,14 -6885,6 +6935,14 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
 +FREESCALE DSPI DRIVER
 +M:    Vladimir Oltean <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi-fsl-dspi.txt
 +F:    drivers/spi/spi-fsl-dspi.c
 +F:    include/linux/spi/spi-fsl-dspi.h
 +
  FREESCALE ENETC ETHERNET DRIVERS
  M:    Claudiu Manoil <[email protected]>
  L:    [email protected]
@@@ -6991,7 -6934,7 +6992,7 @@@ M:      Frank Li <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/perf/imx-ddr.rst
 -F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
 +F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml
  F:    drivers/perf/fsl_imx8_ddr_perf.c
  
  FREESCALE IMX I2C DRIVER
@@@ -6999,7 -6942,7 +7000,7 @@@ M:      Oleksij Rempel <o.rempel@pengutronix
  R:    Pengutronix Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-imx.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-imx.yaml
  F:    drivers/i2c/busses/i2c-imx.c
  
  FREESCALE IMX LPI2C DRIVER
@@@ -7007,7 -6950,7 +7008,7 @@@ M:      Dong Aisheng <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
  F:    drivers/i2c/busses/i2c-imx-lpi2c.c
  
  FREESCALE QORIQ DPAA ETHERNET DRIVER
@@@ -7230,7 -7173,7 +7231,7 @@@ FUSE: FILESYSTEM IN USERSPAC
  M:    Miklos Szeredi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://fuse.sourceforge.net/
 +W:    https://github.com/libfuse/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
  F:    Documentation/filesystems/fuse.rst
  F:    fs/fuse/
@@@ -7274,7 -7217,7 +7275,7 @@@ F:      drivers/staging/gasket
  GCC PLUGINS
  M:    Kees Cook <[email protected]>
  R:    Emese Revfy <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/kbuild/gcc-plugins.rst
  F:    scripts/Makefile.gcc-plugins
@@@ -7774,8 -7717,8 +7775,8 @@@ F:      Documentation/watchdog/hpwdt.rs
  F:    drivers/watchdog/hpwdt.c
  
  HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
 -M:    Don Brace <don.brace@microsemi.com>
 -L:    esc.storagedev@microsemi.com
 +M:    Don Brace <don.brace@microchip.com>
 +L:    storagedev@microchip.com
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/hpsa.rst
@@@ -7784,8 -7727,8 +7785,8 @@@ F:      include/linux/cciss*.
  F:    include/uapi/linux/cciss*.h
  
  HFI1 DRIVER
 -M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
 -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 +M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
 +M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/hw/hfi1
@@@ -7918,13 -7861,6 +7919,13 @@@ W:    http://www.hisilicon.co
  F:    Documentation/devicetree/bindings/net/hisilicon*.txt
  F:    drivers/net/ethernet/hisilicon/
  
 +HIKEY960 ONBOARD USB GPIO HUB DRIVER
 +M:    John Stultz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/misc/hisi_hikey_usb.c
 +F:    Documentation/devicetree/bindings/misc/hisilicon-hikey-usb.yaml
 +
  HISILICON PMU DRIVER
  M:    Shaokun Zhang <[email protected]>
  S:    Supported
@@@ -7968,12 -7904,6 +7969,12 @@@ F:    drivers/crypto/hisilicon/sec2/sec_cr
  F:    drivers/crypto/hisilicon/sec2/sec_crypto.h
  F:    drivers/crypto/hisilicon/sec2/sec_main.c
  
 +HISILICON STAGING DRIVERS FOR HIKEY 960/970
 +M:    Mauro Carvalho Chehab <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/hikey9xx/
 +
  HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
  M:    Zaibo Xu <[email protected]>
  S:    Maintained
@@@ -8326,7 -8256,7 +8327,7 @@@ IA64 (Itanium) PLATFOR
  M:    Tony Luck <[email protected]>
  M:    Fenghua Yu <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
  F:    Documentation/ia64/
  F:    arch/ia64/
@@@ -8375,9 -8305,8 +8376,9 @@@ S:      Supporte
  F:    drivers/pci/hotplug/rpaphp*
  
  IBM Power SRIOV Virtual NIC Device Driver
 -M:    Thomas Falcon <[email protected]>
 -M:    John Allen <[email protected]>
 +M:    Dany Madden <[email protected]>
 +M:    Lijun Pan <[email protected]>
 +M:    Sukadev Bhattiprolu <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmvnic.*
@@@ -8391,7 -8320,7 +8392,7 @@@ F:      arch/powerpc/platforms/powernv/copy-
  F:    arch/powerpc/platforms/powernv/vas*
  
  IBM Power Virtual Ethernet Device Driver
 -M:    Thomas Falcon <tlfalcon@linux.ibm.com>
 +M:    Cristobal Forno <cforno12@linux.ibm.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
@@@ -8551,6 -8480,7 +8552,6 @@@ F:      drivers/iio/multiplexer/iio-mux.
  
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <[email protected]>
 -R:    Hartmut Knaack <[email protected]>
  R:    Lars-Peter Clausen <[email protected]>
  R:    Peter Meerwald-Stadler <[email protected]>
  L:    [email protected]
@@@ -8666,9 -8596,8 +8667,9 @@@ INGENIC JZ47xx SoC
  M:    Paul Cercueil <[email protected]>
  S:    Maintained
  F:    arch/mips/boot/dts/ingenic/
 -F:    arch/mips/include/asm/mach-jz4740/
 -F:    arch/mips/jz4740/
 +F:    arch/mips/generic/board-ingenic.c
 +F:    arch/mips/include/asm/mach-ingenic/
 +F:    arch/mips/ingenic/Kconfig
  F:    drivers/clk/ingenic/
  F:    drivers/dma/dma-jz4780.c
  F:    drivers/gpu/drm/ingenic/
@@@ -8725,7 -8654,7 +8726,7 @@@ F:      drivers/input/input-mt.
  K:    \b(ABS|SYN)_MT_
  
  INSIDE SECURE CRYPTO DRIVER
 -M:    Antoine Tenart <a[email protected]>
 +M:    Antoine Tenart <a[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/crypto/inside-secure/
@@@ -8804,8 -8733,7 +8805,8 @@@ F:      include/drm/i915
  F:    include/uapi/drm/i915_drm.h
  
  INTEL ETHERNET DRIVERS
 -M:    Jeff Kirsher <[email protected]>
 +M:    Jesse Brandeburg <[email protected]>
 +M:    Tony Nguyen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    http://www.intel.com/support/feedback.htm
@@@ -8904,7 -8832,7 +8905,7 @@@ INTEL IPU3 CSI-2 CIO2 DRIVE
  M:    Yong Zhi <[email protected]>
  M:    Sakari Ailus <[email protected]>
  M:    Bingbu Cao <[email protected]>
 -R:    Tian Shu Qiu <[email protected]>
 +R:    Tianshu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
@@@ -8913,7 -8841,7 +8914,7 @@@ F:      drivers/media/pci/intel/ipu3
  INTEL IPU3 CSI-2 IMGU DRIVER
  M:    Sakari Ailus <[email protected]>
  R:    Bingbu Cao <[email protected]>
 -R:    Tian Shu Qiu <[email protected]>
 +R:    Tianshu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/media/ipu3.rst
@@@ -8978,8 -8906,8 +8979,8 @@@ F:      arch/x86/include/asm/intel_punit_ipc
  F:    drivers/platform/x86/intel_punit_ipc.c
  
  INTEL PMC CORE DRIVER
 -M:    Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
 -M:    Vishwanath Somayaji <vishwanath.somayaji@intel.com>
 +M:    Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
 +M:    David E Box <david.e.box@intel.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/intel_pmc_core*
@@@ -8992,7 -8920,7 +8993,7 @@@ F:      drivers/gpio/gpio-*cove.
  F:    drivers/gpio/gpio-msic.c
  
  INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
 -R:    Andy Shevchenko <[email protected]>
 +M:    Andy Shevchenko <[email protected]>
  S:    Maintained
  F:    drivers/mfd/intel_msic.c
  F:    drivers/mfd/intel_soc_pmic*
@@@ -9173,7 -9101,6 +9174,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  F:    Documentation/devicetree/bindings/iommu/
 +F:    Documentation/userspace-api/iommu.rst
  F:    drivers/iommu/
  F:    include/linux/iommu.h
  F:    include/linux/iova.h
@@@ -9300,7 -9227,7 +9301,7 @@@ F:      drivers/firmware/iscsi_ibft
  
  ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
  M:    Sagi Grimberg <[email protected]>
 -M:    Max Gurtovoy <maxg@nvidia.com>
 +M:    Max Gurtovoy <mgurtovoy@nvidia.com>
  L:    [email protected]
  S:    Supported
  W:    http://www.openfabrics.org
@@@ -9556,7 -9483,6 +9557,7 @@@ F:      include/linux/sunrpc
  F:    include/uapi/linux/nfsd/
  F:    include/uapi/linux/sunrpc/
  F:    net/sunrpc/
 +F:    Documentation/filesystems/nfs/
  
  KERNEL SELFTEST FRAMEWORK
  M:    Shuah Khan <[email protected]>
@@@ -9708,7 -9634,7 +9709,7 @@@ F:      security/keys/encrypted-keys
  
  KEYS-TRUSTED
  M:    James Bottomley <[email protected]>
 -M:    Jarkko Sakkinen <jarkko[email protected]>
 +M:    Jarkko Sakkinen <jarkko@kernel.org>
  M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -9720,7 -9646,7 +9721,7 @@@ F:      security/keys/trusted-keys
  
  KEYS/KEYRINGS
  M:    David Howells <[email protected]>
 -M:    Jarkko Sakkinen <jarkko[email protected]>
 +M:    Jarkko Sakkinen <jarkko@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/security/keys/core.rst
@@@ -9767,8 -9693,8 +9768,8 @@@ M:      Catalin Marinas <catalin.marinas@arm
  S:    Maintained
  F:    Documentation/dev-tools/kmemleak.rst
  F:    include/linux/kmemleak.h
 -F:    mm/kmemleak-test.c
  F:    mm/kmemleak.c
 +F:    samples/kmemleak/kmemleak-test.c
  
  KMOD KERNEL MODULE LOADER - USERMODE HELPER
  M:    Luis Chamberlain <[email protected]>
@@@ -9797,12 -9723,6 +9798,12 @@@ F:    Documentation/admin-guide/auxdisplay
  F:    drivers/auxdisplay/ks0108.c
  F:    include/linux/ks0108.h
  
 +KTD253 BACKLIGHT DRIVER
 +M:    Linus Walleij <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/leds/backlight/kinetic,ktd253.yaml
 +F:    drivers/video/backlight/ktd253-backlight.c
 +
  L3MDEV
  M:    David Ahern <[email protected]>
  L:    [email protected]
@@@ -9856,8 -9776,8 +9857,8 @@@ F:      drivers/scsi/53c700
  
  LEAKING_ADDRESSES
  M:    Tobin C. Harding <[email protected]>
 -M:    Tycho Andersen <tycho@tycho.ws>
 -L:    [email protected]
 +M:    Tycho Andersen <tycho@tycho.pizza>
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
  F:    scripts/leaking_addresses.pl
@@@ -9928,6 -9848,15 +9929,6 @@@ T:     git git://git.kernel.org/pub/scm/lin
  F:    drivers/ata/pata_arasan_cf.c
  F:    include/linux/pata_arasan_cf_data.h
  
 -LIBATA PATA DRIVERS
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
 -M:    Jens Axboe <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 -F:    drivers/ata/ata_generic.c
 -F:    drivers/ata/pata_*.c
 -
  LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
@@@ -10353,13 -10282,6 +10354,13 @@@ S: Maintaine
  W:    http://linux-test-project.github.io/
  T:    git git://github.com/linux-test-project/ltp.git
  
 +LYNX PCS MODULE
 +M:    Ioana Ciornei <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/pcs/pcs-lynx.c
 +F:    include/linux/pcs-lynx.h
 +
  M68K ARCHITECTURE
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
@@@ -10567,7 -10489,7 +10568,7 @@@ M:   Tobias Waldekranz <tobias@waldekranz
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/marvell,mvusb.yaml
 -F:    drivers/net/phy/mdio-mvusb.c
 +F:    drivers/net/mdio/mdio-mvusb.c
  
  MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER
  M:    Hu Ziji <[email protected]>
@@@ -10714,15 -10636,6 +10715,15 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/hid/hid-mcp2221.c
  
 +MCP251XFD SPI-CAN NETWORK DRIVER
 +M:    Marc Kleine-Budde <[email protected]>
 +M:    Manivannan Sadhasivam <[email protected]>
 +R:    Thomas Kopp <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml
 +F:    drivers/net/can/spi/mcp251xfd/
 +
  MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
@@@ -11105,7 -11018,6 +11106,7 @@@ F:   drivers/char/hw_random/mtk-rng.
  
  MEDIATEK SWITCH DRIVER
  M:    Sean Wang <[email protected]>
 +M:    Landen Chao <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/dsa/mt7530.*
@@@ -11113,7 -11025,7 +11114,7 @@@ F:   net/dsa/tag_mtk.
  
  MEDIATEK USB3 DRD IP DRIVER
  M:    Chunfeng Yun <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -11160,12 -11072,6 +11161,12 @@@ W: http://www.melfas.co
  F:    Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt
  F:    drivers/input/touchscreen/melfas_mip4.c
  
 +MELLANOX BLUEFIELD I2C DRIVER
 +M:    Khalil Blaiech <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-mlxbf.c
 +
  MELLANOX ETHERNET DRIVER (mlx4_en)
  M:    Tariq Toukan <[email protected]>
  L:    [email protected]
@@@ -11387,8 -11293,8 +11388,8 @@@ S:   Supporte
  W:    http://linux-meson.com/
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
 -F:    drivers/media/platform/meson/ao-cec-g12a.c
 -F:    drivers/media/platform/meson/ao-cec.c
 +F:    drivers/media/cec/platform/meson/ao-cec-g12a.c
 +F:    drivers/media/cec/platform/meson/ao-cec.c
  
  MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
  M:    Liang Yang <[email protected]>
@@@ -11398,6 -11304,7 +11399,6 @@@ F:   Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/meson_*
  
  MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
 -M:    Maxime Jourdan <[email protected]>
  M:    Neil Armstrong <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -11417,7 -11324,6 +11418,7 @@@ M:   Hemant Kumar <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
 +F:    Documentation/ABI/stable/sysfs-bus-mhi
  F:    Documentation/mhi/
  F:    drivers/bus/mhi/
  F:    include/linux/mhi.h
@@@ -11611,14 -11517,13 +11612,14 @@@ M:        Microchip Linux Driver Support <UNGL
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/mips/mscc.txt
 +F:    Documentation/devicetree/bindings/power/reset/ocelot-reset.txt
  F:    arch/mips/boot/dts/mscc/
  F:    arch/mips/configs/generic/board-ocelot.config
  F:    arch/mips/generic/board-ocelot.c
  
  MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
 -M:    Don Brace <don.brace@microsemi.com>
 -L:    esc.storagedev@microsemi.com
 +M:    Don Brace <don.brace@microchip.com>
 +L:    storagedev@microchip.com
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/smartpqi.rst
@@@ -11676,7 -11581,7 +11677,7 @@@ MIPS GENERIC PLATFOR
  M:    Paul Burton <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/power/mti,mips-cpc.txt
 +F:    Documentation/devicetree/bindings/power/mti,mips-cpc.yaml
  F:    arch/mips/generic/
  F:    arch/mips/tools/generic-board-config.sh
  
@@@ -11732,7 -11637,7 +11733,7 @@@ S:   Odd Fixe
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git
  F:    arch/arm/boot/dts/mmp*
  F:    arch/arm/mach-mmp/
 -F:    linux/soc/mmp/
 +F:    include/linux/soc/mmp/
  
  MMP USB PHY DRIVERS
  R:    Lubomir Rintel <[email protected]>
@@@ -11850,13 -11755,6 +11851,13 @@@ Q: http://patchwork.linuxtv.org/project
  T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/msi2500/
  
 +MSTAR INTERRUPT CONTROLLER DRIVER
 +M:    Mark-PK Tsai <[email protected]>
 +M:    Daniel Palmer <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interrupt-controller/mstar,mst-intc.yaml
 +F:    drivers/irqchip/irq-mst-intc.c
 +
  MSYSTEMS DISKONCHIP G3 MTD DRIVER
  M:    Robert Jarzmik <[email protected]>
  L:    [email protected]
@@@ -12119,6 -12017,7 +12120,6 @@@ M:   Neil Horman <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://fedorahosted.org/dropwatch/
 -F:    include/net/drop_monitor.h
  F:    include/uapi/linux/net_dropmon.h
  F:    net/core/drop_monitor.c
  
@@@ -12132,7 -12031,6 +12133,7 @@@ Q:   http://patchwork.ozlabs.org/project/
  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/
 +F:    drivers/connector/
  F:    drivers/net/
  F:    include/linux/etherdevice.h
  F:    include/linux/fcdevice.h
@@@ -12158,7 -12056,6 +12159,7 @@@ NETWORKING [DSA
  M:    Andrew Lunn <[email protected]>
  M:    Vivien Didelot <[email protected]>
  M:    Florian Fainelli <[email protected]>
 +M:    Vladimir Oltean <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/
  F:    drivers/net/dsa/
@@@ -12213,7 -12110,6 +12214,7 @@@ F:   net/ipv6/ipcomp6.
  F:    net/ipv6/xfrm*
  F:    net/key/
  F:    net/xfrm/
 +F:    tools/testing/selftests/net/ipsec.c
  
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
@@@ -12338,7 -12234,6 +12339,7 @@@ F:   include/linux/sunrpc
  F:    include/uapi/linux/nfs*
  F:    include/uapi/linux/sunrpc/
  F:    net/sunrpc/
 +F:    Documentation/filesystems/nfs/
  
  NILFS2 FILESYSTEM
  M:    Ryusuke Konishi <[email protected]>
@@@ -12374,19 -12269,6 +12375,19 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
  F:    arch/nios2/
  
 +NITRO ENCLAVES (NE)
 +M:    Andra Paraschiv <[email protected]>
 +M:    Alexandru Vasile <[email protected]>
 +M:    Alexandru Ciobotaru <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://aws.amazon.com/ec2/nitro/nitro-enclaves/
 +F:    Documentation/virt/ne_overview.rst
 +F:    drivers/virt/nitro_enclaves/
 +F:    include/linux/nitro_enclaves.h
 +F:    include/uapi/linux/nitro_enclaves.h
 +F:    samples/nitro_enclaves/
 +
  NOHZ, DYNTICKS SUPPORT
  M:    Frederic Weisbecker <[email protected]>
  M:    Thomas Gleixner <[email protected]>
@@@ -12549,26 -12431,11 +12550,26 @@@ F:        drivers/iio/gyro/fxas21002c_core.
  F:    drivers/iio/gyro/fxas21002c_i2c.c
  F:    drivers/iio/gyro/fxas21002c_spi.c
  
 +NXP i.MX 8MQ DCSS DRIVER
 +M:    Laurentiu Palcu <[email protected]>
 +R:    Lucas Stach <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
 +F:    drivers/gpu/drm/imx/dcss/
 +
 +NXP PTN5150A CC LOGIC AND EXTCON DRIVER
 +M:    Krzysztof Kozlowski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
 +F:    drivers/extcon/extcon-ptn5150.c
 +
  NXP SGTL5000 DRIVER
  M:    Fabio Estevam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
 +F:    Documentation/devicetree/bindings/sound/sgtl5000.yaml
  F:    sound/soc/codecs/sgtl5000*
  
  NXP SJA1105 ETHERNET SWITCH DRIVER
@@@ -12614,7 -12481,6 +12615,7 @@@ M:   Josh Poimboeuf <[email protected]
  M:    Peter Zijlstra <[email protected]>
  S:    Supported
  F:    tools/objtool/
 +F:    include/linux/objtool.h
  
  OCELOT ETHERNET SWITCH DRIVER
  M:    Microchip Linux Driver Support <[email protected]>
@@@ -12627,7 -12493,6 +12628,7 @@@ F:   drivers/net/dsa/ocelot/
  F:    drivers/net/ethernet/mscc/
  F:    include/soc/mscc/ocelot*
  F:    net/dsa/tag_ocelot.c
 +F:    tools/testing/selftests/drivers/net/ocelot/*
  
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
  M:    Frederic Barrat <[email protected]>
@@@ -12877,7 -12742,7 +12878,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/i2c/ov2685.c
  
  OMNIVISION OV2740 SENSOR DRIVER
 -M:    Tianshu Qiu <tian.shu.qiua@intel.com>
 +M:    Tianshu Qiu <[email protected]>
  R:    Shawn Tu <[email protected]>
  R:    Bingbu Cao <[email protected]>
  L:    [email protected]
@@@ -12893,12 -12758,10 +12894,12 @@@ T:        git git://linuxtv.org/media_tree.gi
  F:    drivers/media/i2c/ov5640.c
  
  OMNIVISION OV5647 SENSOR DRIVER
 -M:    Luis Oliveira <[email protected]>
 +M:    Dave Stevenson <[email protected]>
 +M:    Jacopo Mondi <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/ov5647.yaml
  F:    drivers/media/i2c/ov5647.c
  
  OMNIVISION OV5670 SENSOR DRIVER
@@@ -12999,8 -12862,8 +13000,8 @@@ S:   Maintaine
  F:    drivers/char/hw_random/optee-rng.c
  
  OPA-VNIC DRIVER
 -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 -M:    Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
 +M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
 +M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/ulp/opa_vnic
@@@ -13161,9 -13024,7 +13162,9 @@@ F:   lib/packing.
  
  PADATA PARALLEL EXECUTION MECHANISM
  M:    Steffen Klassert <[email protected]>
 +M:    Daniel Jordan <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/core-api/padata.rst
  F:    include/linux/padata.h
@@@ -13300,7 -13161,6 +13301,7 @@@ F:   drivers/firmware/pcdp.
  
  PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
  M:    Thomas Petazzoni <[email protected]>
 +M:    Pali Rohár <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -13570,10 -13430,10 +13571,10 @@@ F:        Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/dwc/*artpec*
  
  PCIE DRIVER FOR CAVIUM THUNDERX
 -M:    Robert Richter <rric[email protected]>
 +M:    Robert Richter <rric@kernel.org>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Odd Fixes
  F:    drivers/pci/controller/pci-thunder-*
  
  PCIE DRIVER FOR HISILICON
@@@ -13710,18 -13570,12 +13711,18 @@@ F:        kernel/events/
  F:    tools/lib/perf/
  F:    tools/perf/
  
 -PERFORMANCE EVENTS SUBSYSTEM ARM64 PMU EVENTS
 +PERFORMANCE EVENTS TOOLING ARM64
  R:    John Garry <[email protected]>
  R:    Will Deacon <[email protected]>
 +R:    Mathieu Poirier <[email protected]>
 +R:    Leo Yan <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +F:    tools/build/feature/test-libopencsd.c
 +F:    tools/perf/arch/arm*/
  F:    tools/perf/pmu-events/arch/arm64/
 +F:    tools/perf/util/arm-spe*
 +F:    tools/perf/util/cs-etm*
  
  PERSONALITY HANDLING
  M:    Christoph Hellwig <[email protected]>
@@@ -13835,9 -13689,10 +13836,9 @@@ PIN CONTROLLER - RENESA
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git renesas-pinctrl
  F:    Documentation/devicetree/bindings/pinctrl/renesas,*
 -F:    drivers/pinctrl/pinctrl-rz*
 -F:    drivers/pinctrl/sh-pfc/
 +F:    drivers/pinctrl/renesas/
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
@@@ -14070,7 -13925,6 +14071,7 @@@ PRINT
  M:    Petr Mladek <[email protected]>
  M:    Sergey Senozhatsky <[email protected]>
  R:    Steven Rostedt <[email protected]>
 +R:    John Ogness <[email protected]>
  S:    Maintained
  F:    include/linux/printk.h
  F:    kernel/printk/
@@@ -14301,24 -14155,20 +14302,24 @@@ F:        drivers/firmware/qemu_fw_cfg.
  F:    include/uapi/linux/qemu_fw_cfg.h
  
  QIB DRIVER
 -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 -M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
 +M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
 +M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/hw/qib/
  
  QLOGIC QL41xxx FCOE DRIVER
 -M:    [email protected]
 +M:    Saurav Kashyap <[email protected]>
 +M:    Javed Hasan <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/qedf/
  
  QLOGIC QL41xxx ISCSI DRIVER
 -M:    [email protected]
 +M:    Nilesh Javali <[email protected]>
 +M:    Manish Rangankar <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/qedi/
@@@ -14351,20 -14201,21 +14352,20 @@@ M:        Nilesh Javali <[email protected]
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/scsi/LICENSE.qla2xxx
  F:    drivers/scsi/qla2xxx/
  
  QLOGIC QLA3XXX NETWORK DRIVER
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/networking/device_drivers/ethernet/qlogic/LICENSE.qla3xxx
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLA4XXX iSCSI DRIVER
 -M:    [email protected]
 +M:    Nilesh Javali <[email protected]>
 +M:    Manish Rangankar <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/scsi/LICENSE.qla4xxx
  F:    drivers/scsi/qla4xxx/
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
@@@ -14515,7 -14366,7 +14516,7 @@@ M:   Rob Clark <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/iommu/qcom_iommu.c
 +F:    drivers/iommu/arm/arm-smmu/qcom_iommu.c
  
  QUALCOMM IPCC MAILBOX DRIVER
  M:    Manivannan Sadhasivam <[email protected]>
@@@ -14712,9 -14563,9 +14713,9 @@@ M:   Niklas Söderlund <niklas.soderlund+
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml
 -F:    drivers/media/i2c/rdacm20.c
  F:    drivers/media/i2c/max9271.c
  F:    drivers/media/i2c/max9271.h
 +F:    drivers/media/i2c/rdacm20.c
  
  RDC R-321X SoC
  M:    Florian Fainelli <[email protected]>
@@@ -14727,8 -14578,8 +14728,8 @@@ S:   Maintaine
  F:    drivers/net/ethernet/rdc/r6040.c
  
  RDMAVT - RDMA verbs software
 -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 -M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
 +M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
 +M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/sw/rdmavt
@@@ -15008,11 -14859,8 +15009,11 @@@ F: include/linux/hid-roccat
  
  ROCKCHIP ISP V1 DRIVER
  M:    Helen Koike <[email protected]>
 +M:    Dafna Hirschfeld <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/admin-guide/media/rkisp1.rst
 +F:    Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
  F:    drivers/staging/media/rkisp1/
  
  ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
@@@ -15287,14 -15135,6 +15288,14 @@@ F: Documentation/s390/vfio-ccw.rs
  F:    drivers/s390/cio/vfio_ccw*
  F:    include/uapi/linux/vfio_ccw.h
  
 +S390 VFIO-PCI DRIVER
 +M:    Matthew Rosato <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/vfio/pci/vfio_pci_zdev.c
 +F:    include/uapi/linux/vfio_zdev.h
 +
  S390 ZCRYPT DRIVER
  M:    Harald Freudenberger <[email protected]>
  L:    [email protected]
@@@ -15411,11 -15251,10 +15412,11 @@@ F:        drivers/media/platform/s3c-camif
  F:    include/media/drv-intf/s3c_camif.h
  
  SAMSUNG S3FWRN5 NFC DRIVER
 -M:    Robert Baldyga <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
  M:    Krzysztof Opasiak <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
  F:    drivers/nfc/s3fwrn5
  
  SAMSUNG S5C73M3 CAMERA DRIVER
@@@ -15517,7 -15356,6 +15518,7 @@@ R:   Dietmar Eggemann <dietmar.eggemann@a
  R:    Steven Rostedt <[email protected]> (SCHED_FIFO/SCHED_RR)
  R:    Ben Segall <[email protected]> (CONFIG_CFS_BANDWIDTH)
  R:    Mel Gorman <[email protected]> (CONFIG_NUMA_BALANCING)
 +R:    Daniel Bristot de Oliveira <[email protected]> (SCHED_DEADLINE)
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
@@@ -15639,8 -15477,8 +15640,8 @@@ F:   drivers/mmc/host/sdricoh_cs.
  SECO BOARDS CEC DRIVER
  M:    Ettore Chimenti <[email protected]>
  S:    Maintained
 -F:    drivers/media/platform/seco-cec/seco-cec.c
 -F:    drivers/media/platform/seco-cec/seco-cec.h
 +F:    drivers/media/cec/platform/seco/seco-cec.c
 +F:    drivers/media/cec/platform/seco/seco-cec.h
  
  SECURE COMPUTING
  M:    Kees Cook <[email protected]>
@@@ -15709,7 -15547,6 +15710,7 @@@ F:   include/uapi/linux/sed
  SECURITY CONTACT
  M:    Security Officers <[email protected]>
  S:    Supported
 +F:    Documentation/admin-guide/security-bugs.rst
  
  SECURITY SUBSYSTEM
  M:    James Morris <[email protected]>
@@@ -15733,7 -15570,6 +15734,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
  F:    Documentation/ABI/obsolete/sysfs-selinux-disable
  F:    Documentation/admin-guide/LSM/SELinux.rst
 +F:    include/trace/events/avc.h
  F:    include/uapi/linux/selinux_netlink.h
  F:    scripts/selinux/
  F:    security/selinux/
@@@ -15802,7 -15638,6 +15803,7 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/net/phy/phylink.c
  F:    drivers/net/phy/sfp*
 +F:    include/linux/mdio/mdio-i2c.h
  F:    include/linux/phylink.h
  F:    include/linux/sfp.h
  K:    phylink\.h|struct\s+phylink|\.phylink|>phylink_|phylink_(autoneg|clear|connect|create|destroy|disconnect|ethtool|helper|mac|mii|of|set|start|stop|test|validate)
@@@ -16209,6 -16044,7 +16210,6 @@@ F:   include/uapi/rdma/rdma_user_rxe.
  SOFTLOGIC 6x10 MPEG CODEC
  M:    Bluecherry Maintainers <[email protected]>
  M:    Anton Sviridenko <[email protected]>
 -M:    Andrey Utkin <[email protected]>
  M:    Andrey Utkin <[email protected]>
  M:    Ismael Luceno <[email protected]>
  L:    [email protected]
@@@ -16290,7 -16126,7 +16291,7 @@@ M:   Leon Luo <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/imx274.txt
 +F:    Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
  F:    drivers/media/i2c/imx274.c
  
  SONY IMX290 SENSOR DRIVER
@@@ -16628,6 -16464,7 +16629,6 @@@ F:   drivers/staging/rtl8712
  
  STAGING - SEPS525 LCD CONTROLLER DRIVERS
  M:    Michael Hennerich <[email protected]>
 -M:    Beniamin Bia <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
@@@ -16675,7 -16512,7 +16676,7 @@@ STI CEC DRIVE
  M:    Benjamin Gaignard <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/stih-cec.txt
 -F:    drivers/media/platform/sti/cec/
 +F:    drivers/media/cec/platform/sti/
  
  STK1160 USB VIDEO CAPTURE DRIVER
  M:    Ezequiel Garcia <[email protected]>
@@@ -16859,13 -16696,6 +16860,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
  F:    drivers/gpio/gpio-dwapb.c
  
 +SYNOPSYS DESIGNWARE APB SSI DRIVER
 +M:    Serge Semin <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
 +F:    drivers/spi/spi-dw*
 +
  SYNOPSYS DESIGNWARE AXI DMAC DRIVER
  M:    Eugeniy Paltsev <[email protected]>
  S:    Maintained
@@@ -16876,7 -16706,7 +16877,7 @@@ SYNOPSYS DESIGNWARE DMAC DRIVE
  M:    Viresh Kumar <[email protected]>
  R:    Andy Shevchenko <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/dma/snps-dma.txt
 +F:    Documentation/devicetree/bindings/dma/snps,dma-spear1340.yaml
  F:    drivers/dma/dw/
  F:    include/dt-bindings/dma/dw-dmac.h
  F:    include/linux/dma/dw.h
@@@ -16892,8 -16722,8 +16893,8 @@@ SYNOPSYS DESIGNWARE ETHERNET XPCS DRIVE
  M:    Jose Abreu <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/phy/mdio-xpcs.c
 -F:    include/linux/mdio-xpcs.h
 +F:    drivers/net/pcs/pcs-xpcs.c
 +F:    include/linux/pcs/pcs-xpcs.h
  
  SYNOPSYS DESIGNWARE I2C DRIVER
  M:    Jarkko Nikula <[email protected]>
@@@ -17287,8 -17117,8 +17288,8 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
  F:    Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
  F:    Documentation/devicetree/bindings/clock/ti,sci-clk.txt
 -F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
 -F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
 +F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
 +F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
  F:    Documentation/devicetree/bindings/reset/ti,sci-reset.txt
  F:    Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
  F:    drivers/clk/keystone/sci-clk.c
@@@ -17385,8 -17215,8 +17386,8 @@@ S:   Maintaine
  F:    drivers/net/thunderbolt.c
  
  THUNDERX GPIO DRIVER
 -M:    Robert Richter <rric[email protected]>
 -S:    Maintained
 +M:    Robert Richter <rric@kernel.org>
 +S:    Odd Fixes
  F:    drivers/gpio/gpio-thunderx.c
  
  TI AM437X VPFE DRIVER
@@@ -17407,7 -17237,7 +17408,7 @@@ S:   Maintaine
  F:    drivers/thermal/ti-soc-thermal/
  
  TI BQ27XXX POWER SUPPLY DRIVER
 -R:    Andrew F. Davis <afd@ti.com>
 +R:    Dan Murphy <dmurphy@ti.com>
  F:    drivers/power/supply/bq27xxx_battery.c
  F:    drivers/power/supply/bq27xxx_battery_i2c.c
  F:    include/linux/power/bq27xxx_battery.h
@@@ -17681,9 -17511,8 +17682,9 @@@ S:   Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/RCU/torture.rst
  F:    kernel/locking/locktorture.c
 -F:    kernel/rcu/rcuperf.c
 +F:    kernel/rcu/rcuscale.c
  F:    kernel/rcu/rcutorture.c
 +F:    kernel/rcu/refscale.c
  F:    kernel/torture.c
  
  TOSHIBA ACPI EXTRAS DRIVER
@@@ -17727,13 -17556,13 +17728,13 @@@ F:        drivers/platform/x86/toshiba-wmi.
  
  TPM DEVICE DRIVER
  M:    Peter Huewe <[email protected]>
 -M:    Jarkko Sakkinen <jarkko[email protected]>
 +M:    Jarkko Sakkinen <jarkko@kernel.org>
  R:    Jason Gunthorpe <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity
  Q:    https://patchwork.kernel.org/project/linux-integrity/list/
 -T:    git git://git.infradead.org/users/jjs/linux-tpmdd.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
  F:    drivers/char/tpm/
  
  TRACING
@@@ -17870,7 -17699,6 +17871,7 @@@ S:   Supporte
  W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git fixes
 +F:    Documentation/filesystems/ubifs-authentication.rst
  F:    Documentation/filesystems/ubifs.rst
  F:    fs/ubifs/
  
@@@ -18264,6 -18092,14 +18265,6 @@@ T:  git git://linuxtv.org/media_tree.gi
  F:    drivers/media/usb/uvc/
  F:    include/uapi/linux/uvcvideo.h
  
 -USB VISION DRIVER
 -M:    Hans Verkuil <[email protected]>
 -L:    [email protected]
 -S:    Odd Fixes
 -W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/staging/media/usbvision/
 -
  USB WEBCAM GADGET
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -18393,12 -18229,6 +18394,12 @@@ F: drivers/vfio
  F:    include/linux/vfio.h
  F:    include/uapi/linux/vfio.h
  
 +VFIO FSL-MC DRIVER
 +M:    Diana Craciun <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/vfio/fsl-mc/
 +
  VFIO MEDIATED DEVICE DRIVERS
  M:    Kirti Wankhede <[email protected]>
  L:    [email protected]
@@@ -18423,8 -18253,7 +18424,8 @@@ F:   drivers/gpu/vga/vga_switcheroo.
  F:    include/linux/vga_switcheroo.h
  
  VIA RHINE NETWORK DRIVER
 -S:    Orphan
 +S:    Maintained
 +M:    Kevin Brace <[email protected]>
  F:    drivers/net/ethernet/via/via-rhine.c
  
  VIA SD/MMC CARD CONTROLLER DRIVER
@@@ -18469,8 -18298,10 +18470,8 @@@ S:  Maintaine
  F:    drivers/media/platform/video-mux.c
  
  VIDEOBUF2 FRAMEWORK
 -M:    Pawel Osciak <[email protected]>
 +M:    Tomasz Figa <[email protected]>
  M:    Marek Szyprowski <[email protected]>
 -M:    Kyungmin Park <[email protected]>
 -R:    Tomasz Figa <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/common/videobuf2/*
@@@ -18660,14 -18491,6 +18661,14 @@@ W: https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/test-drivers/vivid/*
  
 +VIDTV VIRTUAL DIGITAL TV DRIVER
 +M:    Daniel W. S. Almeida <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/test-drivers/vidtv/*
 +
  VLYNQ BUS
  M:    Florian Fainelli <[email protected]>
  L:    [email protected] (subscribers-only)
@@@ -19035,11 -18858,11 +19036,11 @@@ T:        git git://git.kernel.org/pub/scm/lin
  F:    arch/x86/mm/
  
  X86 PLATFORM DRIVERS
 -M:    Darren Hart <[email protected]>
 -M:    Andy Shevchenko <[email protected]>
 +M:    Hans de Goede <[email protected]>
 +M:    Mark Gross <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 -T:    git git://git.infradead.org/linux-platform-drivers-x86.git
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/olpc/
  F:    drivers/platform/x86/
  
@@@ -19052,15 -18875,6 +19053,15 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
  F:    arch/x86/platform
  
 +X86 PLATFORM UV HPE SUPERDOME FLEX
 +M:    Steve Wahl <[email protected]>
 +R:    Dimitri Sivanich <[email protected]>
 +R:    Russ Anderson <[email protected]>
 +S:    Supported
 +F:    arch/x86/include/asm/uv/
 +F:    arch/x86/kernel/apic/x2apic_uv_x.c
 +F:    arch/x86/platform/uv/
 +
  X86 VDSO
  M:    Andy Lutomirski <[email protected]>
  L:    [email protected]
@@@ -19388,16 -19202,6 +19389,16 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    Documentation/filesystems/zonefs.rst
  F:    fs/zonefs/
  
 +ZR36067 VIDEO FOR LINUX DRIVER
 +M:    Corentin Labbe <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +W:    http://mjpeg.sourceforge.net/driver-zoran/
 +Q:    https://patchwork.linuxtv.org/project/linux-media/list/
 +F:    Documentation/driver-api/media/drivers/zoran.rst
 +F:    drivers/staging/media/zoran/
 +
  ZPOOL COMPRESSED PAGE STORAGE API
  M:    Dan Streetman <[email protected]>
  L:    [email protected]

diff --combined Makefile
index ebbd34801476a657a7c80f3077cd279296dbd5e5,17a62e365a38062ab41ad7df2b18e143e16a4272..e71979882e4fcf92fb0f14fbe4284f901492e6a7
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -2,7 -2,7 +2,7 @@@
  VERSION = 5
  PATCHLEVEL = 9
  SUBLEVEL = 0
 -EXTRAVERSION = -rc2
 +EXTRAVERSION =
  NAME = Kleptomaniac Octopus
  
  # *DOCUMENTATION*
@@@ -497,7 -497,7 +497,7 @@@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-
  KBUILD_CFLAGS   := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \
                   -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \
                   -Werror=implicit-function-declaration -Werror=implicit-int \
-                  -Wno-format-security \
+                  -Werror=return-type -Wno-format-security \
                   -std=gnu89
  KBUILD_CPPFLAGS := -D__KERNEL__
  KBUILD_AFLAGS_KERNEL :=
@@@ -505,7 -505,6 +505,6 @@@ KBUILD_CFLAGS_KERNEL :
  KBUILD_AFLAGS_MODULE  := -DMODULE
  KBUILD_CFLAGS_MODULE  := -DMODULE
  KBUILD_LDFLAGS_MODULE :=
- export KBUILD_LDS_MODULE := $(srctree)/scripts/module-common.lds
  KBUILD_LDFLAGS :=
  CLANG_FLAGS :=
  
@@@ -517,7 -516,6 +516,6 @@@ export KBUILD_HOSTCXXFLAGS KBUILD_HOSTL
  
  export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS
  export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
- export CFLAGS_KASAN CFLAGS_KASAN_NOSANITIZE CFLAGS_UBSAN CFLAGS_KCSAN
  export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
  export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
  export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL
@@@ -634,7 -632,7 +632,7 @@@ endi
  # in addition to whatever we do anyway.
  # Just "make" or "make all" shall build modules as well
  
- ifneq ($(filter all modules nsdeps,$(MAKECMDGOALS)),)
+ ifneq ($(filter all modules nsdeps %compile_commands.json clang-%,$(MAKECMDGOALS)),)
    KBUILD_MODULES := 1
  endif
  
@@@ -707,8 -705,11 +705,11 @@@ $(KCONFIG_CONFIG)
  # This exploits the 'multi-target pattern rule' trick.
  # The syncconfig should be executed only once to make all the targets.
  # (Note: use the grouped target '&:' when we bump to GNU Make 4.3)
+ quiet_cmd_syncconfig = SYNC    $@
+       cmd_syncconfig = $(MAKE) -f $(srctree)/Makefile syncconfig
+ 
  %/config/auto.conf %/config/auto.conf.cmd %/generated/autoconf.h: $(KCONFIG_CONFIG)
-       $(Q)$(MAKE) -f $(srctree)/Makefile syncconfig
+       +$(call cmd,syncconfig)
  else # !may-sync-config
  # External modules and some install targets need include/generated/autoconf.h
  # and include/config/auto.conf but do not care if they are up-to-date.
@@@ -813,16 -814,22 +814,22 @@@ KBUILD_CFLAGS   += -ftrivial-auto-var-ini
  KBUILD_CFLAGS += -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang
  endif
  
- DEBUG_CFLAGS  := $(call cc-option, -fno-var-tracking-assignments)
+ # Workaround for GCC versions < 5.0
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61801
+ ifdef CONFIG_CC_IS_GCC
+ DEBUG_CFLAGS  := $(call cc-ifversion, -lt, 0500, $(call cc-option, -fno-var-tracking-assignments))
+ endif
  
  ifdef CONFIG_DEBUG_INFO
+ 
  ifdef CONFIG_DEBUG_INFO_SPLIT
  DEBUG_CFLAGS  += -gsplit-dwarf
  else
  DEBUG_CFLAGS  += -g
  endif
+ 
  KBUILD_AFLAGS += -Wa,-gdwarf-2
- endif
+ 
  ifdef CONFIG_DEBUG_INFO_DWARF4
  DEBUG_CFLAGS  += -gdwarf-4
  endif
@@@ -838,6 -845,8 +845,8 @@@ KBUILD_AFLAGS      += -gz=zli
  KBUILD_LDFLAGS        += --compress-debug-sections=zlib
  endif
  
+ endif # CONFIG_DEBUG_INFO
+ 
  KBUILD_CFLAGS += $(DEBUG_CFLAGS)
  export DEBUG_CFLAGS
  
@@@ -882,6 -891,10 +891,6 @@@ KBUILD_CFLAGS_KERNEL += -ffunction-sect
  LDFLAGS_vmlinux += --gc-sections
  endif
  
 -ifdef CONFIG_LIVEPATCH
 -KBUILD_CFLAGS += $(call cc-option, -flive-patching=inline-clone)
 -endif
 -
  ifdef CONFIG_SHADOW_CALL_STACK
  CC_FLAGS_SCS  := -fsanitize=shadow-call-stack
  KBUILD_CFLAGS += $(CC_FLAGS_SCS)
@@@ -919,16 -932,25 +928,16 @@@ KBUILD_CFLAGS += $(call cc-disable-warn
  KBUILD_CFLAGS += $(call cc-disable-warning, maybe-uninitialized)
  
  # disable invalid "can't wrap" optimizations for signed / pointers
- KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow)
+ KBUILD_CFLAGS += -fno-strict-overflow
  
 -# clang sets -fmerge-all-constants by default as optimization, but this
 -# is non-conforming behavior for C and in fact breaks the kernel, so we
 -# need to disable it here generally.
 -KBUILD_CFLAGS += $(call cc-option,-fno-merge-all-constants)
 -
 -# for gcc -fno-merge-all-constants disables everything, but it is fine
 -# to have actual conforming behavior enabled.
 -KBUILD_CFLAGS += $(call cc-option,-fmerge-constants)
 -
  # Make sure -fstack-check isn't enabled (like gentoo apparently did)
- KBUILD_CFLAGS  += $(call cc-option,-fno-stack-check,)
+ KBUILD_CFLAGS  += -fno-stack-check
  
  # conserve stack if available
  KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)
  
  # Prohibit date/time macros, which would make the build non-deterministic
- KBUILD_CFLAGS   += $(call cc-option,-Werror=date-time)
+ KBUILD_CFLAGS   += -Werror=date-time
  
  # enforce correct pointer usage
  KBUILD_CFLAGS   += $(call cc-option,-Werror=incompatible-pointer-types)
@@@ -964,8 -986,8 +973,8 @@@ KBUILD_CPPFLAGS += $(KCPPFLAGS
  KBUILD_AFLAGS   += $(KAFLAGS)
  KBUILD_CFLAGS   += $(KCFLAGS)
  
- KBUILD_LDFLAGS_MODULE += --build-id
- LDFLAGS_vmlinux += --build-id
+ KBUILD_LDFLAGS_MODULE += --build-id=sha1
+ LDFLAGS_vmlinux += --build-id=sha1
  
  ifeq ($(CONFIG_STRIP_ASM_SYMS),y)
  LDFLAGS_vmlinux       += $(call ld-option, -X,)
@@@ -1071,15 -1093,13 +1080,15 @@@ ifdef CONFIG_STACK_VALIDATIO
    endif
  endif
  
 +ifdef CONFIG_BPF
  ifdef CONFIG_DEBUG_INFO_BTF
    ifeq ($(has_libelf),1)
      resolve_btfids_target := tools/bpf/resolve_btfids FORCE
    else
      ERROR_RESOLVE_BTFIDS := 1
    endif
 -endif
 +endif # CONFIG_DEBUG_INFO_BTF
 +endif # CONFIG_BPF
  
  PHONY += prepare0
  
@@@ -1377,7 -1397,7 +1386,7 @@@ endi
  # using awk while concatenating to the final file.
  
  PHONY += modules
- modules: $(if $(KBUILD_BUILTIN),vmlinux) modules_check
+ modules: $(if $(KBUILD_BUILTIN),vmlinux) modules_check modules_prepare
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
  
  PHONY += modules_check
@@@ -1394,6 -1414,7 +1403,7 @@@ targets += modules.orde
  # Target to prepare building external modules
  PHONY += modules_prepare
  modules_prepare: prepare
+       $(Q)$(MAKE) $(build)=scripts scripts/module.lds
  
  # Target to install modules
  PHONY += modules_install
@@@ -1452,7 -1473,8 +1462,8 @@@ endif # CONFIG_MODULE
  
  # Directories & files removed with 'make clean'
  CLEAN_FILES += include/ksym vmlinux.symvers \
-              modules.builtin modules.builtin.modinfo modules.nsdeps
+              modules.builtin modules.builtin.modinfo modules.nsdeps \
+              compile_commands.json
  
  # Directories & files removed with 'make mrproper'
  MRPROPER_FILES += include/config include/generated          \
@@@ -1558,12 -1580,13 +1569,13 @@@ help
         echo  ''
        @echo  'Static analysers:'
        @echo  '  checkstack      - Generate a list of stack hogs'
-       @echo  '  namespacecheck  - Name space analysis on compiled kernel'
        @echo  '  versioncheck    - Sanity check on version.h usage'
        @echo  '  includecheck    - Check for duplicate included header files'
        @echo  '  export_report   - List the usages of all exported symbols'
        @echo  '  headerdep       - Detect inclusion cycles in headers'
        @echo  '  coccicheck      - Check with Coccinelle'
+       @echo  '  clang-analyzer  - Check with clang static analyzer'
+       @echo  '  clang-tidy      - Check with clang-tidy'
        @echo  ''
        @echo  'Tools:'
        @echo  '  nsdeps          - Generate missing symbol namespace dependencies'
@@@ -1681,14 -1704,18 +1693,18 @@@ else # KBUILD_EXTMO
  #                      Install the modules built in the module directory
  #                      Assumes install directory is already created
  
- # We are always building modules
+ # We are always building only modules.
+ KBUILD_BUILTIN :=
  KBUILD_MODULES := 1
  
  build-dirs := $(KBUILD_EXTMOD)
  PHONY += modules
- modules: descend
+ modules: $(MODORDER)
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
  
+ $(MODORDER): descend
+       @:
+ 
  PHONY += modules_install
  modules_install: _emodinst_ _emodinst_post
  
@@@ -1702,8 -1729,12 +1718,12 @@@ PHONY += _emodinst_pos
  _emodinst_post: _emodinst_
        $(call cmd,depmod)
  
+ compile_commands.json: $(extmod-prefix)compile_commands.json
+ PHONY += compile_commands.json
+ 
  clean-dirs := $(KBUILD_EXTMOD)
- clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers $(KBUILD_EXTMOD)/modules.nsdeps
+ clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers $(KBUILD_EXTMOD)/modules.nsdeps \
+       $(KBUILD_EXTMOD)/compile_commands.json
  
  PHONY += help
  help:
@@@ -1715,7 -1746,9 +1735,9 @@@
        @echo  '  clean           - remove generated files in module directory only'
        @echo  ''
  
- PHONY += prepare
+ # no-op for external module builds
+ PHONY += prepare modules_prepare
+ 
  endif # KBUILD_EXTMOD
  
  # Single targets
@@@ -1748,7 -1781,7 +1770,7 @@@ MODORDER := .modules.tm
  endif
  
  PHONY += single_modpost
- single_modpost: $(single-no-ko)
+ single_modpost: $(single-no-ko) modules_prepare
        $(Q){ $(foreach m, $(single-ko), echo $(extmod-prefix)$m;) } > $(MODORDER)
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
  
@@@ -1816,10 -1849,37 +1838,37 @@@ nsdeps: export KBUILD_NSDEPS=
  nsdeps: modules
        $(Q)$(CONFIG_SHELL) $(srctree)/scripts/nsdeps
  
+ # Clang Tooling
+ # ---------------------------------------------------------------------------
+ 
+ quiet_cmd_gen_compile_commands = GEN     $@
+       cmd_gen_compile_commands = $(PYTHON3) $< -a $(AR) -o $@ $(filter-out $<, $(real-prereqs))
+ 
+ $(extmod-prefix)compile_commands.json: scripts/clang-tools/gen_compile_commands.py \
+       $(if $(KBUILD_EXTMOD),,$(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)) \
+       $(if $(CONFIG_MODULES), $(MODORDER)) FORCE
+       $(call if_changed,gen_compile_commands)
+ 
+ targets += $(extmod-prefix)compile_commands.json
+ 
+ PHONY += clang-tidy clang-analyzer
+ 
+ ifdef CONFIG_CC_IS_CLANG
+ quiet_cmd_clang_tools = CHECK   $<
+       cmd_clang_tools = $(PYTHON3) $(srctree)/scripts/clang-tools/run-clang-tools.py $@ $<
+ 
+ clang-tidy clang-analyzer: $(extmod-prefix)compile_commands.json
+       $(call cmd,clang_tools)
+ else
+ clang-tidy clang-analyzer:
+       @echo "$@ requires CC=clang" >&2
+       @false
+ endif
+ 
  # Scripts to check various things for consistency
  # ---------------------------------------------------------------------------
  
- PHONY += includecheck versioncheck coccicheck namespacecheck export_report
+ PHONY += includecheck versioncheck coccicheck export_report
  
  includecheck:
        find $(srctree)/* $(RCS_FIND_IGNORE) \
@@@ -1834,9 -1894,6 +1883,6 @@@ versioncheck
  coccicheck:
        $(Q)$(BASH) $(srctree)/scripts/$@
  
- namespacecheck:
-       $(PERL) $(srctree)/scripts/namespace.pl
- 
  export_report:
        $(PERL) $(srctree)/scripts/export_report.pl
  

diff --combined arch/arm/Makefile
index c4301437ca72e0b61cdea449ef33551c98bffc3e,a0cb15de96778572cb1513850da28f9c046f4a4f..2874cd9923b7aef17924b2e32ff89385a32a7de0
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -16,14 -16,6 +16,10 @@@ LDFLAGS_vmlinux     += --be
  KBUILD_LDFLAGS_MODULE += --be8
  endif
  
- ifeq ($(CONFIG_ARM_MODULE_PLTS),y)
- KBUILD_LDS_MODULE     += $(srctree)/arch/arm/kernel/module.lds
- endif
- 
 +# We never want expected sections to be placed heuristically by the
 +# linker. All sections should be explicitly named in the linker script.
 +LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn)
 +
  GZFLAGS               :=-9
  #KBUILD_CFLAGS        +=-pipe
  
@@@ -143,9 -135,6 +139,9 @@@ head-y             := arch/arm/kernel/head$(MMUEXT
  
  # Text offset. This list is sorted numerically by address in order to
  # provide a means to avoid/resolve conflicts in multi-arch kernels.
 +# Note: the 32kB below this value is reserved for use by the kernel
 +# during boot, and this offset is critical to the functioning of
 +# kexec-tools.
  textofs-y     := 0x00008000
  # We don't want the htc bootloader to corrupt kernel during resume
  textofs-$(CONFIG_PM_H1940)      := 0x00108000

diff --combined arch/arm64/Makefile
index f4717facf31e9dfda89b73e5fd05ea857b74ad2d,76667ad47980b1b169fce3e2a7ef0744894b2b6d..88a44e7326b59ed683ceac73c8770c76f21afe21
--- 1/arch/arm64/Makefile
--- 2/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -11,6 -11,7 +11,6 @@@
  # Copyright (C) 1995-2001 by Russell King
  
  LDFLAGS_vmlinux       :=--no-undefined -X
 -CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)
  
  ifeq ($(CONFIG_RELOCATABLE), y)
  # Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour
@@@ -28,10 -29,6 +28,10 @@@ LDFLAGS_vmlinux     += --fix-cortex-a53-843
    endif
  endif
  
 +# We never want expected sections to be placed heuristically by the
 +# linker. All sections should be explicitly named in the linker script.
 +LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn)
 +
  ifeq ($(CONFIG_ARM64_USE_LSE_ATOMICS), y)
    ifneq ($(CONFIG_ARM64_LSE_ATOMICS), y)
  $(warning LSE atomics not supported by binutils)
@@@ -50,16 -47,13 +50,16 @@@ endi
  
  KBUILD_CFLAGS += -mgeneral-regs-only  \
                   $(compat_vdso) $(cc_has_k_constraint)
 -KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
  KBUILD_CFLAGS += $(call cc-disable-warning, psabi)
  KBUILD_AFLAGS += $(compat_vdso)
  
  KBUILD_CFLAGS += $(call cc-option,-mabi=lp64)
  KBUILD_AFLAGS += $(call cc-option,-mabi=lp64)
  
 +# Avoid generating .eh_frame* sections.
 +KBUILD_CFLAGS += -fno-asynchronous-unwind-tables -fno-unwind-tables
 +KBUILD_AFLAGS += -fno-asynchronous-unwind-tables -fno-unwind-tables
 +
  ifeq ($(CONFIG_STACKPROTECTOR_PER_TASK),y)
  prepare: stack_protector_prepare
  stack_protector_prepare: prepare0
@@@ -88,8 -82,8 +88,8 @@@ endi
  # compiler to generate them and consequently to break the single image contract
  # we pass it only to the assembler. This option is utilized only in case of non
  # integrated assemblers.
 -ifneq ($(CONFIG_AS_HAS_ARMV8_4), y)
 -branch-prot-flags-$(CONFIG_AS_HAS_PAC) += -Wa,-march=armv8.3-a
 +ifeq ($(CONFIG_AS_HAS_PAC), y)
 +asm-arch := armv8.3-a
  endif
  endif
  
@@@ -97,12 -91,7 +97,12 @@@ KBUILD_CFLAGS += $(branch-prot-flags-y
  
  ifeq ($(CONFIG_AS_HAS_ARMV8_4), y)
  # make sure to pass the newest target architecture to -march.
 -KBUILD_CFLAGS += -Wa,-march=armv8.4-a
 +asm-arch := armv8.4-a
 +endif
 +
 +ifdef asm-arch
 +KBUILD_CFLAGS += -Wa,-march=$(asm-arch) \
 +                 -DARM64_ASM_ARCH='"$(asm-arch)"'
  endif
  
  ifeq ($(CONFIG_SHADOW_CALL_STACK), y)
@@@ -126,10 -115,6 +126,6 @@@ endi
  
  CHECKFLAGS    += -D__aarch64__
  
- ifeq ($(CONFIG_ARM64_MODULE_PLTS),y)
- KBUILD_LDS_MODULE     += $(srctree)/arch/arm64/kernel/module.lds
- endif
- 
  ifeq ($(CONFIG_DYNAMIC_FTRACE_WITH_REGS),y)
    KBUILD_CPPFLAGS += -DCC_USING_PATCHABLE_FUNCTION_ENTRY
    CC_FLAGS_FTRACE := -fpatchable-function-entry=2
@@@ -138,6 -123,9 +134,6 @@@ endi
  # Default value
  head-y                := arch/arm64/kernel/head.o
  
 -# The byte offset of the kernel image in RAM from the start of RAM.
 -TEXT_OFFSET := 0x0
 -
  ifeq ($(CONFIG_KASAN_SW_TAGS), y)
  KASAN_SHADOW_SCALE_SHIFT := 4
  else
@@@ -148,6 -136,8 +144,6 @@@ KBUILD_CFLAGS += -DKASAN_SHADOW_SCALE_S
  KBUILD_CPPFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT)
  KBUILD_AFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT)
  
 -export        TEXT_OFFSET
 -
  core-y                += arch/arm64/
  libs-y                := arch/arm64/lib/ $(libs-y)
  libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
@@@ -171,8 -161,7 +167,8 @@@ zinstall install
  PHONY += vdso_install
  vdso_install:
        $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@
 -      $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@
 +      $(if $(CONFIG_COMPAT_VDSO), \
 +              $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@)
  
  # We use MRPROPER_FILES and CLEAN_FILES now
  archclean:

diff --combined arch/arm64/kernel/vdso/Makefile
index 04021a93171c45fd5f15ddb91bf277bbe35994fd,ce2bb6270a4ef57cefec0a1bb6dee1b0ff79c7b2..d65f52264abaeb9edb0566037665a0e970f49ade
--- 1/arch/arm64/kernel/vdso/Makefile
--- 2/arch/arm64/kernel/vdso/Makefile
+++ b/arch/arm64/kernel/vdso/Makefile
@@@ -24,14 -24,13 +24,13 @@@ btildflags-$(CONFIG_ARM64_BTI_KERNEL) +
  # routines, as x86 does (see 6f121e548f83 ("x86, vdso: Reimplement vdso.so
  # preparation in build-time C")).
  ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1 --hash-style=sysv      \
-            -Bsymbolic $(call ld-option, --no-eh-frame-hdr) --build-id -n      \
+            -Bsymbolic $(call ld-option, --no-eh-frame-hdr) --build-id=sha1 -n \
             $(btildflags-y) -T
  
  ccflags-y := -fno-common -fno-builtin -fno-stack-protector -ffixed-x18
  ccflags-y += -DDISABLE_BRANCH_PROFILING
  
  CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os $(CC_FLAGS_SCS) $(GCC_PLUGINS_CFLAGS)
- KBUILD_CFLAGS                 += $(DISABLE_LTO)
  KASAN_SANITIZE                        := n
  UBSAN_SANITIZE                        := n
  OBJECT_FILES_NON_STANDARD     := y
@@@ -43,11 -42,18 +42,11 @@@ ifneq ($(c-gettimeofday-y),
    CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y)
  endif
  
 -# Clang versions less than 8 do not support -mcmodel=tiny
 -ifeq ($(CONFIG_CC_IS_CLANG), y)
 -  ifeq ($(shell test $(CONFIG_CLANG_VERSION) -lt 80000; echo $$?),0)
 -    CFLAGS_REMOVE_vgettimeofday.o += -mcmodel=tiny
 -  endif
 -endif
 -
  # Disable gcov profiling for VDSO code
  GCOV_PROFILE := n
  
  obj-y += vdso.o
- extra-y += vdso.lds
+ targets += vdso.lds
  CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
  
  # Force dependency (incbin is bad)

diff --combined arch/powerpc/Makefile
index c4f9dbd125770413c7c5d744e96dedfbd7a47d2f,8935658fcd0639a694c9b6b8ef664fca2df10705..a4d56f0a41d95522a1f4ca3f8bac6808b2e26b8a
--- 1/arch/powerpc/Makefile
--- 2/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@@ -65,7 -65,6 +65,6 @@@ UTS_MACHINE := $(subst $(space),,$(mach
  ifdef CONFIG_PPC32
  KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
  else
- KBUILD_LDS_MODULE += $(srctree)/arch/powerpc/kernel/module.lds
  ifeq ($(call ld-ifversion, -ge, 225000000, y),y)
  # Have the linker provide sfpr if possible.
  # There is a corresponding test in arch/powerpc/lib/Makefile
@@@ -264,8 -263,7 +263,8 @@@ KBUILD_CFLAGS += $(cpu-as-y
  KBUILD_AFLAGS += $(aflags-y)
  KBUILD_CFLAGS += $(cflags-y)
  
 -head-y                                := arch/powerpc/kernel/head_$(BITS).o
 +head-$(CONFIG_PPC64)          := arch/powerpc/kernel/head_64.o
 +head-$(CONFIG_PPC_BOOK3S_32)  := arch/powerpc/kernel/head_book3s_32.o
  head-$(CONFIG_PPC_8xx)                := arch/powerpc/kernel/head_8xx.o
  head-$(CONFIG_40x)            := arch/powerpc/kernel/head_40x.o
  head-$(CONFIG_44x)            := arch/powerpc/kernel/head_44x.o

diff --combined arch/powerpc/kernel/vdso32/Makefile
index e147bbdc12cdfab1b0bc95d7a7af38a2458ff18c,fd5072a4c73c7d22a311d89fefe82c2e69799c58..73eada6bc8cd41a74e33776f3eb3dbf3ec4a5269
--- 1/arch/powerpc/kernel/vdso32/Makefile
--- 2/arch/powerpc/kernel/vdso32/Makefile
+++ b/arch/powerpc/kernel/vdso32/Makefile
@@@ -29,7 -29,7 +29,7 @@@ ccflags-y := -shared -fno-common -fno-b
  asflags-y := -D__VDSO32__ -s
  
  obj-y += vdso32_wrapper.o
- extra-y += vdso32.lds
+ targets += vdso32.lds
  CPPFLAGS_vdso32.lds += -P -C -Upowerpc
  
  # Force dependency (incbin is bad)
@@@ -50,7 -50,7 +50,7 @@@ $(obj-vdso32): %.o: %.S FORC
  
  # actual build commands
  quiet_cmd_vdso32ld = VDSO32L $@
 -      cmd_vdso32ld = $(VDSOCC) $(c_flags) $(CC32FLAGS) -o $@ $(call cc-ldoption, -Wl$(comma)--orphan-handling=warn) -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)
 +      cmd_vdso32ld = $(VDSOCC) $(c_flags) $(CC32FLAGS) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)
  quiet_cmd_vdso32as = VDSO32A $@
        cmd_vdso32as = $(VDSOCC) $(a_flags) $(CC32FLAGS) -c -o $@ $<
  

diff --combined arch/powerpc/kernel/vdso64/Makefile
index 32ebb3522ea19c90165fac2909f20f618e428e67,c737b3ea3207f3ee66115ba929ac56db6e9d1326..dfd34f68bfa195e61827f14f747e8c6df6a71042
--- 1/arch/powerpc/kernel/vdso64/Makefile
--- 2/arch/powerpc/kernel/vdso64/Makefile
+++ b/arch/powerpc/kernel/vdso64/Makefile
@@@ -17,7 -17,7 +17,7 @@@ ccflags-y := -shared -fno-common -fno-b
  asflags-y := -D__VDSO64__ -s
  
  obj-y += vdso64_wrapper.o
- extra-y += vdso64.lds
+ targets += vdso64.lds
  CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
  
  # Force dependency (incbin is bad)
@@@ -34,7 -34,7 +34,7 @@@ $(obj)/%.so: $(obj)/%.so.dbg FORC
  
  # actual build commands
  quiet_cmd_vdso64ld = VDSO64L $@
 -      cmd_vdso64ld = $(CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^) $(call cc-ldoption, -Wl$(comma)--orphan-handling=warn)
 +      cmd_vdso64ld = $(CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)
  
  # install commands for the unstripped file
  quiet_cmd_vdso_install = INSTALL $@

diff --combined arch/riscv/Makefile
index 10df59f28add9db28dbb5f9d26621c260af5cc70,8edaa8bd86d6394fa7d5d346f5cf7f36f823d22f..0289a97325d1225fd345c796aad589a84cb82463
--- 1/arch/riscv/Makefile
--- 2/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@@ -53,9 -53,6 +53,6 @@@ endi
  ifeq ($(CONFIG_CMODEL_MEDANY),y)
        KBUILD_CFLAGS += -mcmodel=medany
  endif
- ifeq ($(CONFIG_MODULE_SECTIONS),y)
-       KBUILD_LDS_MODULE += $(srctree)/arch/riscv/kernel/module.lds
- endif
  ifeq ($(CONFIG_PERF_EVENTS),y)
          KBUILD_CFLAGS += -fno-omit-frame-pointer
  endif
@@@ -80,7 -77,6 +77,7 @@@ head-y := arch/riscv/kernel/head.
  core-y += arch/riscv/
  
  libs-y += arch/riscv/lib/
 +libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
  
  PHONY += vdso_install
  vdso_install:

diff --combined arch/s390/kernel/vdso64/Makefile
index 3d3303283181f3e5777df70821fe780178265a52,9acad762456d44ab36c7da0b0a63dd90ca90ad1f..13cc5a3f9abf800dd47887b50a28a8759b0adcd5
--- 1/arch/s390/kernel/vdso64/Makefile
--- 2/arch/s390/kernel/vdso64/Makefile
+++ b/arch/s390/kernel/vdso64/Makefile
@@@ -1,23 -1,17 +1,23 @@@
  # SPDX-License-Identifier: GPL-2.0
 -# List of files in the vdso, has to be asm only for now
 +# List of files in the vdso
  
  KCOV_INSTRUMENT := n
 +ARCH_REL_TYPE_ABS := R_390_COPY|R_390_GLOB_DAT|R_390_JMP_SLOT|R_390_RELATIVE
 +ARCH_REL_TYPE_ABS += R_390_GOT|R_390_PLT
  
 -obj-vdso64 = gettimeofday.o clock_getres.o clock_gettime.o note.o getcpu.o
 +include $(srctree)/lib/vdso/Makefile
 +obj-vdso64 = vdso_user_wrapper.o note.o getcpu.o
 +obj-cvdso64 = vdso64_generic.o
 +CFLAGS_REMOVE_vdso64_generic.o = -pg $(CC_FLAGS_FTRACE) $(CC_FLAGS_EXPOLINE)
  
  # Build rules
  
 -targets := $(obj-vdso64) vdso64.so vdso64.so.dbg
 +targets := $(obj-vdso64) $(obj-cvdso64) vdso64.so vdso64.so.dbg
  obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64))
 +obj-cvdso64 := $(addprefix $(obj)/, $(obj-cvdso64))
  
  KBUILD_AFLAGS += -DBUILD_VDSO
 -KBUILD_CFLAGS += -DBUILD_VDSO
 +KBUILD_CFLAGS += -DBUILD_VDSO -DDISABLE_BRANCH_PROFILING
  
  KBUILD_AFLAGS_64 := $(filter-out -m64,$(KBUILD_AFLAGS))
  KBUILD_AFLAGS_64 += -m64 -s
@@@ -25,13 -19,13 +25,13 @@@
  KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS))
  KBUILD_CFLAGS_64 += -m64 -fPIC -shared -fno-common -fno-builtin
  ldflags-y := -fPIC -shared -nostdlib -soname=linux-vdso64.so.1 \
-            --hash-style=both --build-id -T
+            --hash-style=both --build-id=sha1 -T
  
  $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_64)
  $(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_64)
  
  obj-y += vdso64_wrapper.o
- extra-y += vdso64.lds
+ targets += vdso64.lds
  CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
  
  # Disable gcov profiling, ubsan and kasan for VDSO code
@@@ -43,7 -37,7 +43,7 @@@ KASAN_SANITIZE := 
  $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so
  
  # link rule for the .so file, .lds has to be first
 -$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) FORCE
 +$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) $(obj-cvdso64) FORCE
        $(call if_changed,ld)
  
  # strip rule for the .so file
@@@ -55,14 -49,9 +55,14 @@@ $(obj)/%.so: $(obj)/%.so.dbg FORC
  $(obj-vdso64): %.o: %.S FORCE
        $(call if_changed_dep,vdso64as)
  
 +$(obj-cvdso64): %.o: %.c FORCE
 +      $(call if_changed_dep,vdso64cc)
 +
  # actual build commands
  quiet_cmd_vdso64as = VDSO64A $@
        cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
 +quiet_cmd_vdso64cc = VDSO64C $@
 +      cmd_vdso64cc = $(CC) $(c_flags) -c -o $@ $<
  
  # install commands for the unstripped file
  quiet_cmd_vdso_install = INSTALL $@

diff --combined include/asm-generic/Kbuild
index 62ebdc731ee23934d6f898b4fb26c7008770feed,7cd4e627e00ec49f0976580acabbfaf819d8bd4b..e78bbb9a07e90b72df2da87f35950b6f30673833
--- 1/include/asm-generic/Kbuild
--- 2/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@@ -16,6 -16,7 +16,6 @@@ mandatory-y += current.
  mandatory-y += delay.h
  mandatory-y += device.h
  mandatory-y += div64.h
 -mandatory-y += dma-contiguous.h
  mandatory-y += dma-mapping.h
  mandatory-y += dma.h
  mandatory-y += emergency-restart.h
@@@ -39,6 -40,7 +39,7 @@@ mandatory-y += mmiowb.
  mandatory-y += mmu.h
  mandatory-y += mmu_context.h
  mandatory-y += module.h
+ mandatory-y += module.lds.h
  mandatory-y += msi.h
  mandatory-y += pci.h
  mandatory-y += percpu.h

diff --combined kernel/Makefile
index 2044ef02763b16a4b4d4f3b6cfc0347576c46af6,347254f07dab14df7f378501c9645e9c76ff5a8a..af601b9bda0e67becdf8b3fc3b2b5440f8940384
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -12,7 -12,7 +12,7 @@@ obj-y     = fork.o exec_domain.o panic.
            notifier.o ksysfs.o cred.o reboot.o \
            async.o range.o smpboot.o ucount.o regset.o
  
 -obj-$(CONFIG_BPFILTER) += usermode_driver.o
 +obj-$(CONFIG_USERMODE_DRIVER) += usermode_driver.o
  obj-$(CONFIG_MODULES) += kmod.o
  obj-$(CONFIG_MULTIUSER) += groups.o
  
@@@ -38,9 -38,6 +38,6 @@@ KASAN_SANITIZE_kcov.o := 
  KCSAN_SANITIZE_kcov.o := n
  CFLAGS_kcov.o := $(call cc-option, -fno-conserve-stack) -fno-stack-protector
  
- # cond_syscall is currently not LTO compatible
- CFLAGS_sys_ni.o = $(DISABLE_LTO)
- 
  obj-y += sched/
  obj-y += locking/
  obj-y += power/
@@@ -111,7 -108,6 +108,7 @@@ obj-$(CONFIG_CPU_PM) += cpu_pm.
  obj-$(CONFIG_BPF) += bpf/
  obj-$(CONFIG_KCSAN) += kcsan/
  obj-$(CONFIG_SHADOW_CALL_STACK) += scs.o
 +obj-$(CONFIG_HAVE_STATIC_CALL_INLINE) += static_call.o
  
  obj-$(CONFIG_PERF_EVENTS) += events/
  
@@@ -134,8 -130,6 +131,8 @@@ KASAN_SANITIZE_stackleak.o := 
  KCSAN_SANITIZE_stackleak.o := n
  KCOV_INSTRUMENT_stackleak.o := n
  
 +obj-$(CONFIG_SCF_TORTURE_TEST) += scftorture.o
 +
  $(obj)/configs.o: $(obj)/config_data.gz
  
  targets += config_data.gz

diff --combined lib/Kconfig.debug
index 66d44d35cc97f939db21f14e24432e91b540e09d,60f3837f608c093f1d4bb326a4afe695b7c2dd71..d7a7bc3b6098287dc7af87b2c94d5304675401f3
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -212,9 -212,10 +212,10 @@@ config DEBUG_INF
  
          If unsure, say N.
  
+ if DEBUG_INFO
+ 
  config DEBUG_INFO_REDUCED
        bool "Reduce debugging information"
-       depends on DEBUG_INFO
        help
          If you say Y here gcc is instructed to generate less debugging
          information for structure types. This means that tools that
@@@ -227,7 -228,6 +228,6 @@@
  
  config DEBUG_INFO_COMPRESSED
        bool "Compressed debugging information"
-       depends on DEBUG_INFO
        depends on $(cc-option,-gz=zlib)
        depends on $(ld-option,--compress-debug-sections=zlib)
        help
@@@ -243,7 -243,6 +243,6 @@@
  
  config DEBUG_INFO_SPLIT
        bool "Produce split debuginfo in .dwo files"
-       depends on DEBUG_INFO
        depends on $(cc-option,-gsplit-dwarf)
        help
          Generate debug info into separate .dwo files. This significantly
@@@ -259,7 -258,6 +258,6 @@@
  
  config DEBUG_INFO_DWARF4
        bool "Generate dwarf4 debuginfo"
-       depends on DEBUG_INFO
        depends on $(cc-option,-gdwarf-4)
        help
          Generate dwarf4 debug info. This requires recent versions
@@@ -269,7 -267,6 +267,6 @@@
  
  config DEBUG_INFO_BTF
        bool "Generate BTF typeinfo"
-       depends on DEBUG_INFO
        depends on !DEBUG_INFO_SPLIT && !DEBUG_INFO_REDUCED
        depends on !GCC_PLUGIN_RANDSTRUCT || COMPILE_TEST
        help
@@@ -279,7 -276,6 +276,6 @@@
  
  config GDB_SCRIPTS
        bool "Provide GDB scripts for kernel debugging"
-       depends on DEBUG_INFO
        help
          This creates the required links to GDB helper scripts in the
          build directory. If you load vmlinux into gdb, the helper
@@@ -288,6 -284,8 +284,8 @@@
          instance. See Documentation/dev-tools/gdb-kernel-debugging.rst
          for further details.
  
+ endif # DEBUG_INFO
+ 
  config ENABLE_MUST_CHECK
        bool "Enable __must_check logic"
        default y
@@@ -520,8 -518,8 +518,8 @@@ config DEBUG_FS_ALLOW_NON
  endchoice
  
  source "lib/Kconfig.kgdb"
 -
  source "lib/Kconfig.ubsan"
 +source "lib/Kconfig.kcsan"
  
  endmenu
  
@@@ -1367,27 -1365,6 +1365,27 @@@ config WW_MUTEX_SELFTES
          Say M if you want these self tests to build as a module.
          Say N if you are unsure.
  
 +config SCF_TORTURE_TEST
 +      tristate "torture tests for smp_call_function*()"
 +      depends on DEBUG_KERNEL
 +      select TORTURE_TEST
 +      help
 +        This option provides a kernel module that runs torture tests
 +        on the smp_call_function() family of primitives.  The kernel
 +        module may be built after the fact on the running kernel to
 +        be tested, if desired.
 +
 +config CSD_LOCK_WAIT_DEBUG
 +      bool "Debugging for csd_lock_wait(), called from smp_call_function*()"
 +      depends on DEBUG_KERNEL
 +      depends on 64BIT
 +      default n
 +      help
 +        This option enables debug prints when CPUs are slow to respond
 +        to the smp_call_function*() IPI wrappers.  These debug prints
 +        include the IPI handler function currently executing (if any)
 +        and relevant stack traces.
 +
  endmenu # lock debugging
  
  config TRACE_IRQFLAGS
@@@ -1641,6 -1618,8 +1639,6 @@@ config PROVIDE_OHCI1394_DMA_INI
  
  source "samples/Kconfig"
  
 -source "lib/Kconfig.kcsan"
 -
  config ARCH_HAS_DEVMEM_IS_ALLOWED
        bool
  
@@@ -1789,13 -1768,6 +1787,13 @@@ config FAIL_PAGE_ALLO
        help
          Provide fault-injection capability for alloc_pages().
  
 +config FAULT_INJECTION_USERCOPY
 +      bool "Fault injection capability for usercopy functions"
 +      depends on FAULT_INJECTION
 +      help
 +        Provides fault-injection capability to inject failures
 +        in usercopy functions (copy_from_user(), get_user(), ...).
 +
  config FAIL_MAKE_REQUEST
        bool "Fault-injection capability for disk IO"
        depends on FAULT_INJECTION && BLOCK
@@@ -2063,6 -2035,13 +2061,6 @@@ config TEST_BITMA
  
          If unsure, say N.
  
 -config TEST_BITFIELD
 -      tristate "Test bitfield functions at runtime"
 -      help
 -        Enable this option to test the bitfield functions at boot.
 -
 -        If unsure, say N.
 -
  config TEST_UUID
        tristate "Test functions located in the uuid module at runtime"
  
@@@ -2212,22 -2191,6 +2210,22 @@@ config TEST_SYSCT
  
          If unsure, say N.
  
 +config BITFIELD_KUNIT
 +      tristate "KUnit test bitfield functions at runtime"
 +      depends on KUNIT
 +      help
 +        Enable this option to test the bitfield functions at boot.
 +
 +        KUnit tests run during boot and output the results to the debug log
 +        in TAP format (http://testanything.org/). Only useful for kernel devs
 +        running the KUnit test harness, and not intended for inclusion into a
 +        production build.
 +
 +        For more information on KUnit and unit tests in general please refer
 +        to the KUnit documentation in Documentation/dev-tools/kunit/.
 +
 +        If unsure, say N.
 +
  config SYSCTL_KUNIT_TEST
        tristate "KUnit test for sysctl" if !KUNIT_ALL_TESTS
        depends on KUNIT
@@@ -2404,15 -2367,6 +2402,15 @@@ config TEST_HM
  
          If unsure, say N.
  
 +config TEST_FREE_PAGES
 +      tristate "Test freeing pages"
 +      help
 +        Test that a memory leak does not occur due to a race between
 +        freeing a block of pages and a speculative page reference.
 +        Loading this module is safe if your kernel has the bug fixed.
 +        If the bug is not fixed, it will leak gigabytes of memory and
 +        probably OOM your system.
 +
  config TEST_FPU
        tristate "Test floating point operations in kernel space"
        depends on X86 && !KCOV_INSTRUMENT_ALL

diff --combined scripts/Makefile.kcsan
index c37f9518d5d957316fb6c663af76ddb9fb50aee3,cec50d74e0d0a6faa1778bed07949f2c030c1179..37cb504c77e136e6838a166d184978c4e5e0d97a
--- 1/scripts/Makefile.kcsan
--- 2/scripts/Makefile.kcsan
+++ b/scripts/Makefile.kcsan
@@@ -9,7 -9,7 +9,7 @@@ endi
  
  # Keep most options here optional, to allow enabling more compilers if absence
  # of some options does not break KCSAN nor causes false positive reports.
- CFLAGS_KCSAN := -fsanitize=thread \
+ export CFLAGS_KCSAN := -fsanitize=thread \
        $(call cc-option,$(call cc-param,tsan-instrument-func-entry-exit=0) -fno-optimize-sibling-calls) \
 -      $(call cc-option,$(call cc-param,tsan-instrument-read-before-write=1)) \
 +      $(call cc-option,$(call cc-param,tsan-compound-read-before-write=1),$(call cc-option,$(call cc-param,tsan-instrument-read-before-write=1))) \
        $(call cc-param,tsan-distinguish-volatile=1)

diff --combined scripts/Makefile.ubsan
index 4e3fff0745e81d44a0f0c825c27e9670eb7898c6,c661484ee01f9fd42d0b2c4565a03ab5a6c133c3..9716dab06bc7a9f6012555f8b2d4e8e29e472b6d
--- 1/scripts/Makefile.ubsan
--- 2/scripts/Makefile.ubsan
+++ b/scripts/Makefile.ubsan
@@@ -1,18 -1,13 +1,21 @@@
  # SPDX-License-Identifier: GPL-2.0
+ 
+ export CFLAGS_UBSAN :=
+ 
  ifdef CONFIG_UBSAN_ALIGNMENT
        CFLAGS_UBSAN += $(call cc-option, -fsanitize=alignment)
  endif
  
  ifdef CONFIG_UBSAN_BOUNDS
 -      CFLAGS_UBSAN += $(call cc-option, -fsanitize=bounds)
 +      ifdef CONFIG_CC_IS_CLANG
 +            CFLAGS_UBSAN += -fsanitize=array-bounds
 +      else
 +            CFLAGS_UBSAN += $(call cc-option, -fsanitize=bounds)
 +      endif
 +endif
 +
 +ifdef CONFIG_UBSAN_LOCAL_BOUNDS
 +      CFLAGS_UBSAN += -fsanitize=local-bounds
  endif
  
  ifdef CONFIG_UBSAN_MISC

diff --combined scripts/link-vmlinux.sh
index dbde59d343b11bcc2051198945e728a0101c222c,d9bcf36a15839b0d683428382ba3d7ad84dbab48..6eded325c8378c8cff94c379a180060c0b154ec4
--- 1/scripts/link-vmlinux.sh
--- 2/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@@ -169,10 -169,9 +169,9 @@@ gen_btf(
        printf '\1' | dd of=${2} conv=notrunc bs=1 seek=16 status=none
  }
  
- # Create ${2} .o file with all symbols from the ${1} object file
+ # Create ${2} .S file with all symbols from the ${1} object file
  kallsyms()
  {
-       info KSYM ${2}
        local kallsymopt;
  
        if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then
@@@ -187,13 -186,8 +186,8 @@@
                kallsymopt="${kallsymopt} --base-relative"
        fi
  
-       local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
-                     ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
- 
-       local afile="`basename ${2} .o`.S"
- 
-       ${NM} -n ${1} | scripts/kallsyms ${kallsymopt} > ${afile}
-       ${CC} ${aflags} -c -o ${2} ${afile}
+       info KSYMS ${2}
+       ${NM} -n ${1} | scripts/kallsyms ${kallsymopt} > ${2}
  }
  
  # Perform one step in kallsyms generation, including temporary linking of
@@@ -203,9 -197,15 +197,15 @@@ kallsyms_step(
        kallsymso_prev=${kallsymso}
        kallsyms_vmlinux=.tmp_vmlinux.kallsyms${1}
        kallsymso=${kallsyms_vmlinux}.o
+       kallsyms_S=${kallsyms_vmlinux}.S
  
        vmlinux_link ${kallsyms_vmlinux} "${kallsymso_prev}" ${btf_vmlinux_bin_o}
-       kallsyms ${kallsyms_vmlinux} ${kallsymso}
+       kallsyms ${kallsyms_vmlinux} ${kallsyms_S}
+ 
+       info AS ${kallsyms_S}
+       ${CC} ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS} \
+             ${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \
+             -c -o ${kallsymso} ${kallsyms_S}
  }
  
  # Create map file with all symbols from ${1}
@@@ -341,9 -341,9 +341,9 @@@ f
  vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o}
  
  # fill in BTF IDs
 -if [ -n "${CONFIG_DEBUG_INFO_BTF}" ]; then
 -info BTFIDS vmlinux
 -${RESOLVE_BTFIDS} vmlinux
 +if [ -n "${CONFIG_DEBUG_INFO_BTF}" -a -n "${CONFIG_BPF}" ]; then
 +      info BTFIDS vmlinux
 +      ${RESOLVE_BTFIDS} vmlinux
  fi
  
  if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then

diff --combined tools/testing/selftests/bpf/Makefile
index bdbeafec371beddc0fe44b2084070b5d648d3ee6,daf186f88a63612987d238acce70c8777b24225b..542768f5195b72296ffc7edf0cfa7d4aa894a6c0
--- 1/tools/testing/selftests/bpf/Makefile
--- 2/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@@ -33,9 -33,9 +33,9 @@@ LDLIBS += -lcap -lelf -lz -lrt -lpthrea
  # Order correspond to 'make run_tests' order
  TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test_progs \
        test_verifier_log test_dev_cgroup test_tcpbpf_user \
 -      test_sock test_btf test_sockmap get_cgroup_id_user test_socket_cookie \
 +      test_sock test_sockmap get_cgroup_id_user test_socket_cookie \
        test_cgroup_storage \
 -      test_netcnt test_tcpnotify_user test_sock_fields test_sysctl \
 +      test_netcnt test_tcpnotify_user test_sysctl \
        test_progs-no_alu32 \
        test_current_pid_tgid_new_ns
  
@@@ -68,8 -68,7 +68,8 @@@ TEST_PROGS := test_kmod.sh 
        test_tc_edt.sh \
        test_xdping.sh \
        test_bpftool_build.sh \
 -      test_bpftool.sh
 +      test_bpftool.sh \
 +      test_bpftool_metadata.sh \
  
  TEST_PROGS_EXTENDED := with_addr.sh \
        with_tunnels.sh \
@@@ -134,7 -133,7 +134,7 @@@ $(OUTPUT)/%:%.
  
  $(OUTPUT)/urandom_read: urandom_read.c
        $(call msg,BINARY,,$@)
-       $(Q)$(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) -Wl,--build-id
+       $(Q)$(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) -Wl,--build-id=sha1
  
  $(OUTPUT)/test_stub.o: test_stub.c $(BPFOBJ)
        $(call msg,CC,,$@)
@@@ -177,11 -176,6 +177,11 @@@ $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOO
        $(Q)$(MAKE) $(submake_extras)  -C $(BPFTOOLDIR)                        \
                    OUTPUT=$(BUILD_DIR)/bpftool/                               \
                    prefix= DESTDIR=$(SCRATCH_DIR)/ install
 +      $(Q)mkdir -p $(BUILD_DIR)/bpftool/Documentation
 +      $(Q)RST2MAN_OPTS="--exit-status=1" $(MAKE) $(submake_extras)           \
 +                  -C $(BPFTOOLDIR)/Documentation                             \
 +                  OUTPUT=$(BUILD_DIR)/bpftool/Documentation/                 \
 +                  prefix= DESTDIR=$(SCRATCH_DIR)/ install
  
  $(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile)                   \
           ../../../include/uapi/linux/bpf.h                                   \
@@@ -322,7 -316,7 +322,7 @@@ $(TRUNNER_BPF_OBJS): $(TRUNNER_OUTPUT)/
                     $(TRUNNER_BPF_PROGS_DIR)/%.c                       \
                     $(TRUNNER_BPF_PROGS_DIR)/*.h                       \
                     $$(INCLUDE_DIR)/vmlinux.h                          \
 -                   $$(BPFOBJ) | $(TRUNNER_OUTPUT)
 +                   $(wildcard $(BPFDIR)/bpf_*.h) | $(TRUNNER_OUTPUT)
        $$(call $(TRUNNER_BPF_BUILD_RULE),$$<,$$@,                      \
                                          $(TRUNNER_BPF_CFLAGS),        \
                                          $(TRUNNER_BPF_LDFLAGS))