Merge tag 'powerpc-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

Pull powerpc updates from Michael Ellerman:
 "Slightly late as I had to rebase mid-week to insert a bug fix:

   - A large series from Nick for 64-bit to further rework our exception
     vectors, and rewrite portions of the syscall entry/exit and
     interrupt return in C. The result is much easier to follow code
     that is also faster in general.

   - Cleanup of our ptrace code to split various parts out that had
     become badly intertwined with #ifdefs over the years.

   - Changes to our NUMA setup under the PowerVM hypervisor which should
     hopefully avoid non-sensical topologies which can lead to warnings
     from the workqueue code and other problems.

   - MAINTAINERS updates to remove some of our old orphan entries and
     update the status of others.

   - Quite a few other small changes and fixes all over the map.

  Thanks to: Abdul Haleem, afzal mohammed, Alexey Kardashevskiy, Andrew
  Donnellan, Aneesh Kumar K.V, Balamuruhan S, Cédric Le Goater, Chen
  Zhou, Christophe JAILLET, Christophe Leroy, Christoph Hellwig, Clement
  Courbet, Daniel Axtens, David Gibson, Douglas Miller, Fabiano Rosas,
  Fangrui Song, Ganesh Goudar, Gautham R. Shenoy, Greg Kroah-Hartman,
  Greg Kurz, Gustavo Luiz Duarte, Hari Bathini, Ilie Halip, Jan Kara,
  Joe Lawrence, Joe Perches, Kajol Jain, Larry Finger, Laurentiu Tudor,
  Leonardo Bras, Libor Pechacek, Madhavan Srinivasan, Mahesh Salgaonkar,
  Masahiro Yamada, Masami Hiramatsu, Mauricio Faria de Oliveira, Michael
  Neuling, Michal Suchanek, Mike Rapoport, Nageswara R Sastry, Nathan
  Chancellor, Nathan Lynch, Naveen N. Rao, Nicholas Piggin, Nick
  Desaulniers, Oliver O'Halloran, Po-Hsu Lin, Pratik Rajesh Sampat,
  Rasmus Villemoes, Ravi Bangoria, Roman Bolshakov, Sam Bobroff,
  Sandipan Das, Santosh S, Sedat Dilek, Segher Boessenkool, Shilpasri G
  Bhat, Sourabh Jain, Srikar Dronamraju, Stephen Rothwell, Tyrel
  Datwyler, Vaibhav Jain, YueHaibing"

* tag 'powerpc-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (158 commits)
  powerpc: Make setjmp/longjmp signature standard
  powerpc/cputable: Remove unnecessary copy of cpu_spec->oprofile_type
  powerpc: Suppress .eh_frame generation
  powerpc: Drop -fno-dwarf2-cfi-asm
  powerpc/32: drop unused ISA_DMA_THRESHOLD
  powerpc/powernv: Add documentation for the opal sensor_groups sysfs interfaces
  selftests/powerpc: Fix try-run when source tree is not writable
  powerpc/vmlinux.lds: Explicitly retain .gnu.hash
  powerpc/ptrace: move ptrace_triggered() into hw_breakpoint.c
  powerpc/ptrace: create ppc_gethwdinfo()
  powerpc/ptrace: create ptrace_get_debugreg()
  powerpc/ptrace: split out ADV_DEBUG_REGS related functions.
  powerpc/ptrace: move register viewing functions out of ptrace.c
  powerpc/ptrace: split out TRANSACTIONAL_MEM related functions.
  powerpc/ptrace: split out SPE related functions.
  powerpc/ptrace: split out ALTIVEC related functions.
  powerpc/ptrace: split out VSX related functions.
  powerpc/ptrace: drop PARAMETER_SAVE_AREA_OFFSET
  powerpc/ptrace: drop unnecessary #ifdefs CONFIG_PPC64
  powerpc/ptrace: remove unused header includes
  ...

diff --combined MAINTAINERS
index a9ebda622ac32218aedc7688f24951d6ff96eebb,dad68253cc4a451a6f2595c850a51af31d221efd..534a8dc4f84a6e733b0b11da584e4e93a50d3be0
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -176,7 -176,7 +176,7 @@@ L: linux-wpan@vger.kernel.or
  S:    Maintained
  F:    net/6lowpan/
  F:    include/net/6lowpan.h
 -F:    Documentation/networking/6lowpan.txt
 +F:    Documentation/networking/6lowpan.rst
  
  6PACK NETWORK DRIVER FOR AX.25
  M:    Andreas Koensgen <ajk@comnets.uni-bremen.de>
@@@ -214,7 -214,7 +214,7 @@@ Q: http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
  T:    git git://github.com/martinetd/linux.git
  S:    Maintained
 -F:    Documentation/filesystems/9p.txt
 +F:    Documentation/filesystems/9p.rst
  F:    fs/9p/
  F:    net/9p/
  F:    include/net/9p/
@@@ -236,7 -236,7 +236,7 @@@ M: Adaptec OEM Raid Solutions <aacraid@
  L:    linux-scsi@vger.kernel.org
  W:    http://www.adaptec.com/
  S:    Supported
 -F:    Documentation/scsi/aacraid.txt
 +F:    Documentation/scsi/aacraid.rst
  F:    drivers/scsi/aacraid/
  
  ABI/API
@@@ -303,8 -303,8 +303,8 @@@ F: drivers/net/ethernet/alteon/acenic
  ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
  M:    Peter Kaestle <peter@piie.net>
  L:    platform-driver-x86@vger.kernel.org
 -W:    http://piie.net/?section=acerhdf
  S:    Maintained
 +W:    http://piie.net/?section=acerhdf
  F:    drivers/platform/x86/acerhdf.c
  
  ACER WMI LAPTOP EXTRAS
@@@ -540,7 -540,7 +540,7 @@@ M: Matthew Wilcox <willy@infradead.org
  M:    Hannes Reinecke <hare@suse.com>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
 -F:    Documentation/scsi/advansys.txt
 +F:    Documentation/scsi/advansys.rst
  F:    drivers/scsi/advansys.c
  
  ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
@@@ -584,7 -584,7 +584,7 @@@ AFFS FILE SYSTE
  M:    David Sterba <dsterba@suse.com>
  L:    linux-fsdevel@vger.kernel.org
  S:    Odd Fixes
 -F:    Documentation/filesystems/affs.txt
 +F:    Documentation/filesystems/affs.rst
  F:    fs/affs/
  
  AFS FILESYSTEM
@@@ -593,7 -593,7 +593,7 @@@ L: linux-afs@lists.infradead.or
  S:    Supported
  F:    fs/afs/
  F:    include/trace/events/afs.h
 -F:    Documentation/filesystems/afs.txt
 +F:    Documentation/filesystems/afs.rst
  W:    https://www.infradead.org/~dhowells/kafs/
  
  AGPGART DRIVER
@@@ -693,7 -693,7 +693,7 @@@ ALLWINNER CPUFREQ DRIVE
  M:    Yangtao Li <tiny.windzz@gmail.com>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt
 +F:    Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml
  F:    drivers/cpufreq/sun50i-cpufreq-nvmem.c
  
  ALLWINNER CRYPTO DRIVERS
@@@ -931,14 -931,6 +931,14 @@@ S:       Supporte
  F:    drivers/iio/adc/ad7124.c
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
  
 +ANALOG DEVICES INC AD7192 DRIVER
 +M:    Alexandru Tachici <alexandru.tachici@analog.com>
 +L:    linux-iio@vger.kernel.org
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/adc/ad7192.c
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml
 +
  ANALOG DEVICES INC AD7292 DRIVER
  M:    Marcelo Schmitt <marcelo.schmitt1@gmail.com>
  L:    linux-iio@vger.kernel.org
@@@ -1089,15 -1081,6 +1089,15 @@@ F:    drivers/iio/adc/ltc249
  X:    drivers/iio/*/adjd*
  F:    drivers/staging/iio/*/ad*
  
 +ANALOG DEVICES INC HMC425A DRIVER
 +M:    Beniamin Bia <beniamin.bia@analog.com>
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +L:    linux-iio@vger.kernel.org
 +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
 +
  ANALOGBITS PLL LIBRARIES
  M:    Paul Walmsley <paul.walmsley@sifive.com>
  S:    Supported
@@@ -1297,7 -1280,7 +1297,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/arm-boards
  F:    Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt
 -F:    Documentation/devicetree/bindings/clock/arm-integrator.txt
 +F:    Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml
  F:    Documentation/devicetree/bindings/i2c/i2c-versatile.txt
  F:    Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
  F:    Documentation/devicetree/bindings/mtd/arm-versatile.txt
@@@ -1622,7 -1605,7 +1622,7 @@@ F:      Documentation/devicetree/bindings/cl
  F:    Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt
  
  ARM/CALXEDA HIGHBANK ARCHITECTURE
 -M:    Rob Herring <robh@kernel.org>
 +M:    Andre Przywara <andre.przywara@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-highbank/
@@@ -1693,15 -1676,12 +1693,15 @@@ F:   arch/arm/mach-ep93xx/micro9.
  ARM/CORESIGHT FRAMEWORK AND DRIVERS
  M:    Mathieu Poirier <mathieu.poirier@linaro.org>
  R:    Suzuki K Poulose <suzuki.poulose@arm.com>
 +R:    Mike Leach <mike.leach@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/hwtracing/coresight/*
 +F:    include/dt-bindings/arm/coresight-cti-dt.h
  F:    Documentation/trace/coresight/*
  F:    Documentation/devicetree/bindings/arm/coresight.txt
  F:    Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
 +F:    Documentation/devicetree/bindings/arm/coresight-cti.yaml
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
  F:    tools/perf/arch/arm/util/pmu.c
  F:    tools/perf/arch/arm/util/auxtrace.c
@@@ -1948,7 -1928,7 +1948,7 @@@ F:      Documentation/devicetree/bindings/i2
  F:    arch/arm/boot/dts/lpc43*
  F:    drivers/i2c/busses/i2c-lpc2k.c
  F:    drivers/memory/pl172.c
 -F:    drivers/mtd/spi-nor/nxp-spifi.c
 +F:    drivers/mtd/spi-nor/controllers/nxp-spifi.c
  F:    drivers/rtc/rtc-lpc24xx.c
  N:    lpc18xx
  
@@@ -2015,9 -1995,7 +2015,9 @@@ M:      Sean Wang <sean.wang@mediatek.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/rtc/rtc-mt2712.txt
  F:    Documentation/devicetree/bindings/rtc/rtc-mt7622.txt
 +F:    drivers/rtc/rtc-mt2712.c
  F:    drivers/rtc/rtc-mt6397.c
  F:    drivers/rtc/rtc-mt7622.c
  
@@@ -2296,9 -2274,8 +2296,9 @@@ L:      linux-arm-kernel@lists.infradead.or
  L:    linux-rockchip@lists.infradead.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml
  F:    Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml
 +F:    Documentation/devicetree/bindings/spi/spi-rockchip.yaml
  F:    arch/arm/boot/dts/rk3*
  F:    arch/arm/boot/dts/rv1108*
  F:    arch/arm/mach-rockchip/
@@@ -2569,9 -2546,9 +2569,9 @@@ M:      Masahiro Yamada <yamada.masahiro@soc
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
  S:    Maintained
 -F:    Documentation/devicetree/bindings/arm/socionext/uniphier.txt
 -F:    Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
 -F:    Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt
 +F:    Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
 +F:    Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
  F:    arch/arm/boot/dts/uniphier*
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
  F:    arch/arm/mach-uniphier/
@@@ -2748,8 -2725,8 +2748,8 @@@ L:      linux-aspeed@lists.ozlabs.org (moder
  L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
 -F:    drivers/pinctrl/aspeed/
  F:    Documentation/devicetree/bindings/pinctrl/aspeed,*
 +F:    drivers/pinctrl/aspeed/
  
  ASPEED SCU INTERRUPT CONTROLLER DRIVER
  M:    Eddie James <eajames@linux.ibm.com>
@@@ -2771,8 -2748,8 +2771,8 @@@ ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRA
  M:    Corentin Chary <corentin.chary@gmail.com>
  L:    acpi4asus-user@lists.sourceforge.net
  L:    platform-driver-x86@vger.kernel.org
 -W:    http://acpi4asus.sf.net
  S:    Maintained
 +W:    http://acpi4asus.sf.net
  F:    drivers/platform/x86/asus*.c
  F:    drivers/platform/x86/eeepc*.c
  
@@@ -2980,14 -2957,6 +2980,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/sound/axentia,*
  F:    sound/soc/atmel/tse850-pcm5142.c
  
 +AXI-FAN-CONTROL HARDWARE MONITOR DRIVER
 +M:    Nuno Sá <nuno.sa@analog.com>
 +W:    http://ez.analog.com/community/linux-device-drivers
 +L:    linux-hwmon@vger.kernel.org
 +S:    Supported
 +F:    drivers/hwmon/axi-fan-control.c
 +F:    Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml
 +
  AXXIA I2C CONTROLLER
  M:    Krzysztof Adamski <krzysztof.adamski@nokia.com>
  L:    linux-i2c@vger.kernel.org
@@@ -3094,7 -3063,7 +3094,7 @@@ M:      Luis de Bethencourt <luisbg@kernel.o
  M:    Salah Triki <salah.triki@gmail.com>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git
 -F:    Documentation/filesystems/befs.txt
 +F:    Documentation/filesystems/befs.rst
  F:    fs/befs/
  
  BFQ I/O SCHEDULER
@@@ -3108,7 -3077,7 +3108,7 @@@ F:      Documentation/block/bfq-iosched.rs
  BFS FILE SYSTEM
  M:    "Tigran A. Aivazian" <aivazian.tigran@gmail.com>
  S:    Maintained
 -F:    Documentation/filesystems/bfs.txt
 +F:    Documentation/filesystems/bfs.rst
  F:    fs/bfs/
  F:    include/uapi/linux/bfs_fs.h
  
@@@ -3178,8 -3147,6 +3178,8 @@@ R:      Martin KaFai Lau <kafai@fb.com
  R:    Song Liu <songliubraving@fb.com>
  R:    Yonghong Song <yhs@fb.com>
  R:    Andrii Nakryiko <andriin@fb.com>
 +R:    John Fastabend <john.fastabend@gmail.com>
 +R:    KP Singh <kpsingh@chromium.org>
  L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
@@@ -3246,22 -3213,11 +3246,22 @@@ L:   bpf@vger.kernel.or
  S:    Maintained
  F:    arch/powerpc/net/
  
 -BPF JIT for RISC-V (RV64G)
 +BPF JIT for RISC-V (32-bit)
 +M:    Luke Nelson <luke.r.nels@gmail.com>
 +M:    Xi Wang <xi.wang@gmail.com>
 +L:    netdev@vger.kernel.org
 +L:    bpf@vger.kernel.org
 +S:    Maintained
 +F:    arch/riscv/net/
 +X:    arch/riscv/net/bpf_jit_comp64.c
 +
 +BPF JIT for RISC-V (64-bit)
  M:    Björn Töpel <bjorn.topel@gmail.com>
  L:    netdev@vger.kernel.org
 +L:    bpf@vger.kernel.org
  S:    Maintained
  F:    arch/riscv/net/
 +X:    arch/riscv/net/bpf_jit_comp32.c
  
  BPF JIT for S390
  M:    Ilya Leoshkevich <iii@linux.ibm.com>
@@@ -3475,7 -3431,7 +3475,7 @@@ L:      linux-i2c@vger.kernel.or
  L:    bcm-kernel-feedback-list@broadcom.com
  S:    Supported
  F:    drivers/i2c/busses/i2c-brcmstb.c
 -F:    Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt
 +F:    Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
  
  BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
  M:    Al Cooper <alcooperx@gmail.com>
@@@ -3654,7 -3610,7 +3654,7 @@@ W:      http://btrfs.wiki.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git
  S:    Maintained
 -F:    Documentation/filesystems/btrfs.txt
 +F:    Documentation/filesystems/btrfs.rst
  F:    fs/btrfs/
  F:    include/linux/btrfs*
  F:    include/uapi/linux/btrfs*
@@@ -3693,7 -3649,6 +3693,7 @@@ F:      sound/pci/oxygen
  
  C-SKY ARCHITECTURE
  M:    Guo Ren <guoren@kernel.org>
 +L:    linux-csky@vger.kernel.org
  T:    git https://github.com/c-sky/csky-linux.git
  S:    Supported
  F:    arch/csky/
@@@ -3951,10 -3906,10 +3951,10 @@@ W:   http://ceph.com
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
  T:    git git://github.com/ceph/ceph-client.git
  S:    Supported
 -F:    Documentation/filesystems/ceph.txt
 +F:    Documentation/filesystems/ceph.rst
  F:    fs/ceph/
  
 -CERTIFICATE HANDLING:
 +CERTIFICATE HANDLING
  M:    David Howells <dhowells@redhat.com>
  M:    David Woodhouse <dwmw2@infradead.org>
  L:    keyrings@vger.kernel.org
@@@ -3964,6 -3919,11 +3964,6 @@@ F:     certs
  F:    scripts/sign-file.c
  F:    scripts/extract-cert.c
  
 -CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 -L:    devel@driverdev.osuosl.org
 -S:    Obsolete
 -F:    drivers/staging/wusbcore/
 -
  CFAG12864B LCD DRIVER
  M:    Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
  S:    Maintained
@@@ -4056,12 -4016,12 +4056,12 @@@ M:   Cheng-Yi Chiang <cychiang@chromium.o
  S:    Maintained
  R:    Enric Balletbo i Serra <enric.balletbo@collabora.com>
  R:    Guenter Roeck <groeck@chromium.org>
 -F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
 +F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
  F:    sound/soc/codecs/cros_ec_codec.*
  
  CIRRUS LOGIC AUDIO CODEC DRIVERS
 -M:    Brian Austin <brian.austin@cirrus.com>
 -M:    Paul Handrigan <Paul.Handrigan@cirrus.com>
 +M:    James Schulman <james.schulman@cirrus.com>
 +M:    David Rhodes <david.rhodes@cirrus.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
  F:    sound/soc/codecs/cs*
@@@ -4112,6 -4072,7 +4112,6 @@@ F:      drivers/scsi/snic
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <benve@cisco.com>
  M:    Govindarajulu Varadarajan <_govind@gmx.com>
 -M:    Parvi Kaustubhi <pkaustub@cisco.com>
  S:    Supported
  F:    drivers/net/ethernet/cisco/enic/
  
@@@ -4157,7 -4118,6 +4157,7 @@@ B:      https://github.com/ClangBuiltLinux/l
  C:    irc://chat.freenode.net/clangbuiltlinux
  S:    Supported
  K:    \b(?i:clang|llvm)\b
 +F:    Documentation/kbuild/llvm.rst
  
  CLEANCACHE API
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
@@@ -4463,7 -4423,7 +4463,7 @@@ F:      include/linux/cpuidle.
  CRAMFS FILESYSTEM
  M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Maintained
 -F:    Documentation/filesystems/cramfs.txt
 +F:    Documentation/filesystems/cramfs.rst
  F:    fs/cramfs/
  
  CREATIVE SB0540
@@@ -4514,7 -4474,7 +4514,7 @@@ L:      linux-media@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/platform/sunxi/sun6i-csi/
 -F:    Documentation/devicetree/bindings/media/sun6i-csi.txt
 +F:    Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml
  
  CW1200 WLAN driver
  M:    Solomon Peachy <pizza@shaftnet.org>
@@@ -4582,9 -4542,7 +4582,9 @@@ S:      Supporte
  F:    drivers/scsi/cxgbi/cxgb3i
  
  CXGB4 CRYPTO DRIVER (chcr)
 -M:    Atul Gupta <atul.gupta@chelsio.com>
 +M:    Ayush Sawal <ayush.sawal@chelsio.com>
 +M:    Vinay Kumar Yadav <vinay.yadav@chelsio.com>
 +M:    Rohit Maheshwari <rohitm@chelsio.com>
  L:    linux-crypto@vger.kernel.org
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4613,7 -4571,7 +4613,7 @@@ F:      drivers/infiniband/hw/cxgb4
  F:    include/uapi/rdma/cxgb4-abi.h
  
  CXGB4VF ETHERNET DRIVER (CXGB4VF)
 -M:    Casey Leedom <leedom@chelsio.com>
 +M:    Vishal Kulkarni <vishal@gmail.com>
  L:    netdev@vger.kernel.org
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4723,7 -4681,7 +4723,7 @@@ L:      dc395x@twibble.or
  W:    http://twibble.org/dist/dc395x/
  W:    http://lists.twibble.org/mailman/listinfo/dc395x/
  S:    Maintained
 -F:    Documentation/scsi/dc395x.txt
 +F:    Documentation/scsi/dc395x.rst
  F:    drivers/scsi/dc395x.*
  
  DCCP PROTOCOL
@@@ -4765,6 -4723,26 +4765,6 @@@ S:     Maintaine
  F:    drivers/media/platform/sunxi/sun8i-di/
  F:    Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
  
 -DELL SMBIOS DRIVER
 -M:    Pali Rohár <pali.rohar@gmail.com>
 -M:    Mario Limonciello <mario.limonciello@dell.com>
 -L:    platform-driver-x86@vger.kernel.org
 -S:    Maintained
 -F:    drivers/platform/x86/dell-smbios.*
 -
 -DELL SMBIOS SMM DRIVER
 -M:    Mario Limonciello <mario.limonciello@dell.com>
 -L:    platform-driver-x86@vger.kernel.org
 -S:    Maintained
 -F:    drivers/platform/x86/dell-smbios-smm.c
 -
 -DELL SMBIOS WMI DRIVER
 -M:    Mario Limonciello <mario.limonciello@dell.com>
 -L:    platform-driver-x86@vger.kernel.org
 -S:    Maintained
 -F:    drivers/platform/x86/dell-smbios-wmi.c
 -F:    tools/wmi/dell-smbios-example.c
 -
  DEFZA FDDI NETWORK DRIVER
  M:    "Maciej W. Rozycki" <macro@linux-mips.org>
  S:    Maintained
@@@ -4787,37 -4765,17 +4787,37 @@@ M:   Pali Rohár <pali.rohar@gmail.com
  S:    Maintained
  F:    drivers/platform/x86/dell-rbtn.*
  
 +DELL LAPTOP SMM DRIVER
 +M:    Pali Rohár <pali.rohar@gmail.com>
 +S:    Maintained
 +F:    drivers/hwmon/dell-smm-hwmon.c
 +F:    include/uapi/linux/i8k.h
 +
  DELL REMOTE BIOS UPDATE DRIVER
  M:    Stuart Hayes <stuart.w.hayes@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/dell_rbu.c
  
 -DELL LAPTOP SMM DRIVER
 +DELL SMBIOS DRIVER
  M:    Pali Rohár <pali.rohar@gmail.com>
 +M:    Mario Limonciello <mario.limonciello@dell.com>
 +L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/hwmon/dell-smm-hwmon.c
 -F:    include/uapi/linux/i8k.h
 +F:    drivers/platform/x86/dell-smbios.*
 +
 +DELL SMBIOS SMM DRIVER
 +M:    Mario Limonciello <mario.limonciello@dell.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/dell-smbios-smm.c
 +
 +DELL SMBIOS WMI DRIVER
 +M:    Mario Limonciello <mario.limonciello@dell.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/dell-smbios-wmi.c
 +F:    tools/wmi/dell-smbios-example.c
  
  DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
  M:    Stuart Hayes <stuart.w.hayes@gmail.com>
@@@ -4826,17 -4784,17 +4826,17 @@@ S:   Maintaine
  F:    Documentation/driver-api/dcdbas.rst
  F:    drivers/platform/x86/dcdbas.*
  
 +DELL WMI DESCRIPTOR DRIVER
 +M:    Mario Limonciello <mario.limonciello@dell.com>
 +S:    Maintained
 +F:    drivers/platform/x86/dell-wmi-descriptor.c
 +
  DELL WMI NOTIFICATIONS DRIVER
  M:    Matthew Garrett <mjg59@srcf.ucam.org>
  M:    Pali Rohár <pali.rohar@gmail.com>
  S:    Maintained
  F:    drivers/platform/x86/dell-wmi.c
  
 -DELL WMI DESCRIPTOR DRIVER
 -M:    Mario Limonciello <mario.limonciello@dell.com>
 -S:    Maintained
 -F:    drivers/platform/x86/dell-wmi-descriptor.c
 -
  DELTA ST MEDIA DRIVER
  M:    Hugues Fruchet <hugues.fruchet@st.com>
  L:    linux-media@vger.kernel.org
@@@ -4963,7 -4921,6 +4963,7 @@@ F:      drivers/leds/leds-da90??.
  F:    drivers/mfd/da903x.c
  F:    drivers/mfd/da90??-*.c
  F:    drivers/mfd/da91??-*.c
 +F:    drivers/pinctrl/pinctrl-da90??.c
  F:    drivers/power/supply/da9052-battery.c
  F:    drivers/power/supply/da91??-*.c
  F:    drivers/regulator/da903x.c
@@@ -5064,7 -5021,7 +5064,7 @@@ L:      dri-devel@lists.freedesktop.or
  L:    linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
  F:    drivers/dma-buf/
  F:    include/linux/dma-buf*
 -F:    include/linux/reservation.h
 +F:    include/linux/dma-resv.h
  F:    include/linux/*fence.h
  F:    Documentation/driver-api/dma-buf.rst
  K:    dma_(buf|fence|resv)
@@@ -5244,7 -5201,7 +5244,7 @@@ M:      Greg Kroah-Hartman <gregkh@linuxfoun
  R:    "Rafael J. Wysocki" <rafael@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
  S:    Supported
 -F:    Documentation/kobject.txt
 +F:    Documentation/core-api/kobject.rst
  F:    drivers/base/
  F:    fs/debugfs/
  F:    fs/sysfs/
@@@ -5305,12 -5262,6 +5305,12 @@@ T:    git git://anongit.freedesktop.org/dr
  S:    Maintained
  F:    drivers/gpu/drm/tve200/
  
 +DRM DRIVER FOR FEIXIN K101 IM2BA02 MIPI-DSI LCD PANELS
 +M:    Icenowy Zheng <icenowy@aosc.io>
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
 +F:    Documentation/devicetree/bindings/display/panel/feixin,k101-im2ba02.yaml
 +
  DRM DRIVER FOR FEIYANG FY07024DI26A30-D MIPI-DSI LCD PANELS
  M:    Jagan Teki <jagan@amarulasolutions.com>
  S:    Maintained
@@@ -5330,13 -5281,6 +5330,13 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tiny/ili9225.c
  F:    Documentation/devicetree/bindings/display/ilitek,ili9225.txt
  
 +DRM DRIVER FOR ILITEK ILI9486 PANELS
 +M:    Kamlesh Gurudasani <kamlesh.gurudasani@gmail.com>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/tiny/ili9486.c
 +F:    Documentation/devicetree/bindings/display/ilitek,ili9486.yaml
 +
  DRM DRIVER FOR HX8357D PANELS
  M:    Eric Anholt <eric@anholt.net>
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -5378,13 -5322,6 +5378,13 @@@ F:    drivers/gpu/drm/msm
  F:    include/uapi/drm/msm_drm.h
  F:    Documentation/devicetree/bindings/display/msm/
  
 +DRM DRIVER FOR NOVATEK NT35510 PANELS
 +M:    Linus Walleij <linus.walleij@linaro.org>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-novatek-nt35510.c
 +F:    Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml
 +
  DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
  M:    Ben Skeggs <bskeggs@redhat.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -5472,7 -5409,7 +5472,7 @@@ M:      David Lechner <david@lechnology.com
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
  F:    drivers/gpu/drm/tiny/st7735r.c
 -F:    Documentation/devicetree/bindings/display/sitronix,st7735r.txt
 +F:    Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
  
  DRM DRIVER FOR SONY ACX424AKP PANELS
  M:    Linus Walleij <linus.walleij@linaro.org>
@@@ -5552,7 -5489,6 +5552,7 @@@ F:      include/linux/vga
  DRM DRIVERS AND MISC GPU PATCHES
  M:    Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
  M:    Maxime Ripard <mripard@kernel.org>
 +M:    Thomas Zimmermann <tzimmermann@suse.de>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -5632,6 -5568,7 +5632,6 @@@ S:      Supporte
  F:    drivers/gpu/drm/fsl-dcu/
  F:    Documentation/devicetree/bindings/display/fsl,dcu.txt
  F:    Documentation/devicetree/bindings/display/fsl,tcon.txt
 -F:    Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR FREESCALE IMX
@@@ -5650,13 -5587,12 +5650,13 @@@ S:   Maintaine
  F:    drivers/gpu/drm/gma500/
  
  DRM DRIVERS FOR HISILICON
 -M:    Xinliang Liu <z.liuxinliang@hisilicon.com>
 +M:    Xinliang Liu <xinliang.liu@linaro.org>
  M:    Rongrong Zou <zourongrong@gmail.com>
 +R:    John Stultz <john.stultz@linaro.org>
  R:    Xinwei Kong <kong.kongxinwei@hisilicon.com>
  R:    Chen Feng <puck.chen@hisilicon.com>
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://github.com/xin3liang/linux.git
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
  F:    drivers/gpu/drm/hisilicon/
  F:    Documentation/devicetree/bindings/display/hisilicon/
@@@ -5671,7 -5607,7 +5671,7 @@@ F:      include/uapi/drm/lima_drm.
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR MEDIATEK
 -M:    CK Hu <ck.hu@mediatek.com>
 +M:    Chun-Kuang Hu <chunkuang.hu@kernel.org>
  M:    Philipp Zabel <p.zabel@pengutronix.de>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
@@@ -5731,7 -5667,7 +5731,7 @@@ L:      dri-devel@lists.freedesktop.or
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
  F:    drivers/gpu/drm/stm
 -F:    Documentation/devicetree/bindings/display/st,stm32-ltdc.txt
 +F:    Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml
  
  DRM DRIVERS FOR TI LCDC
  M:    Jyri Sarha <jsarha@ti.com>
@@@ -5748,17 -5684,6 +5748,17 @@@ S:    Maintaine
  F:    drivers/gpu/drm/omapdrm/
  F:    Documentation/devicetree/bindings/display/ti/
  
 +DRM DRIVERS FOR TI KEYSTONE
 +M:    Jyri Sarha <jsarha@ti.com>
 +M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Maintained
 +F:    drivers/gpu/drm/tidss/
 +F:    Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml
 +F:    Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml
 +F:    Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  DRM DRIVERS FOR V3D
  M:    Eric Anholt <eric@anholt.net>
  S:    Supported
@@@ -5785,7 -5710,7 +5785,7 @@@ L:      dri-devel@lists.freedesktop.or
  S:    Maintained
  F:    drivers/gpu/drm/etnaviv/
  F:    include/uapi/drm/etnaviv_drm.h
 -F:    Documentation/devicetree/bindings/display/etnaviv/
 +F:    Documentation/devicetree/bindings/gpu/vivante,gc.yaml
  
  DRM DRIVERS FOR ZTE ZX
  M:    Shawn Guo <shawnguo@kernel.org>
@@@ -6007,13 -5932,13 +6007,13 @@@ S:   Maintaine
  F:    drivers/media/dvb-frontends/ec100*
  
  ECRYPT FILE SYSTEM
 -M:    Tyler Hicks <tyhicks@canonical.com>
 +M:    Tyler Hicks <code@tyhicks.com>
  L:    ecryptfs@vger.kernel.org
  W:    http://ecryptfs.org
  W:    https://launchpad.net/ecryptfs
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
 -S:    Supported
 -F:    Documentation/filesystems/ecryptfs.txt
 +S:    Odd Fixes
 +F:    Documentation/filesystems/ecryptfs.rst
  F:    fs/ecryptfs/
  
  EDAC-AMD64
@@@ -6073,12 -5998,6 +6073,12 @@@ F:    Documentation/driver-api/edac.rs
  F:    drivers/edac/
  F:    include/linux/edac.h
  
 +EDAC-DMC520
 +M:    Lei Wang <lewan@microsoft.com>
 +L:    linux-edac@vger.kernel.org
 +S:    Supported
 +F:    drivers/edac/dmc520_edac.c
 +
  EDAC-E752X
  M:    Mark Gross <mark.gross@intel.com>
  L:    linux-edac@vger.kernel.org
@@@ -6278,6 -6197,7 +6278,6 @@@ S:      Supporte
  F:    drivers/scsi/be2iscsi/
  
  Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER (be2net)
 -M:    Sathya Perla <sathya.perla@broadcom.com>
  M:    Ajit Khaparde <ajit.khaparde@broadcom.com>
  M:    Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
  M:    Somnath Kotur <somnath.kotur@broadcom.com>
@@@ -6329,12 -6249,12 +6329,12 @@@ F:   drivers/video/fbdev/s1d13xxxfb.
  F:    include/video/s1d13xxxfb.h
  
  EROFS FILE SYSTEM
 -M:    Gao Xiang <gaoxiang25@huawei.com>
 +M:    Gao Xiang <xiang@kernel.org>
  M:    Chao Yu <yuchao0@huawei.com>
  L:    linux-erofs@lists.ozlabs.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
 -F:    Documentation/filesystems/erofs.txt
 +F:    Documentation/filesystems/erofs.rst
  F:    fs/erofs/
  F:    include/trace/events/erofs.h
  
@@@ -6386,17 -6306,16 +6386,17 @@@ F:   include/uapi/linux/mdio.
  F:    include/uapi/linux/mii.h
  
  EXFAT FILE SYSTEM
 -M:    Valdis Kletnieks <valdis.kletnieks@vt.edu>
 +M:    Namjae Jeon <namjae.jeon@samsung.com>
 +M:    Sungjong Seo <sj1557.seo@samsung.com>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
 -F:    drivers/staging/exfat/
 +F:    fs/exfat/
  
  EXT2 FILE SYSTEM
  M:    Jan Kara <jack@suse.com>
  L:    linux-ext4@vger.kernel.org
  S:    Maintained
 -F:    Documentation/filesystems/ext2.txt
 +F:    Documentation/filesystems/ext2.rst
  F:    fs/ext2/
  F:    include/linux/ext2*
  
@@@ -6424,6 -6343,7 +6424,6 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/admin-guide/efi-stub.rst
  F:    arch/*/kernel/efi.c
 -F:    arch/x86/boot/compressed/eboot.[ch]
  F:    arch/*/include/asm/efi.h
  F:    arch/x86/platform/efi/
  F:    drivers/firmware/efi/
@@@ -6469,7 -6389,7 +6469,7 @@@ L:      linux-f2fs-devel@lists.sourceforge.n
  W:    https://f2fs.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
  S:    Maintained
 -F:    Documentation/filesystems/f2fs.txt
 +F:    Documentation/filesystems/f2fs.rst
  F:    Documentation/ABI/testing/sysfs-fs-f2fs
  F:    fs/f2fs/
  F:    include/linux/f2fs_fs.h
@@@ -6939,13 -6859,6 +6939,13 @@@ S:    Maintaine
  F:    drivers/i2c/busses/i2c-fsi.c
  F:    Documentation/devicetree/bindings/i2c/i2c-fsi.txt
  
 +FSI-ATTACHED SPI DRIVER
 +M:    Eddie James <eajames@linux.ibm.com>
 +L:    linux-spi@vger.kernel.org
 +S:    Maintained
 +F:    drivers/spi/spi-fsi.c
 +F:    Documentation/devicetree/bindings/fsi/ibm,fsi2spi.yaml
 +
  FSNOTIFY: FILESYSTEM NOTIFICATION INFRASTRUCTURE
  M:    Jan Kara <jack@suse.cz>
  R:    Amir Goldstein <amir73il@gmail.com>
@@@ -7021,7 -6934,7 +7021,7 @@@ S:      Maintaine
  F:    scripts/gcc-plugins/
  F:    scripts/gcc-plugin.sh
  F:    scripts/Makefile.gcc-plugins
 -F:    Documentation/core-api/gcc-plugins.rst
 +F:    Documentation/kbuild/gcc-plugins.rst
  
  GASKET DRIVER FRAMEWORK
  M:    Rob Springer <rspringer@google.com>
@@@ -7134,7 -7047,7 +7134,7 @@@ L:      kvm@vger.kernel.or
  S:    Supported
  F:    drivers/uio/uio_pci_generic.c
  
 -GENERIC VDSO LIBRARY:
 +GENERIC VDSO LIBRARY
  M:    Andy Lutomirski <luto@kernel.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
  M:    Vincenzo Frascino <vincenzo.frascino@arm.com>
@@@ -7435,8 -7348,8 +7435,8 @@@ F:      drivers/media/usb/hackrf
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
  M:    Frank Seidel <frank@f-seidel.de>
  L:    platform-driver-x86@vger.kernel.org
 -W:    http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
  S:    Maintained
 +W:    http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
  F:    drivers/platform/x86/hdaps.c
  
  HARDWARE MONITORING
@@@ -7503,7 -7416,7 +7503,7 @@@ M:      Don Brace <don.brace@microsemi.com
  L:    esc.storagedev@microsemi.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
 -F:    Documentation/scsi/hpsa.txt
 +F:    Documentation/scsi/hpsa.rst
  F:    drivers/scsi/hpsa*.[ch]
  F:    include/linux/cciss*.h
  F:    include/uapi/linux/cciss*.h
@@@ -7518,13 -7431,13 +7518,13 @@@ F:   drivers/infiniband/hw/hfi
  HFS FILESYSTEM
  L:    linux-fsdevel@vger.kernel.org
  S:    Orphan
 -F:    Documentation/filesystems/hfs.txt
 +F:    Documentation/filesystems/hfs.rst
  F:    fs/hfs/
  
  HFSPLUS FILESYSTEM
  L:    linux-fsdevel@vger.kernel.org
  S:    Orphan
 -F:    Documentation/filesystems/hfsplus.txt
 +F:    Documentation/filesystems/hfsplus.rst
  F:    fs/hfsplus/
  
  HGA FRAMEBUFFER DRIVER
@@@ -7592,7 -7505,7 +7592,7 @@@ HIGHPOINT ROCKETRAID 3xxx RAID DRIVE
  M:    HighPoint Linux Team <linux@highpoint-tech.com>
  W:    http://www.highpoint-tech.com
  S:    Supported
 -F:    Documentation/scsi/hptiop.txt
 +F:    Documentation/scsi/hptiop.rst
  F:    drivers/scsi/hptiop.c
  
  HIPPI
@@@ -7604,12 -7517,6 +7604,12 @@@ F:    include/uapi/linux/if_hippi.
  F:    net/802/hippi.c
  F:    drivers/net/hippi/
  
 +HISILICON DMA DRIVER
 +M:    Zhou Wang <wangzhou1@hisilicon.com>
 +L:    dmaengine@vger.kernel.org
 +S:    Maintained
 +F:    drivers/dma/hisi_dma.c
 +
  HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
  M:    Zaibo Xu <xuzaibo@huawei.com>
  L:    linux-crypto@vger.kernel.org
@@@ -7667,8 -7574,7 +7667,8 @@@ F:      Documentation/admin-guide/perf/hisi-
  
  HISILICON ROCE DRIVER
  M:    Lijun Ou <oulijun@huawei.com>
 -M:    Wei Hu(Xavier) <xavier.huwei@huawei.com>
 +M:    Wei Hu(Xavier) <huwei87@hisilicon.com>
 +M:    Weihang Li <liweihang@huawei.com>
  L:    linux-rdma@vger.kernel.org
  S:    Maintained
  F:    drivers/infiniband/hw/hns/
@@@ -7831,7 -7737,7 +7831,7 @@@ Hyper-V CORE AND DRIVER
  M:    "K. Y. Srinivasan" <kys@microsoft.com>
  M:    Haiyang Zhang <haiyangz@microsoft.com>
  M:    Stephen Hemminger <sthemmin@microsoft.com>
 -M:    Sasha Levin <sashal@kernel.org>
 +M:    Wei Liu <wei.liu@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
  L:    linux-hyperv@vger.kernel.org
  S:    Supported
@@@ -7863,10 -7769,6 +7863,10 @@@ F:    Documentation/ABI/testing/debugfs-hy
  
  HYPERBUS SUPPORT
  M:    Vignesh Raghavendra <vigneshr@ti.com>
 +L:    linux-mtd@lists.infradead.org
 +Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/next
 +C:    irc://irc.oftc.net/mtd
  S:    Supported
  F:    drivers/mtd/hyperbus/
  F:    include/linux/mtd/hyperbus.h
@@@ -8043,7 -7945,6 +8043,7 @@@ L:      linux-ia64@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
  S:    Maintained
  F:    arch/ia64/
 +F:    Documentation/ia64/
  
  IBM Power 842 compression accelerator
  M:    Haren Myneni <haren@us.ibm.com>
@@@ -8183,15 -8084,15 +8183,15 @@@ F:   drivers/ide/ide-cd
  IDEAPAD LAPTOP EXTRAS DRIVER
  M:    Ike Panhc <ike.pan@canonical.com>
  L:    platform-driver-x86@vger.kernel.org
 -W:    http://launchpad.net/ideapad-laptop
  S:    Maintained
 +W:    http://launchpad.net/ideapad-laptop
  F:    drivers/platform/x86/ideapad-laptop.c
  
  IDEAPAD LAPTOP SLIDEBAR DRIVER
  M:    Andrey Moiseev <o2g.org.ru@gmail.com>
  L:    linux-input@vger.kernel.org
 -W:    https://github.com/o2genum/ideapad-slidebar
  S:    Maintained
 +W:    https://github.com/o2genum/ideapad-slidebar
  F:    drivers/input/misc/ideapad_slidebar.c
  
  IDT VersaClock 5 CLOCK DRIVER
@@@ -8407,7 -8308,7 +8407,7 @@@ M:      Jan Kara <jack@suse.cz
  R:    Amir Goldstein <amir73il@gmail.com>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
 -F:    Documentation/filesystems/inotify.txt
 +F:    Documentation/filesystems/inotify.rst
  F:    fs/notify/inotify/
  F:    include/linux/inotify.h
  F:    include/uapi/linux/inotify.h
@@@ -8491,7 -8392,7 +8491,7 @@@ M:      Joonas Lahtinen <joonas.lahtinen@lin
  M:    Rodrigo Vivi <rodrigo.vivi@intel.com>
  L:    intel-gfx@lists.freedesktop.org
  W:    https://01.org/linuxgraphics/
 -B:    https://01.org/linuxgraphics/documentation/how-report-bugs
 +B:    https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs
  C:    irc://chat.freenode.net/intel-gfx
  Q:    http://patchwork.freedesktop.org/project/intel-gfx/
  T:    git git://anongit.freedesktop.org/drm-intel
@@@ -8576,6 -8477,7 +8576,6 @@@ L:      dmaengine@vger.kernel.or
  S:    Supported
  F:    drivers/dma/idxd/*
  F:    include/uapi/linux/idxd.h
 -F:    include/linux/idxd.h
  
  INTEL IDLE DRIVER
  M:    Jacob Pan <jacob.jun.pan@linux.intel.com>
@@@ -8657,8 -8559,8 +8657,8 @@@ F:      samples/mei/
  INTEL MENLOW THERMAL DRIVER
  M:    Sujith Thomas <sujith.thomas@intel.com>
  L:    platform-driver-x86@vger.kernel.org
 -W:    https://01.org/linux-acpi
  S:    Supported
 +W:    https://01.org/linux-acpi
  F:    drivers/platform/x86/intel_menlow.c
  
  INTEL MIC DRIVERS (mic)
@@@ -8667,15 -8569,15 +8667,15 @@@ M:   Ashutosh Dixit <ashutosh.dixit@intel
  S:    Supported
  W:    https://github.com/sudeepdutt/mic
  W:    http://software.intel.com/en-us/mic-developer
 +F:    Documentation/misc-devices/mic/
 +F:    drivers/dma/mic_x100_dma.c
 +F:    drivers/dma/mic_x100_dma.h
 +F:    drivers/misc/mic/
  F:    include/linux/mic_bus.h
  F:    include/linux/scif.h
  F:    include/uapi/linux/mic_common.h
  F:    include/uapi/linux/mic_ioctl.h
  F:    include/uapi/linux/scif_ioctl.h
 -F:    drivers/misc/mic/
 -F:    drivers/dma/mic_x100_dma.c
 -F:    drivers/dma/mic_x100_dma.h
 -F:    Documentation/mic/
  
  INTEL PMC CORE DRIVER
  M:    Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
@@@ -8688,10 -8590,10 +8688,10 @@@ INTEL PMC/P-Unit IPC DRIVE
  M:    Zha Qipeng<qipeng.zha@intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/intel_pmc_ipc.c
 -F:    drivers/platform/x86/intel_punit_ipc.c
  F:    arch/x86/include/asm/intel_pmc_ipc.h
  F:    arch/x86/include/asm/intel_punit_ipc.h
 +F:    drivers/platform/x86/intel_pmc_ipc.c
 +F:    drivers/platform/x86/intel_punit_ipc.c
  
  INTEL PMIC GPIO DRIVERS
  M:    Andy Shevchenko <andy@kernel.org>
@@@ -8736,8 -8638,8 +8736,8 @@@ M:      Srinivas Pandruvada <srinivas.pandru
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/intel_speed_select_if/
 -F:    tools/power/x86/intel-speed-select/
  F:    include/uapi/linux/isst_if.h
 +F:    tools/power/x86/intel-speed-select/
  
  INTEL STRATIX10 FIRMWARE DRIVERS
  M:    Richard Gong <richard.gong@linux.intel.com>
@@@ -8782,7 -8684,7 +8782,7 @@@ M:      Emmanuel Grumbach <emmanuel.grumbach
  M:    Luca Coelho <luciano.coelho@intel.com>
  M:    Intel Linux Wireless <linuxwifi@intel.com>
  L:    linux-wireless@vger.kernel.org
 -W:    http://intellinuxwireless.org
 +W:    https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
  S:    Supported
  F:    drivers/net/wireless/intel/iwlwifi/
@@@ -9261,7 -9163,7 +9261,7 @@@ F:      virt/kvm/
  F:    tools/kvm/
  F:    tools/testing/selftests/kvm/
  
 -KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
 +KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
  M:    Marc Zyngier <maz@kernel.org>
  R:    James Morse <james.morse@arm.com>
  R:    Julien Thierry <julien.thierry.kdev@gmail.com>
@@@ -9270,6 -9172,9 +9270,6 @@@ L:      linux-arm-kernel@lists.infradead.or
  L:    kvmarm@lists.cs.columbia.edu
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
  S:    Maintained
 -F:    arch/arm/include/uapi/asm/kvm*
 -F:    arch/arm/include/asm/kvm*
 -F:    arch/arm/kvm/
  F:    arch/arm64/include/uapi/asm/kvm*
  F:    arch/arm64/include/asm/kvm*
  F:    arch/arm64/kvm/
@@@ -9304,7 -9209,6 +9304,7 @@@ L:      kvm@vger.kernel.or
  W:    http://www.ibm.com/developerworks/linux/linux390/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
  S:    Supported
 +F:    Documentation/virt/kvm/s390*
  F:    arch/s390/include/uapi/asm/kvm*
  F:    arch/s390/include/asm/gmap.h
  F:    arch/s390/include/asm/kvm*
@@@ -9371,10 -9275,10 +9371,10 @@@ L:   keyrings@vger.kernel.or
  S:    Supported
  F:    Documentation/security/keys/trusted-encrypted.rst
  F:    include/keys/trusted-type.h
 -F:    security/keys/trusted.c
 -F:    include/keys/trusted.h
 +F:    include/keys/trusted_tpm.h
 +F:    security/keys/trusted-keys/
  
 -KEYS/KEYRINGS:
 +KEYS/KEYRINGS
  M:    David Howells <dhowells@redhat.com>
  M:    Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
  L:    keyrings@vger.kernel.org
@@@ -9447,8 -9351,6 +9447,8 @@@ F:      include/net/l3mdev.
  L7 BPF FRAMEWORK
  M:    John Fastabend <john.fastabend@gmail.com>
  M:    Daniel Borkmann <daniel@iogearbox.net>
 +M:    Jakub Sitnicki <jakub@cloudflare.com>
 +M:    Lorenz Bauer <lmb@cloudflare.com>
  L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Maintained
@@@ -9456,7 -9358,6 +9456,7 @@@ F:      include/linux/skmsg.
  F:    net/core/skmsg.c
  F:    net/core/sock_map.c
  F:    net/ipv4/tcp_bpf.c
 +F:    net/ipv4/udp_bpf.c
  
  LANTIQ / INTEL Ethernet drivers
  M:    Hauke Mehrtens <hauke@hauke-m.de>
@@@ -9485,7 -9386,7 +9485,7 @@@ LASI 53c700 driver for PARIS
  M:    "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
 -F:    Documentation/scsi/53c700.txt
 +F:    Documentation/scsi/53c700.rst
  F:    drivers/scsi/53c700*
  
  LEAKING_ADDRESSES
@@@ -9692,17 -9593,16 +9692,16 @@@ F:   include/uapi/linux/lightnvm.
  
  LINUX FOR POWER MACINTOSH
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
- W:    http://www.penguinppc.org/
  L:    linuxppc-dev@lists.ozlabs.org
- S:    Maintained
+ S:    Odd Fixes
  F:    arch/powerpc/platforms/powermac/
  F:    drivers/macintosh/
  
  LINUX FOR POWERPC (32-BIT AND 64-BIT)
- M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
- M:    Paul Mackerras <paulus@samba.org>
  M:    Michael Ellerman <mpe@ellerman.id.au>
- W:    https://github.com/linuxppc/linux/wiki
+ R:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ R:    Paul Mackerras <paulus@samba.org>
+ W:    https://github.com/linuxppc/wiki/wiki
  L:    linuxppc-dev@lists.ozlabs.org
  Q:    http://patchwork.ozlabs.org/project/linuxppc-dev/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
@@@ -9719,6 -9619,8 +9718,8 @@@ F:      drivers/crypto/vmx
  F:    drivers/i2c/busses/i2c-opal.c
  F:    drivers/net/ethernet/ibm/ibmveth.*
  F:    drivers/net/ethernet/ibm/ibmvnic.*
+ F:    drivers/*/*/*pasemi*
+ F:    drivers/*/*pasemi*
  F:    drivers/pci/hotplug/pnv_php.c
  F:    drivers/pci/hotplug/rpa*
  F:    drivers/rtc/rtc-opal.c
@@@ -9735,51 -9637,31 +9736,31 @@@ N:   pserie
  LINUX FOR POWERPC EMBEDDED MPC5XXX
  M:    Anatolij Gustschin <agust@denx.de>
  L:    linuxppc-dev@lists.ozlabs.org
- T:    git git://git.denx.de/linux-denx-agust.git
- S:    Maintained
+ S:    Odd Fixes
  F:    arch/powerpc/platforms/512x/
  F:    arch/powerpc/platforms/52xx/
  
  LINUX FOR POWERPC EMBEDDED PPC4XX
- M:    Alistair Popple <alistair@popple.id.au>
- M:    Matt Porter <mporter@kernel.crashing.org>
- W:    http://www.penguinppc.org/
  L:    linuxppc-dev@lists.ozlabs.org
- S:    Maintained
+ S:    Orphan
  F:    arch/powerpc/platforms/40x/
  F:    arch/powerpc/platforms/44x/
  
  LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
  M:    Scott Wood <oss@buserror.net>
- M:    Kumar Gala <galak@kernel.crashing.org>
- W:    http://www.penguinppc.org/
  L:    linuxppc-dev@lists.ozlabs.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
- S:    Maintained
+ S:    Odd fixes
  F:    arch/powerpc/platforms/83xx/
  F:    arch/powerpc/platforms/85xx/
  F:    Documentation/devicetree/bindings/powerpc/fsl/
  
  LINUX FOR POWERPC EMBEDDED PPC8XX
- M:    Vitaly Bordug <vitb@kernel.crashing.org>
- W:    http://www.penguinppc.org/
+ M:    Christophe Leroy <christophe.leroy@c-s.fr>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    arch/powerpc/platforms/8xx/
  
- LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
- L:    linuxppc-dev@lists.ozlabs.org
- S:    Orphan
- F:    arch/powerpc/*/*virtex*
- F:    arch/powerpc/*/*/*virtex*
- 
- LINUX FOR POWERPC PA SEMI PWRFICIENT
- L:    linuxppc-dev@lists.ozlabs.org
- S:    Orphan
- F:    arch/powerpc/platforms/pasemi/
- F:    drivers/*/*pasemi*
- F:    drivers/*/*/*pasemi*
- 
  LINUX KERNEL DUMP TEST MODULE (LKDTM)
  M:    Kees Cook <keescook@chromium.org>
  S:    Maintained
@@@ -10115,7 -9997,6 +10096,7 @@@ F:    Documentation/devicetree/bindings/ph
  MARVELL CRYPTO DRIVER
  M:    Boris Brezillon <bbrezillon@kernel.org>
  M:    Arnaud Ebalard <arno@natisbad.org>
 +M:    Srujana Challa <schalla@marvell.com>
  F:    drivers/crypto/marvell/
  S:    Maintained
  L:    linux-crypto@vger.kernel.org
@@@ -10188,13 -10069,6 +10169,13 @@@ M: Nicolas Pitre <nico@fluxnic.net
  S:    Odd Fixes
  F:    drivers/mmc/host/mvsdio.*
  
 +MARVELL USB MDIO CONTROLLER DRIVER
 +M:    Tobias Waldekranz <tobias@waldekranz.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/phy/mdio-mvusb.c
 +F:    Documentation/devicetree/bindings/net/marvell,mvusb.yaml
 +
  MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER
  M:    Hu Ziji <huziji@marvell.com>
  L:    linux-mmc@vger.kernel.org
@@@ -10270,7 -10144,7 +10251,7 @@@ MAXBOTIX ULTRASONIC RANGER IIO DRIVE
  M:    Andreas Klinger <ak@it-klinger.de>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt
 +F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
  F:    drivers/iio/proximity/mb1232.c
  
  MAXIM MAX77650 PMIC MFD DRIVER
@@@ -10337,18 -10211,11 +10318,18 @@@ M:        Dan Murphy <dmurphy@ti.com
  M:    Sriram Dash <sriram.dash@samsung.com>
  L:    linux-can@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/can/m_can.txt
 +F:    Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
  F:    drivers/net/can/m_can/m_can.c
  F:    drivers/net/can/m_can/m_can.h
  F:    drivers/net/can/m_can/m_can_platform.c
  
 +MCP2221A MICROCHIP USB-HID TO I2C BRIDGE DRIVER
 +M:    Rishi Gupta <gupt21@gmail.com>
 +L:    linux-i2c@vger.kernel.org
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hid/hid-mcp2221.c
 +
  MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
  M:    Peter Rosin <peda@axentia.se>
  L:    linux-iio@vger.kernel.org
@@@ -10548,7 -10415,7 +10529,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
  F:    Documentation/devicetree/bindings/media/renesas,csi2.yaml
 -F:    Documentation/devicetree/bindings/media/renesas,vin.txt
 +F:    Documentation/devicetree/bindings/media/renesas,vin.yaml
  F:    drivers/media/platform/rcar-vin/
  
  MEDIA DRIVERS FOR RENESAS - VSP1
@@@ -10580,7 -10447,7 +10561,7 @@@ M:   Hugues Fruchet <hugues.fruchet@st.co
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.txt
 +F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
  F:    drivers/media/platform/stm32/stm32-dcmi.c
  
  MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
@@@ -10753,7 -10620,7 +10734,7 @@@ L:   megaraidlinux.pdl@broadcom.co
  L:    linux-scsi@vger.kernel.org
  W:    http://www.avagotech.com/support/
  S:    Maintained
 -F:    Documentation/scsi/megaraid.txt
 +F:    Documentation/scsi/megaraid.rst
  F:    drivers/scsi/megaraid.*
  F:    drivers/scsi/megaraid/
  
@@@ -11005,16 -10872,6 +10986,16 @@@ M: Vladimir Vid <vladimir.vid@sartura.h
  S:    Maintained
  F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
  
 +MHI BUS
 +M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 +M:    Hemant Kumar <hemantk@codeaurora.org>
 +L:    linux-arm-msm@vger.kernel.org
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
 +F:    Documentation/mhi/
 +F:    drivers/bus/mhi/
 +F:    include/linux/mhi.h
 +
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <monstr@monstr.eu>
  W:    http://www.monstr.eu/fdt/
@@@ -11068,7 -10925,6 +11049,7 @@@ F:   drivers/media/platform/atmel/atmel-i
  F:    drivers/media/platform/atmel/atmel-isc-base.c
  F:    drivers/media/platform/atmel/atmel-isc-regs.h
  F:    Documentation/devicetree/bindings/media/atmel-isc.txt
 +F:    include/linux/atmel-isc-media.h
  
  MICROCHIP ISI DRIVER
  M:    Eugen Hristev <eugen.hristev@microchip.com>
@@@ -11217,7 -11073,7 +11198,7 @@@ F:   drivers/scsi/smartpqi/Kconfi
  F:    drivers/scsi/smartpqi/Makefile
  F:    include/linux/cciss*.h
  F:    include/uapi/linux/cciss*.h
 -F:    Documentation/scsi/smartpqi.txt
 +F:    Documentation/scsi/smartpqi.rst
  
  MICROSEMI ETHERNET SWITCH DRIVER
  M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
@@@ -11239,12 -11095,14 +11220,12 @@@ S:        Maintaine
  F:    drivers/usb/image/microtek.*
  
  MIPS
 -M:    Ralf Baechle <ralf@linux-mips.org>
 -M:    Paul Burton <paulburton@kernel.org>
 +M:    Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  L:    linux-mips@vger.kernel.org
  W:    http://www.linux-mips.org/
 -T:    git git://git.linux-mips.org/pub/scm/ralf/linux.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
 -Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
 -S:    Supported
 +Q:    https://patchwork.kernel.org/project/linux-mips/list/
 +S:    Maintained
  F:    Documentation/devicetree/bindings/mips/
  F:    Documentation/mips/
  F:    arch/mips/
@@@ -11294,7 -11152,6 +11275,7 @@@ S:   Maintaine
  F:    arch/mips/loongson64/
  F:    arch/mips/include/asm/mach-loongson64/
  F:    drivers/platform/mips/cpu_hwmon.c
 +F:    drivers/irqchip/irq-loongson*
  F:    drivers/*/*loongson3*
  F:    drivers/*/*/*loongson3*
  
@@@ -11383,8 -11240,7 +11364,8 @@@ F:   drivers/tty/mxser.
  MONOLITHIC POWER SYSTEM PMIC DRIVER
  M:    Saravanan Sekar <sravanhome@gmail.com>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/regulator/mpq7920.yaml
 +F:    Documentation/devicetree/bindings/regulator/mps,mp*.yaml
 +F:    drivers/regulator/mp5416.c
  F:    drivers/regulator/mpq7920.c
  F:    drivers/regulator/mpq7920.h
  
@@@ -11578,7 -11434,6 +11559,7 @@@ L:   linux-mtd@lists.infradead.or
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next
 +C:    irc://irc.oftc.net/mtd
  S:    Maintained
  F:    drivers/mtd/nand/
  F:    include/linux/mtd/*nand*.h
@@@ -11599,7 -11454,7 +11580,7 @@@ M:   Finn Thain <fthain@telegraphics.com.
  M:    Michael Schmitz <schmitzmic@gmail.com>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
 -F:    Documentation/scsi/g_NCR5380.txt
 +F:    Documentation/scsi/g_NCR5380.rst
  F:    drivers/scsi/NCR5380.*
  F:    drivers/scsi/arm/cumana_1.c
  F:    drivers/scsi/arm/oak.c
@@@ -11610,7 -11465,7 +11591,7 @@@ F:   drivers/scsi/mac_scsi.
  F:    drivers/scsi/sun3_scsi.*
  F:    drivers/scsi/sun3_scsi_vme.c
  
 -NCSI LIBRARY:
 +NCSI LIBRARY
  M:    Samuel Mendoza-Jonas <sam@mendozajonas.com>
  S:    Maintained
  F:    net/ncsi/
@@@ -11829,7 -11684,6 +11810,7 @@@ W:   https://github.com/multipath-tcp/mpt
  B:    https://github.com/multipath-tcp/mptcp_net-next/issues
  S:    Maintained
  F:    include/net/mptcp.h
 +F:    include/uapi/linux/mptcp.h
  F:    net/mptcp/
  F:    tools/testing/selftests/net/mptcp/
  
@@@ -11918,7 -11772,7 +11899,7 @@@ W:   https://nilfs.sourceforge.io
  W:    https://nilfs.osdn.jp/
  T:    git git://github.com/konis/nilfs2.git
  S:    Supported
 -F:    Documentation/filesystems/nilfs2.txt
 +F:    Documentation/filesystems/nilfs2.rst
  F:    fs/nilfs2/
  F:    include/trace/events/nilfs2.h
  F:    include/uapi/linux/nilfs2_api.h
@@@ -11928,7 -11782,7 +11909,7 @@@ NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/C
  M:    YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
  W:    http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
  S:    Maintained
 -F:    Documentation/scsi/NinjaSCSI.txt
 +F:    Documentation/scsi/NinjaSCSI.rst
  F:    drivers/scsi/pcmcia/nsp_*
  
  NINJA SCSI-32Bi/UDE PCI/CARDBUS SCSI HOST ADAPTER DRIVER
@@@ -11936,7 -11790,7 +11917,7 @@@ M:   GOTO Masanori <gotom@debian.or.jp
  M:    YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
  W:    http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
  S:    Maintained
 -F:    Documentation/scsi/NinjaSCSI.txt
 +F:    Documentation/scsi/NinjaSCSI.rst
  F:    drivers/scsi/nsp32*
  
  NIOS2 ARCHITECTURE
@@@ -11988,7 -11842,6 +11969,7 @@@ F:   scripts/nsdep
  F:    Documentation/core-api/symbol-namespaces.rst
  
  NTB AMD DRIVER
 +M:    Sanjay R Mehta <sanju.mehta@amd.com>
  M:    Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
  L:    linux-ntb@googlegroups.com
  S:    Supported
@@@ -12028,7 -11881,7 +12009,7 @@@ L:   linux-ntfs-dev@lists.sourceforge.ne
  W:    http://www.tuxera.com/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
  S:    Supported
 -F:    Documentation/filesystems/ntfs.txt
 +F:    Documentation/filesystems/ntfs.rst
  F:    fs/ntfs/
  
  NUBUS SUBSYSTEM
@@@ -12374,7 -12227,7 +12355,7 @@@ OMFS FILESYSTE
  M:    Bob Copeland <me@bobcopeland.com>
  L:    linux-karma-devel@lists.sourceforge.net
  S:    Maintained
 -F:    Documentation/filesystems/omfs.txt
 +F:    Documentation/filesystems/omfs.rst
  F:    fs/omfs/
  
  OMNIKEY CARDMAN 4000 DRIVER
@@@ -12546,6 -12399,7 +12527,6 @@@ F:   Documentation/ABI/testing/sysfs-firm
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
  M:    Rob Herring <robh+dt@kernel.org>
 -M:    Mark Rutland <mark.rutland@arm.com>
  L:    devicetree@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  Q:    http://patchwork.ozlabs.org/project/devicetree-bindings/list/
@@@ -12622,8 -12476,8 +12603,8 @@@ M:   Joseph Qi <joseph.qi@linux.alibaba.c
  L:    ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
  W:    http://ocfs2.wiki.kernel.org
  S:    Supported
 -F:    Documentation/filesystems/ocfs2.txt
 -F:    Documentation/filesystems/dlmfs.txt
 +F:    Documentation/filesystems/ocfs2.rst
 +F:    Documentation/filesystems/dlmfs.rst
  F:    fs/ocfs2/
  
  ORANGEFS FILESYSTEM
@@@ -12633,7 -12487,7 +12614,7 @@@ L:   devel@lists.orangefs.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
  S:    Supported
  F:    fs/orangefs/
 -F:    Documentation/filesystems/orangefs.txt
 +F:    Documentation/filesystems/orangefs.rst
  
  ORINOCO DRIVER
  L:    linux-wireless@vger.kernel.org
@@@ -12667,16 -12521,6 +12648,6 @@@ W:  http://wireless.kernel.org/en/users/
  S:    Maintained
  F:    drivers/net/wireless/intersil/p54/
  
- PA SEMI ETHERNET DRIVER
- L:    netdev@vger.kernel.org
- S:    Orphan
- F:    drivers/net/ethernet/pasemi/*
- 
- PA SEMI SMBUS DRIVER
- L:    linux-i2c@vger.kernel.org
- S:    Orphan
- F:    drivers/i2c/busses/i2c-pasemi.c
- 
  PACKING
  M:    Vladimir Oltean <olteanv@gmail.com>
  L:    netdev@vger.kernel.org
@@@ -12866,8 -12710,8 +12837,8 @@@ PCI DRIVER FOR CADENCE PCIE I
  M:    Tom Joseph <tjoseph@cadence.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/cdns,*.txt
 -F:    drivers/pci/controller/pcie-cadence*
 +F:    Documentation/devicetree/bindings/pci/cdns,*
 +F:    drivers/pci/controller/cadence/
  
  PCI DRIVER FOR FREESCALE LAYERSCAPE
  M:    Minghuan Lian <minghuan.Lian@nxp.com>
@@@ -12879,14 -12723,6 +12850,14 @@@ L: linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    drivers/pci/controller/dwc/*layerscape*
  
 +PCI DRIVER FOR NXP LAYERSCAPE GEN4 CONTROLLER
 +M:    Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
 +F:    drivers/pci/controller/mobibeil/pcie-layerscape-gen4.c
 +
  PCI DRIVER FOR GENERIC OF HOSTS
  M:    Will Deacon <will@kernel.org>
  L:    linux-pci@vger.kernel.org
@@@ -12929,7 -12765,7 +12900,7 @@@ M:   Hou Zhiqiang <Zhiqiang.Hou@nxp.com
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
 -F:    drivers/pci/controller/pcie-mobiveil.c
 +F:    drivers/pci/controller/mobiveil/pcie-mobiveil*
  
  PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
  M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
@@@ -13088,6 -12924,7 +13059,6 @@@ M:   Robert Richter <rrichter@marvell.com
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
 -F:    Documentation/devicetree/bindings/pci/pci-thunder-*
  F:    drivers/pci/controller/pci-thunder-*
  
  PCIE DRIVER FOR HISILICON
@@@ -13294,7 -13131,6 +13265,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
  F:    samples/pidfd/
  F:    tools/testing/selftests/pidfd/
 +F:    tools/testing/selftests/pid_namespace/
  F:    tools/testing/selftests/clone3/
  K:    (?i)pidfd
  K:    (?i)clone3
@@@ -13303,13 -13139,21 +13274,13 @@@ K:        \b(clone_args|kernel_clone_args)\
  PIN CONTROL SUBSYSTEM
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-gpio@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
  F:    Documentation/devicetree/bindings/pinctrl/
  F:    Documentation/driver-api/pinctl.rst
  F:    drivers/pinctrl/
  F:    include/linux/pinctrl/
  
 -PIN CONTROLLER - MICROCHIP AT91
 -M:    Ludovic Desroches <ludovic.desroches@microchip.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -L:    linux-gpio@vger.kernel.org
 -S:    Supported
 -F:    drivers/pinctrl/pinctrl-at91*
 -F:    drivers/gpio/gpio-sama5d2-piobu.c
 -
  PIN CONTROLLER - FREESCALE
  M:    Dong Aisheng <aisheng.dong@nxp.com>
  M:    Fabio Estevam <festevam@gmail.com>
@@@ -13318,14 -13162,14 +13289,14 @@@ M:        Stefan Agner <stefan@agner.ch
  R:    Pengutronix Kernel Team <kernel@pengutronix.de>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
 -F:    drivers/pinctrl/freescale/
  F:    Documentation/devicetree/bindings/pinctrl/fsl,*
 +F:    drivers/pinctrl/freescale/
  
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
  M:    Andy Shevchenko <andy@kernel.org>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  F:    drivers/pinctrl/intel/
  
  PIN CONTROLLER - MEDIATEK
@@@ -13336,26 -13180,18 +13307,26 @@@ F:        Documentation/devicetree/bindings/pi
  F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt
  F:    drivers/pinctrl/mediatek/
  
 +PIN CONTROLLER - MICROCHIP AT91
 +M:    Ludovic Desroches <ludovic.desroches@microchip.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-gpio@vger.kernel.org
 +S:    Supported
 +F:    drivers/gpio/gpio-sama5d2-piobu.c
 +F:    drivers/pinctrl/pinctrl-at91*
 +
  PIN CONTROLLER - QUALCOMM
  M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 -S:    Maintained
  L:    linux-arm-msm@vger.kernel.org
 +S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/qcom,*.txt
  F:    drivers/pinctrl/qcom/
  
  PIN CONTROLLER - RENESAS
  M:    Geert Uytterhoeven <geert+renesas@glider.be>
  L:    linux-renesas-soc@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
  F:    drivers/pinctrl/pinctrl-rz*
  F:    drivers/pinctrl/sh-pfc/
  
@@@ -13365,12 -13201,12 +13336,12 @@@ M:        Krzysztof Kozlowski <krzk@kernel.org
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 -Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
 +Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
 +F:    Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
  F:    drivers/pinctrl/samsung/
  F:    include/dt-bindings/pinctrl/samsung.h
 -F:    Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
  
  PIN CONTROLLER - SINGLE
  M:    Tony Lindgren <tony@atomide.com>
@@@ -13383,8 -13219,8 +13354,8 @@@ F:   drivers/pinctrl/pinctrl-single.
  PIN CONTROLLER - ST SPEAR
  M:    Viresh Kumar <vireshk@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.st.com/spear
  S:    Maintained
 +W:    http://www.st.com/spear
  F:    drivers/pinctrl/spear/
  
  PISTACHIO SOC SUPPORT
@@@ -13484,9 -13320,7 +13455,9 @@@ F:   Documentation/devicetree/bindings/ii
  
  PNP SUPPORT
  M:    "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 +L:    linux-acpi@vger.kernel.org
  S:    Maintained
 +F:    include/linux/pnp.h
  F:    drivers/pnp/
  
  POSIX CLOCKS and TIMERS
@@@ -13606,7 -13440,7 +13577,7 @@@ S:   Maintaine
  F:    fs/proc/
  F:    include/linux/proc_fs.h
  F:    tools/testing/selftests/proc/
 -F:    Documentation/filesystems/proc.txt
 +F:    Documentation/filesystems/proc.rst
  
  PROC SYSCTL
  M:    Luis Chamberlain <mcgrof@kernel.org>
@@@ -13649,19 -13483,13 +13620,19 @@@ L:        linuxppc-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/block/ps3vram.c
  
 -PSAMPLE PACKET SAMPLING SUPPORT:
 +PSAMPLE PACKET SAMPLING SUPPORT
  M:    Yotam Gigi <yotam.gi@gmail.com>
  S:    Maintained
  F:    net/psample
  F:    include/net/psample.h
  F:    include/uapi/linux/psample.h
  
 +PRESSURE STALL INFORMATION (PSI)
 +M:    Johannes Weiner <hannes@cmpxchg.org>
 +S:    Maintained
 +F:    kernel/sched/psi.c
 +F:    include/linux/psi*
 +
  PSTORE FILESYSTEM
  M:    Kees Cook <keescook@chromium.org>
  M:    Anton Vorontsov <anton@enomsg.org>
@@@ -13806,12 -13634,6 +13777,12 @@@ L: alsa-devel@alsa-project.org (moderat
  S:    Supported
  F:    sound/soc/qcom/
  
 +QCOM IPA DRIVER
 +M:    Alex Elder <elder@kernel.org>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ipa/
 +
  QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
  M:    Gabriel Somlo <somlo@cmu.edu>
  M:    "Michael S. Tsirkin" <mst@redhat.com>
@@@ -14047,7 -13869,6 +14018,7 @@@ L:   linux-arm-msm@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/platform/qcom/venus/
 +F:    Documentation/devicetree/bindings/media/*venus*
  
  QUALCOMM WCN36XX WIRELESS DRIVER
  M:    Kalle Valo <kvalo@codeaurora.org>
@@@ -14223,7 -14044,6 +14194,7 @@@ S:   Supporte
  F:    arch/x86/kernel/cpu/resctrl/
  F:    arch/x86/include/asm/resctrl_sched.h
  F:    Documentation/x86/resctrl*
 +F:    tools/testing/selftests/resctrl/
  
  READ-COPY UPDATE (RCU)
  M:    "Paul E. McKenney" <paulmck@kernel.org>
@@@ -14379,7 -14199,7 +14350,7 @@@ F:   include/dt-bindings/reset
  F:    include/linux/reset.h
  F:    include/linux/reset/
  F:    include/linux/reset-controller.h
 -K:      \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
 +K:    \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
  
  RESTARTABLE SEQUENCES SUPPORT
  M:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@@ -14463,12 -14283,9 +14434,12 @@@ F: Documentation/devicetree/bindings/me
  
  HANTRO VPU CODEC DRIVER
  M:    Ezequiel Garcia <ezequiel@collabora.com>
 +M:    Philipp Zabel <p.zabel@pengutronix.de>
  L:    linux-media@vger.kernel.org
 +L:    linux-rockchip@lists.infradead.org
  S:    Maintained
  F:    drivers/staging/media/hantro/
 +F:    Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
  F:    Documentation/devicetree/bindings/media/rockchip-vpu.txt
  
  ROCKER DRIVER
@@@ -14515,14 -14332,6 +14486,14 @@@ F: include/net/rose.
  F:    include/uapi/linux/rose.h
  F:    net/rose/
  
 +ROTATION DRIVER FOR ALLWINNER A83T
 +M:    Jernej Skrabec <jernej.skrabec@siol.net>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/platform/sunxi/sun8i-rotate/
 +F:    Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
 +
  RTL2830 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -14623,7 -14432,7 +14594,7 @@@ F:   Documentation/s390
  F:    Documentation/driver-api/s390-drivers.rst
  
  S390 COMMON I/O LAYER
 -M:    Sebastian Ott <sebott@linux.ibm.com>
 +M:    Vineeth Vijayan <vneethv@linux.ibm.com>
  M:    Peter Oberparleiter <oberpar@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -14665,7 -14474,7 +14636,7 @@@ S:   Supporte
  F:    drivers/s390/net/
  
  S390 PCI SUBSYSTEM
 -M:    Sebastian Ott <sebott@linux.ibm.com>
 +M:    Niklas Schnelle <schnelle@linux.ibm.com>
  M:    Gerald Schaefer <gerald.schaefer@de.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -14744,10 -14553,10 +14715,10 @@@ F:        drivers/media/pci/saa7146
  F:    include/media/drv-intf/saa7146*
  
  SAFESETID SECURITY MODULE
 -M:     Micah Morton <mortonm@chromium.org>
 -S:     Supported
 -F:     security/safesetid/
 -F:     Documentation/admin-guide/LSM/SafeSetID.rst
 +M:    Micah Morton <mortonm@chromium.org>
 +S:    Supported
 +F:    security/safesetid/
 +F:    Documentation/admin-guide/LSM/SafeSetID.rst
  
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Krzysztof Kozlowski <krzk@kernel.org>
@@@ -14959,7 -14768,7 +14930,7 @@@ M:   Doug Gilbert <dgilbert@interlog.com
  L:    linux-scsi@vger.kernel.org
  W:    http://sg.danny.cz/sg
  S:    Maintained
 -F:    Documentation/scsi/scsi-generic.txt
 +F:    Documentation/scsi/scsi-generic.rst
  F:    drivers/scsi/sg.c
  F:    include/scsi/sg.h
  
@@@ -14979,7 -14788,7 +14950,7 @@@ SCSI TAPE DRIVE
  M:    Kai Mäkisara <Kai.Makisara@kolumbus.fi>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
 -F:    Documentation/scsi/st.txt
 +F:    Documentation/scsi/st.rst
  F:    drivers/scsi/st.*
  F:    drivers/scsi/st_*.h
  
@@@ -15136,7 -14945,7 +15107,7 @@@ X:   security/selinux
  
  SELINUX SECURITY MODULE
  M:    Paul Moore <paul@paul-moore.com>
 -M:    Stephen Smalley <sds@tycho.nsa.gov>
 +M:    Stephen Smalley <stephen.smalley.work@gmail.com>
  M:    Eric Paris <eparis@parisplace.org>
  L:    selinux@vger.kernel.org
  W:    https://selinuxproject.org
@@@ -15148,7 -14957,6 +15119,7 @@@ F:   security/selinux
  F:    scripts/selinux/
  F:    Documentation/admin-guide/LSM/SELinux.rst
  F:    Documentation/ABI/obsolete/sysfs-selinux-disable
 +F:    Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
  
  SENSABLE PHANTOM
  M:    Jiri Slaby <jirislaby@gmail.com>
@@@ -15166,7 -14974,7 +15137,7 @@@ SERIAL DEVICE BU
  M:    Rob Herring <robh@kernel.org>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/serial/slave-device.txt
 +F:    Documentation/devicetree/bindings/serial/serial.yaml
  F:    drivers/tty/serdev/
  F:    include/linux/serdev.h
  
@@@ -15206,6 -15014,14 +15177,6 @@@ M:  Dimitri Sivanich <sivanich@sgi.com
  S:    Maintained
  F:    drivers/misc/sgi-gru/
  
 -SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER
 -M:    Pat Gefre <pfg@sgi.com>
 -L:    linux-ia64@vger.kernel.org
 -S:    Supported
 -F:    Documentation/ia64/serial.rst
 -F:    drivers/tty/serial/ioc?_serial.c
 -F:    include/linux/ioc?.h
 -
  SGI XP/XPC/XPNET DRIVER
  M:    Cliff Whickman <cpw@sgi.com>
  M:    Robin Holt <robinmholt@gmail.com>
@@@ -15220,14 -15036,6 +15191,14 @@@ W: http://www.ibm.com/developerworks/li
  S:    Supported
  F:    net/smc/
  
 +SHARP GP2AP002A00F/GP2AP002S00F SENSOR DRIVER
 +M:    Linus Walleij <linus.walleij@linaro.org>
 +L:    linux-iio@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
 +S:    Maintained
 +F:    drivers/iio/light/gp2ap002.c
 +F:    Documentation/devicetree/bindings/iio/light/sharp,gp2ap002.yaml
 +
  SHARP RJ54N1CB0C SENSOR DRIVER
  M:    Jacopo Mondi <jacopo@jmondi.org>
  L:    linux-media@vger.kernel.org
@@@ -15494,10 -15302,11 +15465,10 @@@ S:        Odd Fixe
  F:    drivers/net/ethernet/smsc/smc91x.*
  
  SMIA AND SMIA++ IMAGE SENSOR DRIVER
 -M:    Sakari Ailus <sakari.ailus@iki.fi>
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/i2c/smiapp/
 -F:    include/media/i2c/smiapp.h
  F:    drivers/media/i2c/smiapp-pll.c
  F:    drivers/media/i2c/smiapp-pll.h
  F:    include/uapi/linux/smiapp.h
@@@ -15582,9 -15391,11 +15553,9 @@@ F:  drivers/infiniband/sw/siw
  F:    include/uapi/rdma/siw-abi.h
  
  SOFT-ROCE DRIVER (rxe)
 -M:    Moni Shoua <monis@mellanox.com>
 +M:    Zhu Yanjun <yanjunz@mellanox.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
 -W:    https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home
 -Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  F:    drivers/infiniband/sw/rxe/
  F:    include/uapi/rdma/rdma_user_rxe.h
  
@@@ -15676,14 -15487,6 +15647,14 @@@ S: Maintaine
  F:    drivers/media/i2c/imx214.c
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx214.txt
  
 +SONY IMX219 SENSOR DRIVER
 +M:    Dave Stevenson <dave.stevenson@raspberrypi.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/imx219.c
 +F:    Documentation/devicetree/bindings/media/i2c/imx219.yaml
 +
  SONY IMX258 SENSOR DRIVER
  M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
@@@ -15734,8 -15537,8 +15705,8 @@@ F:   include/linux/memstick.
  SONY VAIO CONTROL DEVICE DRIVER
  M:    Mattia Dongili <malattia@linux.it>
  L:    platform-driver-x86@vger.kernel.org
 -W:    http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
  S:    Maintained
 +W:    http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
  F:    Documentation/admin-guide/laptops/sony-laptop.rst
  F:    drivers/char/sonypi.c
  F:    drivers/platform/x86/sony-laptop.c
@@@ -15785,17 -15588,6 +15756,17 @@@ F: sound/soc
  F:    include/dt-bindings/sound/
  F:    include/sound/soc*
  
 +SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
 +M:    Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
 +M:    Liam Girdwood <lgirdwood@gmail.com>
 +M:    Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
 +M:    Kai Vehmanen <kai.vehmanen@linux.intel.com>
 +M:    Daniel Baluta <daniel.baluta@nxp.com>
 +L:    sound-open-firmware@alsa-project.org (moderated for non-subscribers)
 +W:    https://github.com/thesofproject/linux/
 +S:    Supported
 +F:    sound/soc/sof/
 +
  SOUNDWIRE SUBSYSTEM
  M:    Vinod Koul <vkoul@kernel.org>
  M:    Sanyog Kale <sanyog.r.kale@intel.com>
@@@ -15870,7 -15662,6 +15841,7 @@@ L:   linux-mtd@lists.infradead.or
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/next
 +C:    irc://irc.oftc.net/mtd
  S:    Maintained
  F:    drivers/mtd/spi-nor/
  F:    include/linux/mtd/spi-nor.h
@@@ -15918,7 -15709,7 +15889,7 @@@ L:   squashfs-devel@lists.sourceforge.ne
  W:    http://squashfs.org.uk
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git
  S:    Maintained
 -F:    Documentation/filesystems/squashfs.txt
 +F:    Documentation/filesystems/squashfs.rst
  F:    fs/squashfs/
  
  SRM (Alpha) environment access
@@@ -16103,7 -15894,8 +16074,7 @@@ F:   drivers/*/stm32-*timer
  F:    drivers/pwm/pwm-stm32*
  F:    include/linux/*/stm32-*tim*
  F:    Documentation/ABI/testing/*timer-stm32
 -F:    Documentation/devicetree/bindings/*/stm32-*timer*
 -F:    Documentation/devicetree/bindings/pwm/pwm-stm32*
 +F:    Documentation/devicetree/bindings/*/*stm32-*timer*
  
  STMMAC ETHERNET DRIVER
  M:    Giuseppe Cavallaro <peppe.cavallaro@st.com>
@@@ -16261,8 -16053,6 +16232,8 @@@ SYNOPSYS DESIGNWARE 8250 UART DRIVE
  R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  S:    Maintained
  F:    drivers/tty/serial/8250/8250_dw.c
 +F:    drivers/tty/serial/8250/8250_dwlib.*
 +F:    drivers/tty/serial/8250/8250_lpss.c
  
  SYNOPSYS DESIGNWARE APB GPIO DRIVER
  M:    Hoan Tran <hoan@os.amperecomputing.com>
@@@ -16293,13 -16083,6 +16264,13 @@@ L: netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/synopsys/
  
 +SYNOPSYS DESIGNWARE ETHERNET XPCS DRIVER
 +M:    Jose Abreu <Jose.Abreu@synopsys.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/phy/mdio-xpcs.c
 +F:    include/linux/mdio-xpcs.h
 +
  SYNOPSYS DESIGNWARE I2C DRIVER
  M:    Jarkko Nikula <jarkko.nikula@linux.intel.com>
  R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@@ -16369,7 -16152,7 +16340,7 @@@ F:   drivers/platform/x86/system76_acpi.
  SYSV FILESYSTEM
  M:    Christoph Hellwig <hch@infradead.org>
  S:    Maintained
 -F:    Documentation/filesystems/sysv-fs.txt
 +F:    Documentation/filesystems/sysv-fs.rst
  F:    fs/sysv/
  F:    include/linux/sysv_fs.h
  
@@@ -16728,10 -16511,10 +16699,10 @@@ THINKPAD ACPI EXTRAS DRIVE
  M:    Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
  L:    ibm-acpi-devel@lists.sourceforge.net
  L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
  W:    http://ibm-acpi.sourceforge.net
  W:    http://thinkwiki.org/wiki/Ibm-acpi
  T:    git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
 -S:    Maintained
  F:    drivers/platform/x86/thinkpad_acpi.c
  
  THUNDERBOLT DRIVER
@@@ -16740,8 -16523,8 +16711,8 @@@ M:   Michael Jamet <michael.jamet@intel.c
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
  M:    Yehezkel Bernat <YehezkelShB@gmail.com>
  L:    linux-usb@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
  F:    Documentation/admin-guide/thunderbolt.rst
  F:    drivers/thunderbolt/
  F:    include/linux/thunderbolt.h
@@@ -16935,12 -16718,12 +16906,12 @@@ F:        sound/soc/codecs/twl4030
  TI VPE/CAL DRIVERS
  M:    Benoit Parrot <bparrot@ti.com>
  L:    linux-media@vger.kernel.org
 +S:    Maintained
  W:    http://linuxtv.org/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -S:    Maintained
 -F:    drivers/media/platform/ti-vpe/
 +F:    Documentation/devicetree/bindings/media/ti,cal.yaml
  F:    Documentation/devicetree/bindings/media/ti,vpe.yaml
 -      Documentation/devicetree/bindings/media/ti,cal.yaml
 +F:    drivers/media/platform/ti-vpe/
  
  TI WILINK WIRELESS DRIVERS
  L:    linux-wireless@vger.kernel.org
@@@ -17227,18 -17010,6 +17198,18 @@@ W: http://linuxtv.or
  S:    Maintained
  F:    drivers/media/pci/tw686x/
  
 +UACCE ACCELERATOR FRAMEWORK
 +M:    Zhangfei Gao <zhangfei.gao@linaro.org>
 +M:    Zhou Wang <wangzhou1@hisilicon.com>
 +L:    linux-accelerators@lists.ozlabs.org
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-driver-uacce
 +F:    Documentation/misc-devices/uacce.rst
 +F:    drivers/misc/uacce/
 +F:    include/linux/uacce.h
 +F:    include/uapi/misc/uacce/
 +
  UBI FILE SYSTEM (UBIFS)
  M:    Richard Weinberger <richard@nod.at>
  L:    linux-mtd@lists.infradead.org
@@@ -17246,7 -17017,7 +17217,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git fixes
  W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
  S:    Supported
 -F:    Documentation/filesystems/ubifs.txt
 +F:    Documentation/filesystems/ubifs.rst
  F:    fs/ubifs/
  
  UCLINUX (M68KNOMMU AND COLDFIRE)
@@@ -17265,7 -17036,7 +17236,7 @@@ F:   arch/m68k/include/asm/*_no.
  UDF FILESYSTEM
  M:    Jan Kara <jack@suse.com>
  S:    Maintained
 -F:    Documentation/filesystems/udf.txt
 +F:    Documentation/filesystems/udf.rst
  F:    fs/udf/
  
  UDRAW TABLET
@@@ -17280,7 -17051,7 +17251,7 @@@ S:   Maintaine
  F:    Documentation/admin-guide/ufs.rst
  F:    fs/ufs/
  
 -UHID USERSPACE HID IO DRIVER:
 +UHID USERSPACE HID IO DRIVER
  M:    David Herrmann <dh.herrmann@googlemail.com>
  L:    linux-input@vger.kernel.org
  S:    Maintained
@@@ -17294,13 -17065,18 +17265,13 @@@ S:        Maintaine
  F:    drivers/usb/common/ulpi.c
  F:    include/linux/ulpi/
  
 -ULTRA-WIDEBAND (UWB) SUBSYSTEM:
 -L:    devel@driverdev.osuosl.org
 -S:    Obsolete
 -F:    drivers/staging/uwb/
 -
 -UNICODE SUBSYSTEM:
 +UNICODE SUBSYSTEM
  M:    Gabriel Krisman Bertazi <krisman@collabora.com>
  L:    linux-fsdevel@vger.kernel.org
  S:    Supported
  F:    fs/unicode/
  
 -UNICORE32 ARCHITECTURE:
 +UNICORE32 ARCHITECTURE
  M:    Guan Xuetao <gxt@pku.edu.cn>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
@@@ -17335,7 -17111,7 +17306,7 @@@ R:   Alim Akhtar <alim.akhtar@samsung.com
  R:    Avri Altman <avri.altman@wdc.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
 -F:    Documentation/scsi/ufs.txt
 +F:    Documentation/scsi/ufs.rst
  F:    drivers/scsi/ufs/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
@@@ -17377,12 -17153,6 +17348,12 @@@ S: Maintaine
  F:    Documentation/usb/acm.rst
  F:    drivers/usb/class/cdc-acm.*
  
 +USB APPLE MFI FASTCHARGE DRIVER
 +M:    Bastien Nocera <hadess@hadess.net>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    drivers/usb/misc/apple-mfi-fastcharge.c
 +
  USB AR5523 WIRELESS DRIVER
  M:    Pontus Fuchs <pontus.fuchs@gmail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -17593,14 -17363,11 +17564,14 @@@ F:        drivers/usb
  F:    include/linux/usb.h
  F:    include/linux/usb/
  
 -USB TYPEC PI3USB30532 MUX DRIVER
 -M:    Hans de Goede <hdegoede@redhat.com>
 +USB TYPEC BUS FOR ALTERNATE MODES
 +M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
 -F:    drivers/usb/typec/mux/pi3usb30532.c
 +F:    Documentation/ABI/testing/sysfs-bus-typec
 +F:    Documentation/driver-api/usb/typec_bus.rst
 +F:    drivers/usb/typec/altmodes/
 +F:    include/linux/usb/typec_altmode.h
  
  USB TYPEC CLASS
  M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
@@@ -17611,11 -17378,14 +17582,11 @@@ F:        Documentation/driver-api/usb/typec.r
  F:    drivers/usb/typec/
  F:    include/linux/usb/typec.h
  
 -USB TYPEC BUS FOR ALTERNATE MODES
 -M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
 +USB TYPEC PI3USB30532 MUX DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
 -F:    Documentation/ABI/testing/sysfs-bus-typec
 -F:    Documentation/driver-api/usb/typec_bus.rst
 -F:    drivers/usb/typec/altmodes/
 -F:    include/linux/usb/typec_altmode.h
 +F:    drivers/usb/typec/mux/pi3usb30532.c
  
  USB TYPEC PORT CONTROLLER DRIVERS
  M:    Guenter Roeck <linux@roeck-us.net>
@@@ -17645,7 -17415,7 +17616,7 @@@ L:   linux-media@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  W:    https://linuxtv.org
  S:    Odd Fixes
 -F:    drivers/media/usb/usbvision/
 +F:    drivers/staging/media/usbvision/
  
  USB WEBCAM GADGET
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@@ -17992,7 -17762,7 +17963,7 @@@ F:   include/linux/vbox_utils.
  F:    include/uapi/linux/vbox*.h
  F:    drivers/virt/vboxguest/
  
 -VIRTUAL BOX SHARED FOLDER VFS DRIVER:
 +VIRTUAL BOX SHARED FOLDER VFS DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
@@@ -18054,13 -17824,6 +18025,13 @@@ S: Supporte
  F:    arch/x86/kernel/cpu/vmware.c
  F:    arch/x86/include/asm/vmware.h
  
 +VMWARE VIRTUAL PTP CLOCK DRIVER
 +M:    Vivek Thampi <vithampi@vmware.com>
 +M:    "VMware, Inc." <pv-drivers@vmware.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/ptp/ptp_vmw.c
 +
  VMWARE PVRDMA DRIVER
  M:    Adit Ranadive <aditr@vmware.com>
  M:    VMware PV-Drivers <pv-drivers@vmware.com>
@@@ -18395,10 -18158,10 +18366,10 @@@ X86 PLATFORM DRIVER
  M:    Darren Hart <dvhart@infradead.org>
  M:    Andy Shevchenko <andy@infradead.org>
  L:    platform-driver-x86@vger.kernel.org
 -T:    git git://git.infradead.org/linux-platform-drivers-x86.git
  S:    Odd Fixes
 -F:    drivers/platform/x86/
 +T:    git git://git.infradead.org/linux-platform-drivers-x86.git
  F:    drivers/platform/olpc/
 +F:    drivers/platform/x86/
  
  X86 PLATFORM DRIVERS - ARCH
  R:    Darren Hart <dvhart@infradead.org>
@@@ -18712,7 -18475,7 +18683,7 @@@ L:   linux-fsdevel@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git
  S:    Maintained
  F:    fs/zonefs/
 -F:    Documentation/filesystems/zonefs.txt
 +F:    Documentation/filesystems/zonefs.rst
  
  ZPOOL COMPRESSED PAGE STORAGE API
  M:    Dan Streetman <ddstreet@ieee.org>

diff --combined arch/powerpc/include/asm/kvm_host.h
index f99b4333dfbaeb32fc9827db4b93a83a5ca165d5,877f8aa2bc1edcc9dd918d0be41f3e18c804f9fa..1dc63101ffe18538dd88b33aae4a7223fe88e079
--- 1/arch/powerpc/include/asm/kvm_host.h
--- 2/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@@ -303,14 -303,11 +303,12 @@@ struct kvm_arch 
        u8 radix;
        u8 fwnmi_enabled;
        u8 secure_guest;
 +      u8 svm_enabled;
        bool threads_indep;
        bool nested_enable;
        pgd_t *pgtable;
        u64 process_table;
        struct dentry *debugfs_dir;
-       struct dentry *htab_dentry;
-       struct dentry *radix_dentry;
        struct kvm_resize_hpt *resize_hpt; /* protected by kvm->lock */
  #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */
  #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
@@@ -831,7 -828,6 +829,6 @@@ struct kvm_vcpu_arch 
        struct kvmhv_tb_accumulator cede_time;  /* time napping inside guest */
  
        struct dentry *debugfs_dir;
-       struct dentry *debugfs_timings;
  #endif /* CONFIG_KVM_BOOK3S_HV_EXIT_TIMING */
  };
  

diff --combined arch/powerpc/kernel/pci-common.c
index d0074ad73aa3db16023fca47bf88e16cc6653e78,8983afa6d62af7580ed925e9fbfecd5c6c9ab5ff..be108616a721fbf594b717798d615ad503ea9a30
--- 1/arch/powerpc/kernel/pci-common.c
--- 2/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@@ -728,7 -728,7 +728,7 @@@ void pci_process_bridge_OF_ranges(struc
                               " MEM 0x%016llx..0x%016llx -> 0x%016llx %s\n",
                               range.cpu_addr, range.cpu_addr + range.size - 1,
                               range.pci_addr,
 -                             (range.pci_space & 0x40000000) ?
 +                             (range.flags & IORESOURCE_PREFETCH) ?
                               "Prefetch" : "");
  
                        /* We support only 3 memory ranges */
@@@ -1399,14 -1399,8 +1399,8 @@@ void pcibios_finish_adding_to_bus(struc
                        pci_assign_unassigned_bus_resources(bus);
        }
  
-       /* Fixup EEH */
-       eeh_add_device_tree_late(bus);
- 
        /* Add new devices to global lists.  Register in proc, sysfs. */
        pci_bus_add_devices(bus);
- 
-       /* sysfs files should only be added after devices are added */
-       eeh_add_sysfs_files(bus);
  }
  EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
  

diff --combined arch/powerpc/kernel/vmlinux.lds.S
index b4c89a1acebb83b75b1151e1a29aae89704f66ed,b17d665a4e07f9a2ac250202d7fa930a6ad1495d..31a0f201fb6f43a315b6d6338eeb380d9a9bde1f
--- 1/arch/powerpc/kernel/vmlinux.lds.S
--- 2/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@@ -256,6 -256,7 +256,7 @@@ SECTION
                *(.dynamic)
        }
        .hash : AT(ADDR(.hash) - LOAD_OFFSET) { *(.hash) }
+       .gnu.hash : AT(ADDR(.gnu.hash) - LOAD_OFFSET) { *(.gnu.hash) }
        .interp : AT(ADDR(.interp) - LOAD_OFFSET) { *(.interp) }
        .rela.dyn : AT(ADDR(.rela.dyn) - LOAD_OFFSET)
        {
@@@ -303,6 -304,12 +304,6 @@@
                *(.branch_lt)
        }
  
 -#ifdef CONFIG_DEBUG_INFO_BTF
 -      .BTF : AT(ADDR(.BTF) - LOAD_OFFSET) {
 -              *(.BTF)
 -      }
 -#endif
 -
        .opd : AT(ADDR(.opd) - LOAD_OFFSET) {
                __start_opd = .;
                KEEP(*(.opd))

diff --combined arch/powerpc/kvm/book3s_64_mmu_hv.c
index 3aecec890d6fccaa23ec7826e238eebf894eeda4,8b4eac0c9dcdb4704f75263d8ef64d1e34bd4a52..6404df613ea36a0783609b45df72fde12cf9c7ed
--- 1/arch/powerpc/kvm/book3s_64_mmu_hv.c
--- 2/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@@ -485,18 -485,18 +485,18 @@@ int kvmppc_book3s_hv_page_fault(struct 
        __be64 *hptep;
        unsigned long mmu_seq, psize, pte_size;
        unsigned long gpa_base, gfn_base;
 -      unsigned long gpa, gfn, hva, pfn;
 +      unsigned long gpa, gfn, hva, pfn, hpa;
        struct kvm_memory_slot *memslot;
        unsigned long *rmap;
        struct revmap_entry *rev;
 -      struct page *page, *pages[1];
 -      long index, ret, npages;
 +      struct page *page;
 +      long index, ret;
        bool is_ci;
 -      unsigned int writing, write_ok;
 -      struct vm_area_struct *vma;
 +      bool writing, write_ok;
 +      unsigned int shift;
        unsigned long rcbits;
        long mmio_update;
 -      struct mm_struct *mm;
 +      pte_t pte, *ptep;
  
        if (kvm_is_radix(kvm))
                return kvmppc_book3s_radix_page_fault(run, vcpu, ea, dsisr);
@@@ -570,62 -570,59 +570,62 @@@
        smp_rmb();
  
        ret = -EFAULT;
 -      is_ci = false;
 -      pfn = 0;
        page = NULL;
 -      mm = kvm->mm;
 -      pte_size = PAGE_SIZE;
        writing = (dsisr & DSISR_ISSTORE) != 0;
        /* If writing != 0, then the HPTE must allow writing, if we get here */
        write_ok = writing;
        hva = gfn_to_hva_memslot(memslot, gfn);
 -      npages = get_user_pages_fast(hva, 1, writing ? FOLL_WRITE : 0, pages);
 -      if (npages < 1) {
 -              /* Check if it's an I/O mapping */
 -              down_read(&mm->mmap_sem);
 -              vma = find_vma(mm, hva);
 -              if (vma && vma->vm_start <= hva && hva + psize <= vma->vm_end &&
 -                  (vma->vm_flags & VM_PFNMAP)) {
 -                      pfn = vma->vm_pgoff +
 -                              ((hva - vma->vm_start) >> PAGE_SHIFT);
 -                      pte_size = psize;
 -                      is_ci = pte_ci(__pte((pgprot_val(vma->vm_page_prot))));
 -                      write_ok = vma->vm_flags & VM_WRITE;
 -              }
 -              up_read(&mm->mmap_sem);
 -              if (!pfn)
 -                      goto out_put;
 +
 +      /*
 +       * Do a fast check first, since __gfn_to_pfn_memslot doesn't
 +       * do it with !atomic && !async, which is how we call it.
 +       * We always ask for write permission since the common case
 +       * is that the page is writable.
 +       */
 +      if (__get_user_pages_fast(hva, 1, 1, &page) == 1) {
 +              write_ok = true;
        } else {
 -              page = pages[0];
 -              pfn = page_to_pfn(page);
 -              if (PageHuge(page)) {
 -                      page = compound_head(page);
 -                      pte_size <<= compound_order(page);
 -              }
 -              /* if the guest wants write access, see if that is OK */
 -              if (!writing && hpte_is_writable(r)) {
 -                      pte_t *ptep, pte;
 -                      unsigned long flags;
 -                      /*
 -                       * We need to protect against page table destruction
 -                       * hugepage split and collapse.
 -                       */
 -                      local_irq_save(flags);
 -                      ptep = find_current_mm_pte(mm->pgd, hva, NULL, NULL);
 -                      if (ptep) {
 -                              pte = kvmppc_read_update_linux_pte(ptep, 1);
 -                              if (__pte_write(pte))
 -                                      write_ok = 1;
 -                      }
 -                      local_irq_restore(flags);
 +              /* Call KVM generic code to do the slow-path check */
 +              pfn = __gfn_to_pfn_memslot(memslot, gfn, false, NULL,
 +                                         writing, &write_ok);
 +              if (is_error_noslot_pfn(pfn))
 +                      return -EFAULT;
 +              page = NULL;
 +              if (pfn_valid(pfn)) {
 +                      page = pfn_to_page(pfn);
 +                      if (PageReserved(page))
 +                              page = NULL;
                }
        }
  
 +      /*
 +       * Read the PTE from the process' radix tree and use that
 +       * so we get the shift and attribute bits.
 +       */
 +      local_irq_disable();
 +      ptep = __find_linux_pte(vcpu->arch.pgdir, hva, NULL, &shift);
 +      /*
 +       * If the PTE disappeared temporarily due to a THP
 +       * collapse, just return and let the guest try again.
 +       */
 +      if (!ptep) {
 +              local_irq_enable();
 +              if (page)
 +                      put_page(page);
 +              return RESUME_GUEST;
 +      }
 +      pte = *ptep;
 +      local_irq_enable();
 +      hpa = pte_pfn(pte) << PAGE_SHIFT;
 +      pte_size = PAGE_SIZE;
 +      if (shift)
 +              pte_size = 1ul << shift;
 +      is_ci = pte_ci(pte);
 +
        if (psize > pte_size)
                goto out_put;
 +      if (pte_size > psize)
 +              hpa |= hva & (pte_size - psize);
  
        /* Check WIMG vs. the actual page we're accessing */
        if (!hpte_cache_flags_ok(r, is_ci)) {
@@@ -639,13 -636,14 +639,13 @@@
        }
  
        /*
 -       * Set the HPTE to point to pfn.
 -       * Since the pfn is at PAGE_SIZE granularity, make sure we
 +       * Set the HPTE to point to hpa.
 +       * Since the hpa is at PAGE_SIZE granularity, make sure we
         * don't mask out lower-order bits if psize < PAGE_SIZE.
         */
        if (psize < PAGE_SIZE)
                psize = PAGE_SIZE;
 -      r = (r & HPTE_R_KEY_HI) | (r & ~(HPTE_R_PP0 - psize)) |
 -                                      ((pfn << PAGE_SHIFT) & ~(psize - 1));
 +      r = (r & HPTE_R_KEY_HI) | (r & ~(HPTE_R_PP0 - psize)) | hpa;
        if (hpte_is_writable(r) && !write_ok)
                r = hpte_make_readonly(r);
        ret = RESUME_GUEST;
@@@ -710,13 -708,20 +710,13 @@@
        asm volatile("ptesync" : : : "memory");
        preempt_enable();
        if (page && hpte_is_writable(r))
 -              SetPageDirty(page);
 +              set_page_dirty_lock(page);
  
   out_put:
        trace_kvm_page_fault_exit(vcpu, hpte, ret);
  
 -      if (page) {
 -              /*
 -               * We drop pages[0] here, not page because page might
 -               * have been set to the head page of a compound, but
 -               * we have to drop the reference on the correct tail
 -               * page to match the get inside gup()
 -               */
 -              put_page(pages[0]);
 -      }
 +      if (page)
 +              put_page(page);
        return ret;
  
   out_unlock:
@@@ -2133,9 -2138,8 +2133,8 @@@ static const struct file_operations deb
  
  void kvmppc_mmu_debugfs_init(struct kvm *kvm)
  {
-       kvm->arch.htab_dentry = debugfs_create_file("htab", 0400,
-                                                   kvm->arch.debugfs_dir, kvm,
-                                                   &debugfs_htab_fops);
+       debugfs_create_file("htab", 0400, kvm->arch.debugfs_dir, kvm,
+                           &debugfs_htab_fops);
  }
  
  void kvmppc_mmu_book3s_hv_init(struct kvm_vcpu *vcpu)

diff --combined arch/powerpc/kvm/book3s_64_mmu_radix.c
index 134fbc1f029f394a2c79cb521fce9fc0bceb6676,1d75ed684b530c84ad0255e2972e69f9b025a365..9f050064d2a2d7523ff0d89222d7bc6e8f3f2bc3
--- 1/arch/powerpc/kvm/book3s_64_mmu_radix.c
--- 2/arch/powerpc/kvm/book3s_64_mmu_radix.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c
@@@ -425,7 -425,7 +425,7 @@@ static void kvmppc_unmap_free_pte(struc
                                  unsigned int lpid)
  {
        if (full) {
 -              memset(pte, 0, sizeof(long) << PTE_INDEX_SIZE);
 +              memset(pte, 0, sizeof(long) << RADIX_PTE_INDEX_SIZE);
        } else {
                pte_t *p = pte;
                unsigned long it;
@@@ -1376,9 -1376,8 +1376,8 @@@ static const struct file_operations deb
  
  void kvmhv_radix_debugfs_init(struct kvm *kvm)
  {
-       kvm->arch.radix_dentry = debugfs_create_file("radix", 0400,
-                                                    kvm->arch.debugfs_dir, kvm,
-                                                    &debugfs_radix_fops);
+       debugfs_create_file("radix", 0400, kvm->arch.debugfs_dir, kvm,
+                           &debugfs_radix_fops);
  }
  
  int kvmppc_radix_init(void)

diff --combined arch/powerpc/kvm/book3s_hv.c
index fa6e4fc7d0e4745953138b9959096c9d7ec6d5e8,33be4d93248af9e1b7dd7f071779c3049219048d..93493f0cbfe8e94b81d1f06b00f1218dfb8d6d73
--- 1/arch/powerpc/kvm/book3s_hv.c
--- 2/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@@ -72,6 -72,7 +72,6 @@@
  #include <asm/xics.h>
  #include <asm/xive.h>
  #include <asm/hw_breakpoint.h>
 -#include <asm/kvm_host.h>
  #include <asm/kvm_book3s_uvmem.h>
  #include <asm/ultravisor.h>
  
@@@ -1073,35 -1074,25 +1073,35 @@@ int kvmppc_pseries_do_hcall(struct kvm_
                                         kvmppc_get_gpr(vcpu, 6));
                break;
        case H_SVM_PAGE_IN:
 -              ret = kvmppc_h_svm_page_in(vcpu->kvm,
 -                                         kvmppc_get_gpr(vcpu, 4),
 -                                         kvmppc_get_gpr(vcpu, 5),
 -                                         kvmppc_get_gpr(vcpu, 6));
 +              ret = H_UNSUPPORTED;
 +              if (kvmppc_get_srr1(vcpu) & MSR_S)
 +                      ret = kvmppc_h_svm_page_in(vcpu->kvm,
 +                                                 kvmppc_get_gpr(vcpu, 4),
 +                                                 kvmppc_get_gpr(vcpu, 5),
 +                                                 kvmppc_get_gpr(vcpu, 6));
                break;
        case H_SVM_PAGE_OUT:
 -              ret = kvmppc_h_svm_page_out(vcpu->kvm,
 -                                          kvmppc_get_gpr(vcpu, 4),
 -                                          kvmppc_get_gpr(vcpu, 5),
 -                                          kvmppc_get_gpr(vcpu, 6));
 +              ret = H_UNSUPPORTED;
 +              if (kvmppc_get_srr1(vcpu) & MSR_S)
 +                      ret = kvmppc_h_svm_page_out(vcpu->kvm,
 +                                                  kvmppc_get_gpr(vcpu, 4),
 +                                                  kvmppc_get_gpr(vcpu, 5),
 +                                                  kvmppc_get_gpr(vcpu, 6));
                break;
        case H_SVM_INIT_START:
 -              ret = kvmppc_h_svm_init_start(vcpu->kvm);
 +              ret = H_UNSUPPORTED;
 +              if (kvmppc_get_srr1(vcpu) & MSR_S)
 +                      ret = kvmppc_h_svm_init_start(vcpu->kvm);
                break;
        case H_SVM_INIT_DONE:
 -              ret = kvmppc_h_svm_init_done(vcpu->kvm);
 +              ret = H_UNSUPPORTED;
 +              if (kvmppc_get_srr1(vcpu) & MSR_S)
 +                      ret = kvmppc_h_svm_init_done(vcpu->kvm);
                break;
        case H_SVM_INIT_ABORT:
 -              ret = kvmppc_h_svm_init_abort(vcpu->kvm);
 +              ret = H_UNSUPPORTED;
 +              if (kvmppc_get_srr1(vcpu) & MSR_S)
 +                      ret = kvmppc_h_svm_init_abort(vcpu->kvm);
                break;
  
        default:
@@@ -2267,14 -2258,9 +2267,9 @@@ static void debugfs_vcpu_init(struct kv
        struct kvm *kvm = vcpu->kvm;
  
        snprintf(buf, sizeof(buf), "vcpu%u", id);
-       if (IS_ERR_OR_NULL(kvm->arch.debugfs_dir))
-               return;
        vcpu->arch.debugfs_dir = debugfs_create_dir(buf, kvm->arch.debugfs_dir);
-       if (IS_ERR_OR_NULL(vcpu->arch.debugfs_dir))
-               return;
-       vcpu->arch.debugfs_timings =
-               debugfs_create_file("timings", 0444, vcpu->arch.debugfs_dir,
-                                   vcpu, &debugfs_timings_ops);
+       debugfs_create_file("timings", 0444, vcpu->arch.debugfs_dir, vcpu,
+                           &debugfs_timings_ops);
  }
  
  #else /* CONFIG_KVM_BOOK3S_HV_EXIT_TIMING */
@@@ -3625,7 -3611,6 +3620,7 @@@ int kvmhv_p9_guest_entry(struct kvm_vcp
                if (trap == BOOK3S_INTERRUPT_SYSCALL && !vcpu->arch.nested &&
                    kvmppc_get_gpr(vcpu, 3) == H_CEDE) {
                        kvmppc_nested_cede(vcpu);
 +                      kvmppc_set_gpr(vcpu, 3, 0);
                        trap = 0;
                }
        } else {
@@@ -4410,7 -4395,7 +4405,7 @@@ static int kvm_vm_ioctl_get_dirty_log_h
        slots = kvm_memslots(kvm);
        memslot = id_to_memslot(slots, log->slot);
        r = -ENOENT;
 -      if (!memslot->dirty_bitmap)
 +      if (!memslot || !memslot->dirty_bitmap)
                goto out;
  
        /*
@@@ -4457,26 -4442,29 +4452,26 @@@ out
        return r;
  }
  
 -static void kvmppc_core_free_memslot_hv(struct kvm_memory_slot *free,
 -                                      struct kvm_memory_slot *dont)
 +static void kvmppc_core_free_memslot_hv(struct kvm_memory_slot *slot)
  {
 -      if (!dont || free->arch.rmap != dont->arch.rmap) {
 -              vfree(free->arch.rmap);
 -              free->arch.rmap = NULL;
 -      }
 +      vfree(slot->arch.rmap);
 +      slot->arch.rmap = NULL;
  }
  
 -static int kvmppc_core_create_memslot_hv(struct kvm_memory_slot *slot,
 -                                       unsigned long npages)
 +static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm,
 +                                      struct kvm_memory_slot *slot,
 +                                      const struct kvm_userspace_memory_region *mem,
 +                                      enum kvm_mr_change change)
  {
 -      slot->arch.rmap = vzalloc(array_size(npages, sizeof(*slot->arch.rmap)));
 -      if (!slot->arch.rmap)
 -              return -ENOMEM;
 +      unsigned long npages = mem->memory_size >> PAGE_SHIFT;
  
 -      return 0;
 -}
 +      if (change == KVM_MR_CREATE) {
 +              slot->arch.rmap = vzalloc(array_size(npages,
 +                                        sizeof(*slot->arch.rmap)));
 +              if (!slot->arch.rmap)
 +                      return -ENOMEM;
 +      }
  
 -static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm,
 -                                      struct kvm_memory_slot *memslot,
 -                                      const struct kvm_userspace_memory_region *mem)
 -{
        return 0;
  }
  
@@@ -4565,6 -4553,11 +4560,6 @@@ void kvmppc_update_lpcr(struct kvm *kvm
        }
  }
  
 -static void kvmppc_mmu_destroy_hv(struct kvm_vcpu *vcpu)
 -{
 -      return;
 -}
 -
  void kvmppc_setup_partition_table(struct kvm *kvm)
  {
        unsigned long dw0, dw1;
@@@ -5428,21 -5421,6 +5423,21 @@@ static void unpin_vpa_reset(struct kvm 
        vpa->update_pending = 0;
  }
  
 +/*
 + * Enable a guest to become a secure VM, or test whether
 + * that could be enabled.
 + * Called when the KVM_CAP_PPC_SECURE_GUEST capability is
 + * tested (kvm == NULL) or enabled (kvm != NULL).
 + */
 +static int kvmhv_enable_svm(struct kvm *kvm)
 +{
 +      if (!kvmppc_uvmem_available())
 +              return -EINVAL;
 +      if (kvm)
 +              kvm->arch.svm_enabled = 1;
 +      return 0;
 +}
 +
  /*
   *  IOCTL handler to turn off secure mode of guest
   *
@@@ -5543,7 -5521,9 +5538,7 @@@ static struct kvmppc_ops kvm_ops_hv = 
        .age_hva  = kvm_age_hva_hv,
        .test_age_hva = kvm_test_age_hva_hv,
        .set_spte_hva = kvm_set_spte_hva_hv,
 -      .mmu_destroy  = kvmppc_mmu_destroy_hv,
        .free_memslot = kvmppc_core_free_memslot_hv,
 -      .create_memslot = kvmppc_core_create_memslot_hv,
        .init_vm =  kvmppc_core_init_vm_hv,
        .destroy_vm = kvmppc_core_destroy_vm_hv,
        .get_smmu_info = kvm_vm_ioctl_get_smmu_info_hv,
@@@ -5563,7 -5543,6 +5558,7 @@@
        .enable_nested = kvmhv_enable_nested,
        .load_from_eaddr = kvmhv_load_from_eaddr,
        .store_to_eaddr = kvmhv_store_to_eaddr,
 +      .enable_svm = kvmhv_enable_svm,
        .svm_off = kvmhv_svm_off,
  };
  

diff --combined arch/powerpc/mm/kasan/kasan_init_32.c
index d2bed3fcb7194ec065e107b71786797359fd8257,1a29cf4699039a3f8fb031feb10ed23a57565370..cbcad369fcb22a1ba9df22630925160b70dd827b
--- 1/arch/powerpc/mm/kasan/kasan_init_32.c
--- 2/arch/powerpc/mm/kasan/kasan_init_32.c
+++ b/arch/powerpc/mm/kasan/kasan_init_32.c
@@@ -36,7 -36,7 +36,7 @@@ static int __init kasan_init_shadow_pag
        unsigned long k_cur, k_next;
        pte_t *new = NULL;
  
-       pmd = pmd_offset(pud_offset(pgd_offset_k(k_start), k_start), k_start);
+       pmd = pmd_ptr_k(k_start);
  
        for (k_cur = k_start; k_cur != k_end; k_cur = k_next, pmd++) {
                k_next = pgd_addr_end(k_cur, k_end);
@@@ -78,7 -78,7 +78,7 @@@ static int __init kasan_init_region(voi
        block = memblock_alloc(k_end - k_start, PAGE_SIZE);
  
        for (k_cur = k_start & PAGE_MASK; k_cur < k_end; k_cur += PAGE_SIZE) {
-               pmd_t *pmd = pmd_offset(pud_offset(pgd_offset_k(k_cur), k_cur), k_cur);
+               pmd_t *pmd = pmd_ptr_k(k_cur);
                void *va = block + k_cur - k_start;
                pte_t pte = pfn_pte(PHYS_PFN(__pa(va)), PAGE_KERNEL);
  
@@@ -101,8 -101,8 +101,8 @@@ static void __init kasan_remap_early_sh
  
        kasan_populate_pte(kasan_early_shadow_pte, prot);
  
-       for (k_cur = k_start & PAGE_MASK; k_cur < k_end; k_cur += PAGE_SIZE) {
-               pmd_t *pmd = pmd_offset(pud_offset(pgd_offset_k(k_cur), k_cur), k_cur);
+       for (k_cur = k_start & PAGE_MASK; k_cur != k_end; k_cur += PAGE_SIZE) {
+               pmd_t *pmd = pmd_ptr_k(k_cur);
                pte_t *ptep = pte_offset_kernel(pmd, k_cur);
  
                if ((pte_val(*ptep) & PTE_RPN_MASK) != pa)
@@@ -120,6 -120,12 +120,6 @@@ static void __init kasan_unmap_early_sh
        unsigned long k_cur;
        phys_addr_t pa = __pa(kasan_early_shadow_page);
  
 -      if (!early_mmu_has_feature(MMU_FTR_HPTE_TABLE)) {
 -              int ret = kasan_init_shadow_page_tables(k_start, k_end);
 -
 -              if (ret)
 -                      panic("kasan: kasan_init_shadow_page_tables() failed");
 -      }
        for (k_cur = k_start & PAGE_MASK; k_cur < k_end; k_cur += PAGE_SIZE) {
                pmd_t *pmd = pmd_offset(pud_offset(pgd_offset_k(k_cur), k_cur), k_cur);
                pte_t *ptep = pte_offset_kernel(pmd, k_cur);
@@@ -137,8 -143,7 +137,8 @@@ void __init kasan_mmu_init(void
        int ret;
        struct memblock_region *reg;
  
 -      if (early_mmu_has_feature(MMU_FTR_HPTE_TABLE)) {
 +      if (early_mmu_has_feature(MMU_FTR_HPTE_TABLE) ||
 +          IS_ENABLED(CONFIG_KASAN_VMALLOC)) {
                ret = kasan_init_shadow_page_tables(KASAN_SHADOW_START, KASAN_SHADOW_END);
  
                if (ret)
@@@ -196,7 -201,7 +196,7 @@@ void __init kasan_early_init(void
        unsigned long addr = KASAN_SHADOW_START;
        unsigned long end = KASAN_SHADOW_END;
        unsigned long next;
-       pmd_t *pmd = pmd_offset(pud_offset(pgd_offset_k(addr), addr), addr);
+       pmd_t *pmd = pmd_ptr_k(addr);
  
        BUILD_BUG_ON(KASAN_SHADOW_START & ~PGDIR_MASK);
  

diff --combined arch/powerpc/platforms/pseries/hotplug-memory.c
index f3ed1baa6289c591d99674688046f91d62e66a01,fd22ec41c008df0d52104ed82d0e5b43ae13a10c..b2cde173230151f62780dfcbdbdde98f9385b815
--- 1/arch/powerpc/platforms/pseries/hotplug-memory.c
--- 2/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@@ -223,7 -223,7 +223,7 @@@ static int get_lmb_range(u32 drc_index
                         struct drmem_lmb **end_lmb)
  {
        struct drmem_lmb *lmb, *start, *end;
-       struct drmem_lmb *last_lmb;
+       struct drmem_lmb *limit;
  
        start = NULL;
        for_each_drmem_lmb(lmb) {
@@@ -236,10 -236,10 +236,10 @@@
        if (!start)
                return -EINVAL;
  
-       end = &start[n_lmbs - 1];
+       end = &start[n_lmbs];
  
-       last_lmb = &drmem_info->lmbs[drmem_info->n_lmbs - 1];
-       if (end > last_lmb)
+       limit = &drmem_info->lmbs[drmem_info->n_lmbs];
+       if (end > limit)
                return -EINVAL;
  
        *start_lmb = start;
@@@ -360,7 -360,7 +360,7 @@@ static bool lmb_is_removable(struct drm
  
        for (i = 0; i < scns_per_block; i++) {
                pfn = PFN_DOWN(phys_addr);
 -              if (!pfn_present(pfn)) {
 +              if (!pfn_in_present_section(pfn)) {
                        phys_addr += MIN_MEMORY_BLOCK_SIZE;
                        continue;
                }

diff --combined fs/sysfs/group.c
index 5afe0e7ff7cd1c486078caa7d2660491456b184d,1e2a096057bc06718e280a65d171dfd335e2c3d5..fbb117757c524803e6f225dda15ad383cc8d1ad8
--- 1/fs/sysfs/group.c
--- 2/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@@ -13,7 -13,6 +13,7 @@@
  #include <linux/dcache.h>
  #include <linux/namei.h>
  #include <linux/err.h>
 +#include <linux/fs.h>
  #include "sysfs.h"
  
  
@@@ -425,6 -424,25 +425,25 @@@ EXPORT_SYMBOL_GPL(sysfs_remove_link_fro
  int __compat_only_sysfs_link_entry_to_kobj(struct kobject *kobj,
                                      struct kobject *target_kobj,
                                      const char *target_name)
+ {
+       return compat_only_sysfs_link_entry_to_kobj(kobj, target_kobj,
+                                                   target_name, NULL);
+ }
+ EXPORT_SYMBOL_GPL(__compat_only_sysfs_link_entry_to_kobj);
+ 
+ /**
+  * compat_only_sysfs_link_entry_to_kobj - add a symlink to a kobject pointing
+  * to a group or an attribute
+  * @kobj:             The kobject containing the group.
+  * @target_kobj:      The target kobject.
+  * @target_name:      The name of the target group or attribute.
+  * @symlink_name:     The name of the symlink file (target_name will be
+  *                    considered if symlink_name is NULL).
+  */
+ int compat_only_sysfs_link_entry_to_kobj(struct kobject *kobj,
+                                        struct kobject *target_kobj,
+                                        const char *target_name,
+                                        const char *symlink_name)
  {
        struct kernfs_node *target;
        struct kernfs_node *entry;
@@@ -449,126 -467,15 +468,129 @@@
                return -ENOENT;
        }
  
-       link = kernfs_create_link(kobj->sd, target_name, entry);
+       if (!symlink_name)
+               symlink_name = target_name;
+ 
+       link = kernfs_create_link(kobj->sd, symlink_name, entry);
        if (PTR_ERR(link) == -EEXIST)
-               sysfs_warn_dup(kobj->sd, target_name);
+               sysfs_warn_dup(kobj->sd, symlink_name);
  
        kernfs_put(entry);
        kernfs_put(target);
        return PTR_ERR_OR_ZERO(link);
  }
- EXPORT_SYMBOL_GPL(__compat_only_sysfs_link_entry_to_kobj);
+ EXPORT_SYMBOL_GPL(compat_only_sysfs_link_entry_to_kobj);
 +
 +static int sysfs_group_attrs_change_owner(struct kernfs_node *grp_kn,
 +                                        const struct attribute_group *grp,
 +                                        struct iattr *newattrs)
 +{
 +      struct kernfs_node *kn;
 +      int error;
 +
 +      if (grp->attrs) {
 +              struct attribute *const *attr;
 +
 +              for (attr = grp->attrs; *attr; attr++) {
 +                      kn = kernfs_find_and_get(grp_kn, (*attr)->name);
 +                      if (!kn)
 +                              return -ENOENT;
 +
 +                      error = kernfs_setattr(kn, newattrs);
 +                      kernfs_put(kn);
 +                      if (error)
 +                              return error;
 +              }
 +      }
 +
 +      if (grp->bin_attrs) {
 +              struct bin_attribute *const *bin_attr;
 +
 +              for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++) {
 +                      kn = kernfs_find_and_get(grp_kn, (*bin_attr)->attr.name);
 +                      if (!kn)
 +                              return -ENOENT;
 +
 +                      error = kernfs_setattr(kn, newattrs);
 +                      kernfs_put(kn);
 +                      if (error)
 +                              return error;
 +              }
 +      }
 +
 +      return 0;
 +}
 +
 +/**
 + * sysfs_group_change_owner - change owner of an attribute group.
 + * @kobj:     The kobject containing the group.
 + * @grp:      The attribute group.
 + * @kuid:     new owner's kuid
 + * @kgid:     new owner's kgid
 + *
 + * Returns 0 on success or error code on failure.
 + */
 +int sysfs_group_change_owner(struct kobject *kobj,
 +                           const struct attribute_group *grp, kuid_t kuid,
 +                           kgid_t kgid)
 +{
 +      struct kernfs_node *grp_kn;
 +      int error;
 +      struct iattr newattrs = {
 +              .ia_valid = ATTR_UID | ATTR_GID,
 +              .ia_uid = kuid,
 +              .ia_gid = kgid,
 +      };
 +
 +      if (!kobj->state_in_sysfs)
 +              return -EINVAL;
 +
 +      if (grp->name) {
 +              grp_kn = kernfs_find_and_get(kobj->sd, grp->name);
 +      } else {
 +              kernfs_get(kobj->sd);
 +              grp_kn = kobj->sd;
 +      }
 +      if (!grp_kn)
 +              return -ENOENT;
 +
 +      error = kernfs_setattr(grp_kn, &newattrs);
 +      if (!error)
 +              error = sysfs_group_attrs_change_owner(grp_kn, grp, &newattrs);
 +
 +      kernfs_put(grp_kn);
 +
 +      return error;
 +}
 +EXPORT_SYMBOL_GPL(sysfs_group_change_owner);
 +
 +/**
 + * sysfs_groups_change_owner - change owner of a set of attribute groups.
 + * @kobj:     The kobject containing the groups.
 + * @groups:   The attribute groups.
 + * @kuid:     new owner's kuid
 + * @kgid:     new owner's kgid
 + *
 + * Returns 0 on success or error code on failure.
 + */
 +int sysfs_groups_change_owner(struct kobject *kobj,
 +                            const struct attribute_group **groups,
 +                            kuid_t kuid, kgid_t kgid)
 +{
 +      int error = 0, i;
 +
 +      if (!kobj->state_in_sysfs)
 +              return -EINVAL;
 +
 +      if (!groups)
 +              return 0;
 +
 +      for (i = 0; groups[i]; i++) {
 +              error = sysfs_group_change_owner(kobj, groups[i], kuid, kgid);
 +              if (error)
 +                      break;
 +      }
 +
 +      return error;
 +}
 +EXPORT_SYMBOL_GPL(sysfs_groups_change_owner);

diff --combined include/linux/sysfs.h
index 4beb51009b6217abdbf7aec03e073147bb32fd12,7462315a643b3251f853905d3f7885cdc227a4b2..fd0fcb4d4f4d99743440711354937d09ffde7a58
--- 1/include/linux/sysfs.h
--- 2/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@@ -300,6 -300,10 +300,10 @@@ void sysfs_remove_link_from_group(struc
  int __compat_only_sysfs_link_entry_to_kobj(struct kobject *kobj,
                                      struct kobject *target_kobj,
                                      const char *target_name);
+ int compat_only_sysfs_link_entry_to_kobj(struct kobject *kobj,
+                                        struct kobject *target_kobj,
+                                        const char *target_name,
+                                        const char *symlink_name);
  
  void sysfs_notify(struct kobject *kobj, const char *dir, const char *attr);
  
@@@ -310,18 -314,6 +314,18 @@@ static inline void sysfs_enable_ns(stru
        return kernfs_enable_ns(kn);
  }
  
 +int sysfs_file_change_owner(struct kobject *kobj, const char *name, kuid_t kuid,
 +                          kgid_t kgid);
 +int sysfs_change_owner(struct kobject *kobj, kuid_t kuid, kgid_t kgid);
 +int sysfs_link_change_owner(struct kobject *kobj, struct kobject *targ,
 +                          const char *name, kuid_t kuid, kgid_t kgid);
 +int sysfs_groups_change_owner(struct kobject *kobj,
 +                            const struct attribute_group **groups,
 +                            kuid_t kuid, kgid_t kgid);
 +int sysfs_group_change_owner(struct kobject *kobj,
 +                           const struct attribute_group *groups, kuid_t kuid,
 +                           kgid_t kgid);
 +
  #else /* CONFIG_SYSFS */
  
  static inline int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
@@@ -520,6 -512,14 +524,14 @@@ static inline int __compat_only_sysfs_l
        return 0;
  }
  
+ static inline int compat_only_sysfs_link_entry_to_kobj(struct kobject *kobj,
+                                                      struct kobject *target_kobj,
+                                                      const char *target_name,
+                                                      const char *symlink_name)
+ {
+       return 0;
+ }
+ 
  static inline void sysfs_notify(struct kobject *kobj, const char *dir,
                                const char *attr)
  {
@@@ -534,40 -534,6 +546,40 @@@ static inline void sysfs_enable_ns(stru
  {
  }
  
 +static inline int sysfs_file_change_owner(struct kobject *kobj,
 +                                        const char *name, kuid_t kuid,
 +                                        kgid_t kgid)
 +{
 +      return 0;
 +}
 +
 +static inline int sysfs_link_change_owner(struct kobject *kobj,
 +                                        struct kobject *targ,
 +                                        const char *name, kuid_t kuid,
 +                                        kgid_t kgid)
 +{
 +      return 0;
 +}
 +
 +static inline int sysfs_change_owner(struct kobject *kobj, kuid_t kuid, kgid_t kgid)
 +{
 +      return 0;
 +}
 +
 +static inline int sysfs_groups_change_owner(struct kobject *kobj,
 +                        const struct attribute_group **groups,
 +                        kuid_t kuid, kgid_t kgid)
 +{
 +      return 0;
 +}
 +
 +static inline int sysfs_group_change_owner(struct kobject *kobj,
 +                                         const struct attribute_group *groups,
 +                                         kuid_t kuid, kgid_t kgid)
 +{
 +      return 0;
 +}
 +
  #endif /* CONFIG_SYSFS */
  
  static inline int __must_check sysfs_create_file(struct kobject *kobj,

diff --combined tools/testing/selftests/powerpc/mm/.gitignore
index 7cf7ad261d02d0d4c8001efb115efe114494f591,97f7922c52c554b4bbf49a015f3edbce75fb2f9a..2ca523255b1b227f293555888794b41d7b3c65f6
--- 1/tools/testing/selftests/powerpc/mm/.gitignore
--- 2/tools/testing/selftests/powerpc/mm/.gitignore
+++ b/tools/testing/selftests/powerpc/mm/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +# SPDX-License-Identifier: GPL-2.0-only
  hugetlb_vs_thp_test
  subpage_prot
  tempfile
@@@ -7,3 -6,4 +7,4 @@@ segv_error
  wild_bctr
  large_vm_fork_separation
  bad_accesses
+ tlbie_test

diff --combined tools/testing/selftests/powerpc/signal/.gitignore
index f897b55a44dd5e0d502c4e40124505f0d0038448,03dafa795255715e3548c0de1b118821fb83e65e..405b5364044cd91c8472c0bd63e0c7f3f90a4fa3
--- 1/tools/testing/selftests/powerpc/signal/.gitignore
--- 2/tools/testing/selftests/powerpc/signal/.gitignore
+++ b/tools/testing/selftests/powerpc/signal/.gitignore
@@@ -1,4 -1,4 +1,5 @@@
 +# SPDX-License-Identifier: GPL-2.0-only
  signal
  signal_tm
  sigfuz
+ sigreturn_vdso

diff --combined tools/testing/selftests/powerpc/tm/.gitignore
index 7baf2a46002f3873d92683765d206d55c8eac1c6,e1c72a4a3e916d464548cb8c9b675a1ed3903ed9..d8900a0c47a1f79ebc1c565d6890e4269b91bf34
--- 1/tools/testing/selftests/powerpc/tm/.gitignore
--- 2/tools/testing/selftests/powerpc/tm/.gitignore
+++ b/tools/testing/selftests/powerpc/tm/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +# SPDX-License-Identifier: GPL-2.0-only
  tm-resched-dscr
  tm-syscall
  tm-signal-msr-resv
@@@ -14,6 -13,7 +14,7 @@@ tm-signal-context-chk-vm
  tm-signal-context-chk-vsx
  tm-signal-context-force-tm
  tm-signal-sigreturn-nt
+ tm-signal-pagefault
  tm-vmx-unavail
  tm-unavailable
  tm-trap