projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 8115333 74e938c)
Merge tag 'for-linus-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Feb 2018 20:20:41 +0000 (12:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Feb 2018 20:20:41 +0000 (12:20 -0800)
Pull orangefs updates from Mike Marshall:
 "Mostly cleanups, but three bug fixes:

   - don't pass garbage return codes back up the call chain (Mike
     Marshall)

   - fix stale inode test (Martin Brandenburg)

   - fix off-by-one errors (Xiongfeng Wang)

  Also add Martin as a reviewer in the Maintainers file"

* tag 'for-linus-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: reverse sense of is-inode-stale test in d_revalidate
  orangefs: simplify orangefs_inode_is_stale
  Orangefs: don't propogate whacky error codes
  orangefs: use correct string length
  orangefs: make orangefs_make_bad_inode static
  orangefs: remove ORANGEFS_KERNEL_DEBUG
  orangefs: remove gossip_ldebug and gossip_lerr
  orangefs: make orangefs_client_debug_init static
  MAINTAINERS: update orangefs list and add myself as reviewer

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
fs/orangefs/super.c patch | diff1 | diff2 | blob | history

diff --combined MAINTAINERS
index 4c7a2fdc9b34314a863c77e9fc1fefbf0a626d03,9bf2c650d792e3057dc383fa250926c4d72f5c53..e6c26cb47d02d4f206b80054a2c4cccc519e32bd
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -270,7 -270,6 +270,7 @@@ ACCES 104-QUAD-8 IIO DRIVE
  M:    William Breathitt Gray <vilhelm.gray@gmail.com>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8
  F:    drivers/iio/counter/104-quad-8.c
  
  ACCES PCI-IDIO-16 GPIO DRIVER
@@@ -279,12 -278,6 +279,12 @@@ L:       linux-gpio@vger.kernel.or
  S:    Maintained
  F:    drivers/gpio/gpio-pci-idio-16.c
  
 +ACCES PCIe-IDIO-24 GPIO DRIVER
 +M:    William Breathitt Gray <vilhelm.gray@gmail.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-pcie-idio-24.c
 +
  ACENIC DRIVER
  M:    Jes Sorensen <jes@trained-monkey.org>
  L:    linux-acenic@sunsite.dk
@@@ -336,7 -329,7 +336,7 @@@ F: drivers/acpi/apei
  
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <robert.moore@intel.com>
 -M:    Lv Zheng <lv.zheng@intel.com>
 +M:    Erik Schmauss <erik.schmauss@intel.com>
  M:    "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
  L:    linux-acpi@vger.kernel.org
  L:    devel@acpica.org
@@@ -860,8 -853,6 +860,8 @@@ M: Michael Hennerich <Michael.Hennerich
  W:    http://wiki.analog.com/
  W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
 +F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
 +F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
  F:    drivers/iio/*/ad*
  F:    drivers/iio/adc/ltc2497*
  X:    drivers/iio/*/adjd*
@@@ -884,12 -875,6 +884,12 @@@ S:       Supporte
  F:    drivers/android/
  F:    drivers/staging/android/
  
 +ANDROID GOLDFISH PIC DRIVER
 +M:    Miodrag Dinic <miodrag.dinic@mips.com>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/interrupt-controller/google,goldfish-pic.txt
 +F:    drivers/irqchip/irq-goldfish-pic.c
 +
  ANDROID GOLDFISH RTC DRIVER
  M:    Miodrag Dinic <miodrag.dinic@mips.com>
  S:    Supported
@@@ -903,6 -888,7 +903,6 @@@ L: devel@driverdev.osuosl.or
  S:    Supported
  F:    drivers/staging/android/ion
  F:    drivers/staging/android/uapi/ion.h
 -F:    drivers/staging/android/uapi/ion_test.h
  
  AOA (Apple Onboard Audio) ALSA DRIVER
  M:    Johannes Berg <johannes@sipsolutions.net>
@@@ -1277,12 -1263,6 +1277,12 @@@ L:    linux-arm-kernel@lists.infradead.or
  S:    Supported
  F:    drivers/net/ethernet/cavium/thunder/
  
 +ARM/CIRRUS LOGIC BK3 MACHINE SUPPORT
 +M:    Lukasz Majewski <lukma@denx.de>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-ep93xx/ts72xx.c
 +
  ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
  M:    Alexander Shiyan <shc_work@mail.ru>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1307,6 -1287,7 +1307,6 @@@ M:      Russell King <linux@armlinux.org.uk
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git clkdev
 -F:    arch/arm/include/asm/clkdev.h
  F:    drivers/clk/clkdev.c
  
  ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
@@@ -1340,8 -1321,7 +1340,8 @@@ F:      tools/perf/arch/arm/util/pmu.
  F:    tools/perf/arch/arm/util/auxtrace.c
  F:    tools/perf/arch/arm/util/cs-etm.c
  F:    tools/perf/arch/arm/util/cs-etm.h
 -F:    tools/perf/util/cs-etm.h
 +F:    tools/perf/util/cs-etm.*
 +F:    tools/perf/util/cs-etm-decoder/*
  
  ARM/CORGI MACHINE SUPPORT
  M:    Richard Purdie <rpurdie@rpsys.net>
@@@ -1355,10 -1335,8 +1355,10 @@@ T:    git git://github.com/ulli-kroll/linu
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/gemini.txt
  F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
 +F:    Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt
  F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
  F:    arch/arm/mach-gemini/
 +F:    drivers/net/ethernet/cortina/
  F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
@@@ -1613,7 -1591,6 +1613,7 @@@ F:      arch/arm/boot/dts/kirkwood
  F:    arch/arm/configs/mvebu_*_defconfig
  F:    arch/arm/mach-mvebu/
  F:    arch/arm64/boot/dts/marvell/armada*
 +F:    drivers/cpufreq/armada-37xx-cpufreq.c
  F:    drivers/cpufreq/mvebu-cpufreq.c
  F:    drivers/irqchip/irq-armada-370-xp.c
  F:    drivers/irqchip/irq-mvebu-*
@@@ -1666,38 -1643,14 +1666,38 @@@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPOR
  M:    Michael Petchkovsky <mkpetch@internode.on.net>
  S:    Maintained
  
 -ARM/NOMADIK ARCHITECTURE
 -M:    Alessandro Rubini <rubini@unipv.it>
 +ARM/NOMADIK/U300/Ux500 ARCHITECTURES
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-nomadik/
 -F:    drivers/pinctrl/nomadik/
 +F:    arch/arm/mach-u300/
 +F:    arch/arm/mach-ux500/
 +F:    arch/arm/boot/dts/ste-*
 +F:    drivers/clk/clk-nomadik.c
 +F:    drivers/clk/clk-u300.c
 +F:    drivers/clocksource/clksrc-dbx500-prcmu.c
 +F:    drivers/clocksource/timer-u300.c
 +F:    drivers/dma/coh901318*
 +F:    drivers/dma/ste_dma40*
 +F:    drivers/hwspinlock/u8500_hsem.c
  F:    drivers/i2c/busses/i2c-nomadik.c
 +F:    drivers/i2c/busses/i2c-stu300.c
 +F:    drivers/mfd/ab3100*
 +F:    drivers/mfd/ab8500*
 +F:    drivers/mfd/abx500*
 +F:    drivers/mfd/dbx500*
 +F:    drivers/mfd/db8500*
 +F:    drivers/pinctrl/nomadik/
 +F:    drivers/pinctrl/pinctrl-coh901*
 +F:    drivers/pinctrl/pinctrl-u300.c
 +F:    drivers/rtc/rtc-ab3100.c
 +F:    drivers/rtc/rtc-ab8500.c
 +F:    drivers/rtc/rtc-coh901331.c
 +F:    drivers/rtc/rtc-pl031.c
 +F:    drivers/watchdog/coh901327_wdt.c
 +F:    Documentation/devicetree/bindings/arm/ste-*
 +F:    Documentation/devicetree/bindings/arm/ux500/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
  
  ARM/NUVOTON W90X900 ARM ARCHITECTURE
@@@ -1735,7 -1688,9 +1735,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  L:    linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-oxnas/
 -F:    arch/arm/boot/dts/ox8*.dtsi
 -F:    arch/arm/boot/dts/wd-mbwe.dts
 -F:    arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
 +F:    arch/arm/boot/dts/ox8*.dts*
  N:    oxnas
  
  ARM/PALM TREO SUPPORT
@@@ -1743,7 -1698,8 +1743,7 @@@ M:      Tomas Cech <sleep_walker@suse.com
  L:    linux-arm-kernel@lists.infradead.org
  W:    http://hackndev.com
  S:    Maintained
 -F:    arch/arm/mach-pxa/include/mach/palmtreo.h
 -F:    arch/arm/mach-pxa/palmtreo.c
 +F:    arch/arm/mach-pxa/palmtreo.*
  
  ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
  M:    Marek Vasut <marek.vasut@gmail.com>
@@@ -1752,10 -1708,12 +1752,10 @@@ W:   http://hackndev.co
  S:    Maintained
  F:    arch/arm/mach-pxa/include/mach/palmtx.h
  F:    arch/arm/mach-pxa/palmtx.c
 -F:    arch/arm/mach-pxa/include/mach/palmt5.h
 -F:    arch/arm/mach-pxa/palmt5.c
 +F:    arch/arm/mach-pxa/palmt5.*
  F:    arch/arm/mach-pxa/include/mach/palmld.h
  F:    arch/arm/mach-pxa/palmld.c
 -F:    arch/arm/mach-pxa/include/mach/palmte2.h
 -F:    arch/arm/mach-pxa/palmte2.c
 +F:    arch/arm/mach-pxa/palmte2.*
  F:    arch/arm/mach-pxa/include/mach/palmtc.h
  F:    arch/arm/mach-pxa/palmtc.c
  
@@@ -1764,7 -1722,8 +1764,7 @@@ M:      Sergey Lapin <slapin@ossfans.org
  L:    linux-arm-kernel@lists.infradead.org
  W:    http://hackndev.com
  S:    Maintained
 -F:    arch/arm/mach-pxa/include/mach/palmz72.h
 -F:    arch/arm/mach-pxa/palmz72.c
 +F:    arch/arm/mach-pxa/palmz72.*
  
  ARM/PLEB SUPPORT
  M:    Peter Chubb <pleb@gelato.unsw.edu.au>
@@@ -1793,6 -1752,7 +1793,6 @@@ F:      drivers/clk/qcom
  F:    drivers/dma/qcom/
  F:    drivers/soc/qcom/
  F:    drivers/spi/spi-qup.c
 -F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*
  F:    drivers/mfd/ssbi.c
@@@ -2004,10 -1964,9 +2004,10 @@@ N:    stm3
  F:    drivers/clocksource/armv7m_systick.c
  
  ARM/TANGO ARCHITECTURE
 -M:    Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
 +M:    Marc Gonzalez <marc.w.gonzalez@free.fr>
 +M:    Mans Rullgard <mans@mansr.com>
  L:    linux-arm-kernel@lists.infradead.org
 -S:    Maintained
 +S:    Odd Fixes
  N:    tango
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
@@@ -2071,13 -2030,27 +2071,13 @@@ M:   Dmitry Eremin-Solenikov <dbaryshkov@
  M:    Dirk Opfer <dirk@opfer-online.de>
  S:    Maintained
  
 -ARM/U300 MACHINE SUPPORT
 -M:    Linus Walleij <linus.walleij@linaro.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Supported
 -F:    arch/arm/mach-u300/
 -F:    drivers/clocksource/timer-u300.c
 -F:    drivers/i2c/busses/i2c-stu300.c
 -F:    drivers/rtc/rtc-coh901331.c
 -F:    drivers/watchdog/coh901327_wdt.c
 -F:    drivers/dma/coh901318*
 -F:    drivers/mfd/ab3100*
 -F:    drivers/rtc/rtc-ab3100.c
 -F:    drivers/rtc/rtc-coh901331.c
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 -
  ARM/UNIPHIER ARCHITECTURE
  M:    Masahiro Yamada <yamada.masahiro@socionext.com>
  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/gpio/gpio-uniphier.txt
 +F:    Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt
  F:    arch/arm/boot/dts/uniphier*
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
  F:    arch/arm/mach-uniphier/
@@@ -2093,6 -2066,24 +2093,6 @@@ F:     drivers/reset/reset-uniphier.
  F:    drivers/tty/serial/8250/8250_uniphier.c
  N:    uniphier
  
 -ARM/Ux500 ARM ARCHITECTURE
 -M:    Linus Walleij <linus.walleij@linaro.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-ux500/
 -F:    drivers/clocksource/clksrc-dbx500-prcmu.c
 -F:    drivers/dma/ste_dma40*
 -F:    drivers/hwspinlock/u8500_hsem.c
 -F:    drivers/mfd/abx500*
 -F:    drivers/mfd/ab8500*
 -F:    drivers/mfd/dbx500*
 -F:    drivers/mfd/db8500*
 -F:    drivers/pinctrl/nomadik/pinctrl-ab*
 -F:    drivers/pinctrl/nomadik/pinctrl-nomadik*
 -F:    drivers/rtc/rtc-ab8500.c
 -F:    drivers/rtc/rtc-pl031.c
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 -
  ARM/Ux500 CLOCK FRAMEWORK SUPPORT
  M:    Ulf Hansson <ulf.hansson@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2219,6 -2210,14 +2219,6 @@@ L:     linux-leds@vger.kernel.or
  S:    Maintained
  F:    drivers/leds/leds-as3645a.c
  
 -AS3645A LED FLASH CONTROLLER DRIVER
 -M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 -L:    linux-media@vger.kernel.org
 -T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 -F:    drivers/media/i2c/as3645a.c
 -F:    include/media/i2c/as3645a.h
 -
  ASAHI KASEI AK8974 DRIVER
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-iio@vger.kernel.org
@@@ -2271,9 -2270,7 +2271,9 @@@ F:      include/linux/async_tx.
  AT24 EEPROM DRIVER
  M:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-i2c@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/eeprom/at24.txt
  F:    drivers/misc/eeprom/at24.c
  F:    include/linux/platform_data/at24.h
  
@@@ -2394,6 -2391,13 +2394,6 @@@ F:     Documentation/devicetree/bindings/in
  F:    drivers/input/touchscreen/atmel_mxt_ts.c
  F:    include/linux/platform_data/atmel_mxt_ts.h
  
 -ATMEL NAND DRIVER
 -M:    Wenyou Yang <wenyou.yang@atmel.com>
 -M:    Josh Wu <rainyfeeling@outlook.com>
 -L:    linux-mtd@lists.infradead.org
 -S:    Supported
 -F:    drivers/mtd/nand/atmel/*
 -
  ATMEL SAMA5D2 ADC DRIVER
  M:    Ludovic Desroches <ludovic.desroches@microchip.com>
  L:    linux-iio@vger.kernel.org
@@@ -2505,8 -2509,6 +2505,8 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/axentia.txt
  F:    arch/arm/boot/dts/at91-linea.dtsi
 +F:    arch/arm/boot/dts/at91-natte.dtsi
 +F:    arch/arm/boot/dts/at91-nattis-2-natte-2.dts
  F:    arch/arm/boot/dts/at91-tse850-3.dts
  
  AXENTIA ASOC DRIVERS
@@@ -2570,7 -2572,6 +2570,7 @@@ S:      Maintaine
  F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
  F:    Documentation/ABI/testing/sysfs-class-net-mesh
  F:    Documentation/networking/batman-adv.rst
 +F:    include/uapi/linux/batadv_packet.h
  F:    include/uapi/linux/batman_adv.h
  F:    net/batman-adv/
  
@@@ -2694,6 -2695,7 +2694,6 @@@ F:      drivers/mtd/devices/block2mtd.
  
  BLUETOOTH DRIVERS
  M:    Marcel Holtmann <marcel@holtmann.org>
 -M:    Gustavo Padovan <gustavo@padovan.org>
  M:    Johan Hedberg <johan.hedberg@gmail.com>
  L:    linux-bluetooth@vger.kernel.org
  W:    http://www.bluez.org/
@@@ -2704,6 -2706,7 +2704,6 @@@ F:      drivers/bluetooth
  
  BLUETOOTH SUBSYSTEM
  M:    Marcel Holtmann <marcel@holtmann.org>
 -M:    Gustavo Padovan <gustavo@padovan.org>
  M:    Johan Hedberg <johan.hedberg@gmail.com>
  L:    linux-bluetooth@vger.kernel.org
  W:    http://www.bluez.org/
@@@ -2728,16 -2731,12 +2728,16 @@@ M:   Alexei Starovoitov <ast@kernel.org
  M:    Daniel Borkmann <daniel@iogearbox.net>
  L:    netdev@vger.kernel.org
  L:    linux-kernel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
  S:    Supported
  F:    arch/x86/net/bpf_jit*
  F:    Documentation/networking/filter.txt
  F:    Documentation/bpf/
  F:    include/linux/bpf*
  F:    include/linux/filter.h
 +F:    include/trace/events/bpf.h
 +F:    include/trace/events/xdp.h
  F:    include/uapi/linux/bpf*
  F:    include/uapi/linux/filter.h
  F:    kernel/bpf/
@@@ -2841,8 -2840,6 +2841,8 @@@ S:      Maintaine
  F:    arch/arm/mach-bcm/*brcmstb*
  F:    arch/arm/boot/dts/bcm7*.dts*
  F:    drivers/bus/brcmstb_gisb.c
 +F:    arch/arm/mm/cache-b15-rac.c
 +F:    arch/arm/include/asm/hardware/cache-b15-rac.h
  N:    brcmstb
  
  BROADCOM BMIPS CPUFREQ DRIVER
@@@ -3204,7 -3201,7 +3204,7 @@@ W:      https://github.com/linux-ca
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  S:    Maintained
 -F:    Documentation/networking/can.txt
 +F:    Documentation/networking/can.rst
  F:    net/can/
  F:    include/linux/can/core.h
  F:    include/uapi/linux/can.h
@@@ -3409,8 -3406,8 +3409,8 @@@ M:      Arnd Bergmann <arnd@arndb.de
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  S:    Supported
 -F:    drivers/char/*
 -F:    drivers/misc/*
 +F:    drivers/char/
 +F:    drivers/misc/
  F:    include/linux/miscdevice.h
  
  CHECKPATCH
@@@ -3558,7 -3555,7 +3558,7 @@@ F:      drivers/media/platform/coda
  
  COMMON CLK FRAMEWORK
  M:    Michael Turquette <mturquette@baylibre.com>
 -M:    Stephen Boyd <sboyd@codeaurora.org>
 +M:    Stephen Boyd <sboyd@kernel.org>
  L:    linux-clk@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-clk/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
@@@ -4136,7 -4133,6 +4136,7 @@@ DEVANTECH SRF ULTRASONIC RANGER IIO DRI
  M:    Andreas Klinger <ak@it-klinger.de>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-iio-distance-srf08
  F:    drivers/iio/proximity/srf*.c
  
  DEVICE COREDUMP (DEV_COREDUMP)
@@@ -4346,12 -4342,10 +4346,12 @@@ T:   git git://git.infradead.org/users/hc
  W:    http://git.infradead.org/users/hch/dma-mapping.git
  S:    Supported
  F:    lib/dma-debug.c
 -F:    lib/dma-noop.c
 +F:    lib/dma-direct.c
  F:    lib/dma-virt.c
  F:    drivers/base/dma-mapping.c
  F:    drivers/base/dma-coherent.c
 +F:    include/asm-generic/dma-mapping.h
 +F:    include/linux/dma-direct.h
  F:    include/linux/dma-mapping.h
  
  DME1737 HARDWARE MONITOR DRIVER
@@@ -4474,12 -4468,6 +4474,12 @@@ T:    git git://anongit.freedesktop.org/dr
  S:    Maintained
  F:    drivers/gpu/drm/tve200/
  
 +DRM DRIVER FOR ILITEK ILI9225 PANELS
 +M:    David Lechner <david@lechnology.com>
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/ili9225.c
 +F:    Documentation/devicetree/bindings/display/ili9225.txt
 +
  DRM DRIVER FOR INTEL I810 VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/i810/
@@@ -4566,12 -4554,6 +4566,12 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tinydrm/st7586.c
  F:    Documentation/devicetree/bindings/display/st7586.txt
  
 +DRM DRIVER FOR SITRONIX ST7735R PANELS
 +M:    David Lechner <david@lechnology.com>
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/st7735r.c
 +F:    Documentation/devicetree/bindings/display/st7735r.txt
 +
  DRM DRIVER FOR TDFX VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
@@@ -4611,7 -4593,7 +4611,7 @@@ F:      include/linux/vga
  
  DRM DRIVERS AND MISC GPU PATCHES
  M:    Daniel Vetter <daniel.vetter@intel.com>
 -M:    Jani Nikula <jani.nikula@linux.intel.com>
 +M:    Gustavo Padovan <gustavo@padovan.org>
  M:    Sean Paul <seanpaul@chromium.org>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
@@@ -4740,8 -4722,7 +4740,8 @@@ F:      Documentation/devicetree/bindings/di
  F:    Documentation/devicetree/bindings/display/renesas,du.txt
  
  DRM DRIVERS FOR ROCKCHIP
 -M:    Mark Yao <mark.yao@rock-chips.com>
 +M:    Sandy Huang <hjc@rock-chips.com>
 +M:    Heiko Stübner <heiko@sntech.de>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  F:    drivers/gpu/drm/rockchip/
@@@ -4829,15 -4810,6 +4829,15 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tinydrm/
  F:    include/drm/tinydrm/
  
 +DRM TTM SUBSYSTEM
 +M:    Christian Koenig <christian.koenig@amd.com>
 +M:    Roger He <Hongbo.He@amd.com>
 +T:    git git://people.freedesktop.org/~agd5f/linux
 +S:    Maintained
 +L:    dri-devel@lists.freedesktop.org
 +F:    include/drm/ttm/
 +F:    drivers/gpu/drm/ttm/
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <klimov.linux@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -4975,11 -4947,6 +4975,11 @@@ S:    Maintaine
  F:    lib/dynamic_debug.c
  F:    include/linux/dynamic_debug.h
  
 +DYNAMIC INTERRUPT MODERATION
 +M:    Tal Gilboa <talgi@mellanox.com>
 +S:    Maintained
 +F:    include/linux/net_dim.h
 +
  DZ DECSTATION DZ11 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <macro@linux-mips.org>
  S:    Maintained
@@@ -5180,12 -5147,6 +5180,12 @@@ L:    linux-edac@vger.kernel.or
  S:    Maintained
  F:    drivers/edac/skx_edac.c
  
 +EDAC-TI
 +M:    Tero Kristo <t-kristo@ti.com>
 +L:    linux-edac@vger.kernel.org
 +S:    Maintained
 +F:    drivers/edac/ti_edac.c
 +
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -5992,12 -5953,6 +5992,12 @@@ L:    linux-input@vger.kernel.or
  S:    Maintained
  F:    drivers/input/touchscreen/goodix.c
  
 +GPD POCKET FAN DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/gpd-pocket-fan.c
 +
  GPIO ACPI SUPPORT
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
  M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@@ -6015,7 -5970,6 +6015,7 @@@ F:      drivers/media/rc/gpio-ir-tx.
  
  GPIO MOCKUP DRIVER
  M:    Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
 +R:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    drivers/gpio/gpio-mockup.c
@@@ -6571,12 -6525,6 +6571,12 @@@ F:    drivers/i2c/i2c-mux.
  F:    drivers/i2c/muxes/
  F:    include/linux/i2c-mux.h
  
 +I2C MV64XXX MARVELL AND ALLWINNER DRIVER
 +M:    Gregory CLEMENT <gregory.clement@free-electrons.com>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-mv64xxx.c
 +
  I2C OVER PARALLEL PORT
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-i2c@vger.kernel.org
@@@ -6876,8 -6824,6 +6876,8 @@@ R:      Peter Meerwald-Stadler <pmeerw@pmeer
  L:    linux-iio@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
  S:    Maintained
 +F:    Documentation/ABI/testing/configfs-iio*
 +F:    Documentation/ABI/testing/sysfs-bus-iio*
  F:    Documentation/devicetree/bindings/iio/
  F:    drivers/iio/
  F:    drivers/staging/iio/
@@@ -6935,9 -6881,9 +6935,9 @@@ INFINIBAND SUBSYSTE
  M:    Doug Ledford <dledford@redhat.com>
  M:    Jason Gunthorpe <jgg@mellanox.com>
  L:    linux-rdma@vger.kernel.org
 -W:    http://www.openfabrics.org/
 +W:    https://github.com/linux-rdma/rdma-core
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
  S:    Supported
  F:    Documentation/devicetree/bindings/infiniband/
  F:    Documentation/infiniband/
@@@ -7078,7 -7024,7 +7078,7 @@@ M:      Zhi Wang <zhi.a.wang@intel.com
  L:    intel-gvt-dev@lists.freedesktop.org
  L:    intel-gfx@lists.freedesktop.org
  W:    https://01.org/igvt-g
 -T:    git https://github.com/01org/gvt-linux.git
 +T:    git https://github.com/intel/gvt-linux.git
  S:    Supported
  F:    drivers/gpu/drm/i915/gvt/
  
@@@ -7125,14 -7071,6 +7125,14 @@@ R:    Dan Williams <dan.j.williams@intel.c
  S:    Odd fixes
  F:    drivers/dma/iop-adma.c
  
 +INTEL IPU3 CSI-2 CIO2 DRIVER
 +M:    Yong Zhi <yong.zhi@intel.com>
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/pci/intel/ipu3/
 +F:    Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst
 +
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
  M:    Krzysztof Halasa <khalasa@piap.pl>
  S:    Maintained
@@@ -7367,16 -7305,17 +7367,16 @@@ F:   drivers/tty/ipwireless
  
  IPX NETWORK LAYER
  L:    netdev@vger.kernel.org
 -S:    Odd fixes
 -F:    include/net/ipx.h
 +S:    Obsolete
  F:    include/uapi/linux/ipx.h
 -F:    net/ipx/
 +F:    drivers/staging/ipx/
  
  IRDA SUBSYSTEM
  M:    Samuel Ortiz <samuel@sortiz.org>
  L:    irda-users@lists.sourceforge.net (subscribers-only)
  L:    netdev@vger.kernel.org
  W:    http://irda.sourceforge.net/
 -S:    Maintained
 +S:    Obsolete
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
  F:    Documentation/networking/irda.txt
  F:    drivers/staging/irda/
@@@ -7800,7 -7739,6 +7800,7 @@@ F:      include/keys/encrypted-type.
  F:    security/keys/encrypted-keys/
  
  KEYS-TRUSTED
 +M:    James Bottomley <jejb@linux.vnet.ibm.com>
  M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
  L:    linux-integrity@vger.kernel.org
  L:    keyrings@vger.kernel.org
@@@ -8252,7 -8190,6 +8252,7 @@@ F:      arch/*/include/asm/rwsem.
  F:    include/linux/seqlock.h
  F:    lib/locking*.[ch]
  F:    kernel/locking/
 +X:    kernel/locking/locktorture.c
  
  LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
  M:    "Richard Russon (FlatCap)" <ldm@flatcap.org>
@@@ -8468,13 -8405,6 +8468,13 @@@ L:    linux-wireless@vger.kernel.or
  S:    Odd Fixes
  F:    drivers/net/wireless/marvell/mwl8k.c
  
 +MARVELL NAND CONTROLLER DRIVER
 +M:    Miquel Raynal <miquel.raynal@free-electrons.com>
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +F:    drivers/mtd/nand/marvell_nand.c
 +F:    Documentation/devicetree/bindings/mtd/marvell-nand.txt
 +
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
  M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Odd Fixes
@@@ -8746,15 -8676,6 +8746,15 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/dvb-frontends/stv6111*
  
 +MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
 +M:    Dmitry Osipenko <digetx@gmail.com>
 +L:    linux-media@vger.kernel.org
 +L:    linux-tegra@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
 +F:    drivers/staging/media/tegra-vde/
 +
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <mchehab@s-opensource.com>
  M:    Mauro Carvalho Chehab <mchehab@kernel.org>
@@@ -8798,13 -8719,6 +8798,13 @@@ L:    netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/mediatek/
  
 +MEDIATEK SWITCH DRIVER
 +M:    Sean Wang <sean.wang@mediatek.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/dsa/mt7530.*
 +F:    net/dsa/tag_mtk.c
 +
  MEDIATEK JPEG DRIVER
  M:    Rick Chang <rick.chang@mediatek.com>
  M:    Bin Liu <bin.liu@mediatek.com>
@@@ -8936,13 -8850,12 +8936,13 @@@ W:   http://www.mellanox.co
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlxfw/
  
 -MELLANOX MLX CPLD HOTPLUG DRIVER
 +MELLANOX HARDWARE PLATFORM SUPPORT
 +M:    Andy Shevchenko <andy@infradead.org>
 +M:    Darren Hart <dvhart@infradead.org>
  M:    Vadim Pasternak <vadimp@mellanox.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Supported
 -F:    drivers/platform/x86/mlxcpld-hotplug.c
 -F:    include/linux/platform_data/mlxcpld-hotplug.h
 +F:    drivers/platform/mellanox/
  
  MELLANOX MLX4 core VPI driver
  M:    Tariq Toukan <tariqt@mellanox.com>
@@@ -9016,7 -8929,6 +9016,7 @@@ L:      linux-kernel@vger.kernel.or
  S:    Supported
  F:    kernel/sched/membarrier.c
  F:    include/uapi/linux/membarrier.h
 +F:    arch/powerpc/include/asm/membarrier.h
  
  MEMORY MANAGEMENT
  L:    linux-mm@kvack.org
@@@ -9040,7 -8952,7 +9040,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.infradead.org/linux-mtd.git master
 -T:    git git://git.infradead.org/l2-mtd.git master
 +T:    git git://git.infradead.org/linux-mtd.git mtd/next
  S:    Maintained
  F:    Documentation/devicetree/bindings/mtd/
  F:    drivers/mtd/
@@@ -9129,14 -9041,6 +9129,14 @@@ F:    drivers/media/platform/atmel/atmel-i
  F:    drivers/media/platform/atmel/atmel-isc-regs.h
  F:    devicetree/bindings/media/atmel-isc.txt
  
 +MICROCHIP / ATMEL NAND DRIVER
 +M:    Wenyou Yang <wenyou.yang@microchip.com>
 +M:    Josh Wu <rainyfeeling@outlook.com>
 +L:    linux-mtd@lists.infradead.org
 +S:    Supported
 +F:    drivers/mtd/nand/atmel/*
 +F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
 +
  MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
  M:    Woojung Huh <Woojung.Huh@microchip.com>
  M:    Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
@@@ -9188,7 -9092,6 +9188,7 @@@ S:      Supporte
  F:    Documentation/devicetree/bindings/mips/
  F:    Documentation/mips/
  F:    arch/mips/
 +F:    drivers/platform/mips/
  
  MIPS BOSTON DEVELOPMENT BOARD
  M:    Paul Burton <paul.burton@mips.com>
@@@ -9216,25 -9119,6 +9216,25 @@@ F:    arch/mips/include/asm/mach-loongson3
  F:    drivers/*/*loongson1*
  F:    drivers/*/*/*loongson1*
  
 +MIPS/LOONGSON2 ARCHITECTURE
 +M:    Jiaxun Yang <jiaxun.yang@flygoat.com>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    arch/mips/loongson64/*{2e/2f}*
 +F:    arch/mips/include/asm/mach-loongson64/
 +F:    drivers/*/*loongson2*
 +F:    drivers/*/*/*loongson2*
 +
 +MIPS/LOONGSON3 ARCHITECTURE
 +M:    Huacai Chen <chenhc@lemote.com>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    arch/mips/loongson64/
 +F:    arch/mips/include/asm/mach-loongson64/
 +F:    drivers/platform/mips/cpu_hwmon.c
 +F:    drivers/*/*loongson3*
 +F:    drivers/*/*/*loongson3*
 +
  MIPS RINT INSTRUCTION EMULATION
  M:    Aleksandar Markovic <aleksandar.markovic@mips.com>
  L:    linux-mips@linux-mips.org
@@@ -9280,6 -9164,7 +9280,6 @@@ F:      drivers/media/dvb-frontends/mn88473
  
  MODULE SUPPORT
  M:    Jessica Yu <jeyu@kernel.org>
 -M:    Rusty Russell <rusty@rustcorp.com.au>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
  S:    Maintained
  F:    include/linux/module.h
@@@ -9456,7 -9341,7 +9456,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.infradead.org/linux-mtd.git nand/fixes
 -T:    git git://git.infradead.org/l2-mtd.git nand/next
 +T:    git git://git.infradead.org/linux-mtd.git nand/next
  S:    Maintained
  F:    drivers/mtd/nand/
  F:    include/linux/mtd/*nand*.h
@@@ -9474,8 -9359,8 +9474,8 @@@ F:      drivers/net/ethernet/natsemi/natsemi
  
  NCP FILESYSTEM
  M:    Petr Vandrovec <petr@vandrovec.name>
 -S:    Odd Fixes
 -F:    fs/ncpfs/
 +S:    Obsolete
 +F:    drivers/staging/ncpfs/
  
  NCR 5380 SCSI DRIVERS
  M:    Finn Thain <fthain@telegraphics.com.au>
@@@ -9711,11 -9596,6 +9711,11 @@@ NETWORKING [WIRELESS
  L:    linux-wireless@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-wireless/list/
  
 +NETDEVSIM
 +M:    Jakub Kicinski <jakub.kicinski@netronome.com>
 +S:    Maintained
 +F:    drivers/net/netdevsim/*
 +
  NETXEN (1/10) GbE SUPPORT
  M:    Manish Chopra <manish.chopra@cavium.com>
  M:    Rahul Verma <rahul.verma@cavium.com>
@@@ -9828,7 -9708,7 +9828,7 @@@ F:      drivers/ntb/hw/amd
  NTB DRIVER CORE
  M:    Jon Mason <jdmason@kudzu.us>
  M:    Dave Jiang <dave.jiang@intel.com>
 -M:    Allen Hubbe <Allen.Hubbe@emc.com>
 +M:    Allen Hubbe <allenbh@gmail.com>
  L:    linux-ntb@googlegroups.com
  S:    Supported
  W:    https://github.com/jonmason/ntb/wiki
@@@ -9862,15 -9742,6 +9862,15 @@@ S:    Supporte
  F:    Documentation/filesystems/ntfs.txt
  F:    fs/ntfs/
  
 +NUBUS SUBSYSTEM
 +M:    Finn Thain <fthain@telegraphics.com.au>
 +L:    linux-m68k@lists.linux-m68k.org
 +S:    Maintained
 +F:    arch/*/include/asm/nubus.h
 +F:    drivers/nubus/
 +F:    include/linux/nubus.h
 +F:    include/uapi/linux/nubus.h
 +
  NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
  M:    Antonino Daplas <adaplas@gmail.com>
  L:    linux-fbdev@vger.kernel.org
@@@ -9931,7 -9802,6 +9931,7 @@@ NXP TFA9879 DRIVE
  M:    Peter Rosin <peda@axentia.se>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/tfa9879.txt
  F:    sound/soc/codecs/tfa9879*
  
  NXP-NCI NFC DRIVER
@@@ -9946,18 -9816,6 +9946,18 @@@ M:    Josh Poimboeuf <jpoimboe@redhat.com
  S:    Supported
  F:    tools/objtool/
  
 +OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
 +M:    Frederic Barrat <fbarrat@linux.vnet.ibm.com>
 +M:    Andrew Donnellan <andrew.donnellan@au1.ibm.com>
 +L:    linuxppc-dev@lists.ozlabs.org
 +S:    Supported
 +F:    arch/powerpc/platforms/powernv/ocxl.c
 +F:    arch/powerpc/include/asm/pnv-ocxl.h
 +F:    drivers/misc/ocxl/
 +F:    include/misc/ocxl*
 +F:    include/uapi/misc/ocxl.h
 +F:    Documentation/accelerators/ocxl.txt
 +
  OMAP AUDIO SUPPORT
  M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
  M:    Jarkko Nikula <jarkko.nikula@bitmer.com>
@@@ -10192,14 -10050,6 +10192,14 @@@ S: Maintaine
  F:    drivers/media/i2c/ov7670.c
  F:    Documentation/devicetree/bindings/media/i2c/ov7670.txt
  
 +OMNIVISION OV7740 SENSOR DRIVER
 +M:    Wenyou Yang <wenyou.yang@microchip.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov7740.c
 +F:    Documentation/devicetree/bindings/media/i2c/ov7740.txt
 +
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    linux-mtd@lists.infradead.org
@@@ -10294,7 -10144,7 +10294,7 @@@ F:   include/uapi/linux/openvswitch.
  OPERATING PERFORMANCE POINTS (OPP)
  M:    Viresh Kumar <vireshk@kernel.org>
  M:    Nishanth Menon <nm@ti.com>
 -M:    Stephen Boyd <sboyd@codeaurora.org>
 +M:    Stephen Boyd <sboyd@kernel.org>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
@@@ -10331,7 -10181,8 +10331,8 @@@ F:   fs/ocfs2
  
  ORANGEFS FILESYSTEM
  M:    Mike Marshall <hubcap@omnibond.com>
- L:    pvfs2-developers@beowulf-underground.org (subscribers-only)
+ R:    Martin Brandenburg <martin@omnibond.com>
+ L:    devel@lists.orangefs.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
  S:    Supported
  F:    fs/orangefs/
@@@ -10429,6 -10280,7 +10430,6 @@@ F:   Documentation/parport*.tx
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <jgross@suse.com>
  M:    Alok Kataria <akataria@vmware.com>
 -M:    Rusty Russell <rusty@rustcorp.com.au>
  L:    virtualization@lists.linux-foundation.org
  S:    Supported
  F:    Documentation/virtual/paravirt_ops.txt
@@@ -10547,13 -10399,6 +10548,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/pci/pci-armada8k.txt
  F:    drivers/pci/dwc/pcie-armada8k.c
  
 +PCI DRIVER FOR CADENCE PCIE IP
 +M:    Alan Douglas <adouglas@cadence.com>
 +L:    linux-pci@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/cdns,*.txt
 +F:    drivers/pci/cadence/pcie-cadence*
 +
  PCI DRIVER FOR FREESCALE LAYERSCAPE
  M:    Minghuan Lian <minghuan.Lian@freescale.com>
  M:    Mingkai Hu <mingkai.hu@freescale.com>
@@@ -10704,12 -10549,8 +10705,12 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/
  F:    Documentation/PCI/
 +F:    drivers/acpi/pci*
  F:    drivers/pci/
 +F:    include/asm-generic/pci*
  F:    include/linux/pci*
 +F:    include/uapi/linux/pci*
 +F:    lib/pci*
  F:    arch/x86/pci/
  F:    arch/x86/kernel/quirks.c
  
@@@ -10799,9 -10640,11 +10800,9 @@@ S:  Maintaine
  F:    drivers/pci/dwc/*spear*
  
  PCMCIA SUBSYSTEM
 -P:    Linux PCMCIA Team
 -L:    linux-pcmcia@lists.infradead.org
 -W:    http://lists.infradead.org/mailman/listinfo/linux-pcmcia
 +M:    Dominik Brodowski <linux@dominikbrodowski.net>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/pcmcia/
  F:    tools/pcmcia/
  F:    drivers/pcmcia/
@@@ -10928,16 -10771,6 +10929,16 @@@ M: Heikki Krogerus <heikki.krogerus@lin
  S:    Maintained
  F:    drivers/pinctrl/intel/
  
 +PIN CONTROLLER - MEDIATEK
 +M:    Sean Wang <sean.wang@mediatek.com>
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt
 +F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt
 +F:    drivers/pinctrl/mediatek/pinctrl-mtk-common.*
 +F:    drivers/pinctrl/mediatek/pinctrl-mt2701.c
 +F:    drivers/pinctrl/mediatek/pinctrl-mt7622.c
 +
  PIN CONTROLLER - QUALCOMM
  M:    Bjorn Andersson <bjorn.andersson@linaro.org>
  S:    Maintained
@@@ -11056,7 -10889,6 +11057,7 @@@ F:   include/linux/pm.
  F:    include/linux/pm_*
  F:    include/linux/powercap.h
  F:    drivers/powercap/
 +F:    kernel/configs/nopm.config
  
  POWER STATE COORDINATION INTERFACE (PSCI)
  M:    Mark Rutland <mark.rutland@arm.com>
@@@ -11351,8 -11183,7 +11352,8 @@@ S:   Maintaine
  F:    drivers/firmware/qemu_fw_cfg.c
  
  QIB DRIVER
 -M:    Mike Marciniszyn <infinipath@intel.com>
 +M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 +M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  F:    drivers/infiniband/hw/qib/
@@@ -11379,6 -11210,7 +11380,6 @@@ F:   include/linux/qed
  F:    drivers/net/ethernet/qlogic/qede/
  
  QLOGIC QL4xxx RDMA DRIVER
 -M:    Ram Amrani <Ram.Amrani@cavium.com>
  M:    Michal Kalderon <Michal.Kalderon@cavium.com>
  M:    Ariel Elior <Ariel.Elior@cavium.com>
  L:    linux-rdma@vger.kernel.org
@@@ -11525,7 -11357,6 +11526,7 @@@ F:   drivers/net/wireless/quantenn
  RADEON and AMDGPU DRM DRIVERS
  M:    Alex Deucher <alexander.deucher@amd.com>
  M:    Christian König <christian.koenig@amd.com>
 +M:    David (ChunMing) Zhou <David1.Zhou@amd.com>
  L:    amd-gfx@lists.freedesktop.org
  T:    git git://people.freedesktop.org/~agd5f/linux
  S:    Supported
@@@ -11602,13 -11433,6 +11603,13 @@@ S: Maintaine
  F:    Documentation/blockdev/ramdisk.txt
  F:    drivers/block/brd.c
  
 +RANCHU VIRTUAL BOARD FOR MIPS
 +M:    Miodrag Dinic <miodrag.dinic@mips.com>
 +L:    linux-mips@linux-mips.org
 +S:    Supported
 +F:    arch/mips/generic/board-ranchu.c
 +F:    arch/mips/configs/generic/board-ranchu.config
 +
  RANDOM NUMBER DRIVER
  M:    "Theodore Ts'o" <tytso@mit.edu>
  S:    Maintained
@@@ -11625,6 -11449,15 +11626,6 @@@ L:  linux-wireless@vger.kernel.or
  S:    Orphan
  F:    drivers/net/wireless/ray*
  
 -RCUTORTURE MODULE
 -M:    Josh Triplett <josh@joshtriplett.org>
 -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 -L:    linux-kernel@vger.kernel.org
 -S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 -F:    Documentation/RCU/torture.txt
 -F:    kernel/rcu/rcutorture.c
 -
  RCUTORTURE TEST FRAMEWORK
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  M:    Josh Triplett <josh@joshtriplett.org>
@@@ -11648,7 -11481,6 +11649,7 @@@ F:   drivers/net/ethernet/rdc/r6040.
  
  RDMAVT - RDMA verbs software
  M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
 +M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  F:    drivers/infiniband/sw/rdmavt
@@@ -11926,13 -11758,15 +11927,13 @@@ T:        git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtl818x/rtl8187/
  
 -RTL8192CE WIRELESS DRIVER
 -M:    Larry Finger <Larry.Finger@lwfinger.net>
 -M:    Chaoming Li <chaoming_li@realsil.com.cn>
 +REALTEK WIRELESS DRIVER (rtlwifi family)
 +M:    Ping-Ke Shih <pkshih@realtek.com>
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtlwifi/
 -F:    drivers/net/wireless/realtek/rtlwifi/rtl8192ce/
  
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <Jes.Sorensen@gmail.com>
@@@ -12096,13 -11930,6 +12097,13 @@@ S: Maintaine
  F:    drivers/crypto/exynos-rng.c
  F:    Documentation/devicetree/bindings/crypto/samsung,exynos-rng4.txt
  
 +SAMSUNG EXYNOS TRUE RANDOM NUMBER GENERATOR (TRNG) DRIVER
 +M:    Łukasz Stelmach <l.stelmach@samsung.com>
 +L:    linux-samsung-soc@vger.kernel.org
 +S:    Maintained
 +F:    drivers/char/hw_random/exynos-trng.c
 +F:    Documentation/devicetree/bindings/rng/samsung,exynos5250-trng.txt
 +
  SAMSUNG FRAMEBUFFER DRIVER
  M:    Jingoo Han <jingoohan1@gmail.com>
  L:    linux-fbdev@vger.kernel.org
@@@ -12165,7 -11992,6 +12166,7 @@@ F:   drivers/media/i2c/s5k5baf.
  SAMSUNG S5P Security SubSystem (SSS) DRIVER
  M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Vladimir Zapolskiy <vz@mleia.com>
 +M:    Kamil Konieczny <k.konieczny@partner.samsung.com>
  L:    linux-crypto@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
@@@ -12510,14 -12336,6 +12511,14 @@@ T: git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/si2157*
  
 +SI2165 MEDIA DRIVER
 +M:    Matthias Schwarzott <zzam@gentoo.org>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/si2165*
 +
  SI2168 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -12641,13 -12459,6 +12642,13 @@@ F: lib/siphash.
  F:    lib/test_siphash.c
  F:    include/linux/siphash.h
  
 +SIOX
 +M:    Gavin Schenk <g.schenk@eckelmann.de>
 +M:    Uwe Kleine-König <kernel@pengutronix.de>
 +S:    Supported
 +F:    drivers/siox/*
 +F:    include/trace/events/siox.h
 +
  SIS 190 ETHERNET DRIVER
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
@@@ -12699,14 -12510,6 +12700,14 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    include/linux/srcu.h
  F:    kernel/rcu/srcu.c
  
 +SERIAL LOW-POWER INTER-CHIP MEDIA BUS (SLIMbus)
 +M:    Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/slimbus/
 +F:    Documentation/devicetree/bindings/slimbus/
 +F:    include/linux/slimbus.h
 +
  SMACK SECURITY MODULE
  M:    Casey Schaufler <casey@schaufler-ca.com>
  L:    linux-security-module@vger.kernel.org
@@@ -12788,12 -12591,6 +12789,12 @@@ F: include/media/soc
  F:    drivers/media/i2c/soc_camera/
  F:    drivers/media/platform/soc_camera/
  
 +SOCIONEXT UNIPHIER SOUND DRIVER
 +M:    Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    sound/soc/uniphier/
 +
  SOEKRIS NET48XX LED SUPPORT
  M:    Chris Boot <bootc@bootc.net>
  S:    Maintained
@@@ -12818,15 -12615,6 +12819,15 @@@ L: linux-media@vger.kernel.or
  S:    Supported
  F:    drivers/media/pci/solo6x10/
  
 +SOFTWARE DELEGATED EXCEPTION INTERFACE (SDEI)
 +M:    James Morse <james.morse@arm.com>
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/firmware/sdei.txt
 +F:    drivers/firmware/arm_sdei.c
 +F:    include/linux/sdei.h
 +F:    include/uapi/linux/sdei.h
 +
  SOFTWARE RAID (Multiple Disks) SUPPORT
  M:    Shaohua Li <shli@kernel.org>
  L:    linux-raid@vger.kernel.org
@@@ -12839,13 -12627,6 +12840,13 @@@ F: drivers/md/raid
  F:    include/linux/raid/
  F:    include/uapi/linux/raid/
  
 +SOCIONEXT (SNI) NETSEC NETWORK DRIVER
 +M:    Jassi Brar <jaswinder.singh@linaro.org>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/socionext/netsec.c
 +F:    Documentation/devicetree/bindings/net/socionext-netsec.txt
 +
  SONIC NETWORK DRIVER
  M:    Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  L:    netdev@vger.kernel.org
@@@ -12932,16 -12713,6 +12933,16 @@@ F: Documentation/sound/alsa/soc
  F:    sound/soc/
  F:    include/sound/soc*
  
 +SOUNDWIRE SUBSYSTEM
 +M:    Vinod Koul <vinod.koul@intel.com>
 +M:    Sanyog Kale <sanyog.r.kale@intel.com>
 +R:    Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/driver-api/soundwire/
 +F:    drivers/soundwire/
 +F:    include/linux/soundwire/
 +
  SP2 MEDIA DRIVER
  M:    Olli Salonen <olli.salonen@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -13008,7 -12779,7 +13009,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.infradead.org/linux-mtd.git spi-nor/fixes
 -T:    git git://git.infradead.org/l2-mtd.git spi-nor/next
 +T:    git git://git.infradead.org/linux-mtd.git spi-nor/next
  S:    Maintained
  F:    drivers/mtd/spi-nor/
  F:    include/linux/mtd/spi-nor.h
@@@ -13034,7 -12805,7 +13035,7 @@@ F:   Documentation/networking/spider_net.
  F:    drivers/net/ethernet/toshiba/spider_net*
  
  SPMI SUBSYSTEM
 -R:    Stephen Boyd <sboyd@codeaurora.org>
 +R:    Stephen Boyd <sboyd@kernel.org>
  L:    linux-arm-msm@vger.kernel.org
  F:    Documentation/devicetree/bindings/spmi/
  F:    drivers/spmi/
@@@ -13095,6 -12866,12 +13096,6 @@@ S:  Odd Fixe
  F:    Documentation/devicetree/bindings/staging/iio/
  F:    drivers/staging/iio/
  
 -STAGING - LIRC (LINUX INFRARED REMOTE CONTROL) DRIVERS
 -M:    Jarod Wilson <jarod@wilsonet.com>
 -W:    http://www.lirc.org/
 -S:    Odd Fixes
 -F:    drivers/staging/media/lirc/
 -
  STAGING - LUSTRE PARALLEL FILESYSTEM
  M:    Oleg Drokin <oleg.drokin@intel.com>
  M:    Andreas Dilger <andreas.dilger@intel.com>
@@@ -13255,7 -13032,7 +13256,7 @@@ F:   arch/x86/boot/video
  
  SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:    linux-kernel@vger.kernel.org
 +L:    iommu@lists.linux-foundation.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
  S:    Supported
  F:    lib/swiotlb.c
@@@ -13320,11 -13097,6 +13321,11 @@@ S: Supporte
  F:    drivers/reset/reset-axs10x.c
  F:    Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
  
 +SYNOPSYS DESIGNWARE 8250 UART DRIVER
 +R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +S:    Maintained
 +F:    drivers/tty/serial/8250/8250_dw.c
 +
  SYNOPSYS DESIGNWARE APB GPIO DRIVER
  M:    Hoan Tran <hotran@apm.com>
  L:    linux-gpio@vger.kernel.org
@@@ -13341,6 -13113,7 +13342,6 @@@ F:   include/linux/platform_data/dma-dw.
  F:    drivers/dma/dw/
  
  SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
 -M:    Jie Deng <jiedeng@synopsys.com>
  M:    Jose Abreu <Jose.Abreu@synopsys.com>
  L:    netdev@vger.kernel.org
  S:    Supported
@@@ -13480,15 -13253,6 +13481,15 @@@ T: git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/tda18218*
  
 +TDA18250 MEDIA DRIVER
 +M:    Olli Salonen <olli.salonen@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/tda18250*
 +
  TDA18271 MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
@@@ -13919,7 -13683,7 +13920,7 @@@ F:   include/linux/usb/tilegx.
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
  M:    John Stultz <john.stultz@linaro.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
 -R:    Stephen Boyd <sboyd@codeaurora.org>
 +R:    Stephen Boyd <sboyd@kernel.org>
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
@@@ -14002,18 -13766,6 +14003,18 @@@ L: platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/topstar-laptop.c
  
 +TORTURE-TEST MODULES
 +M:    Davidlohr Bueso <dave@stgolabs.net>
 +M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +M:    Josh Triplett <josh@joshtriplett.org>
 +L:    linux-kernel@vger.kernel.org
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +F:    Documentation/RCU/torture.txt
 +F:    kernel/torture.c
 +F:    kernel/rcu/rcutorture.c
 +F:    kernel/locking/locktorture.c
 +
  TOSHIBA ACPI EXTRAS DRIVER
  M:    Azael Avalos <coproscefalo@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -14056,10 -13808,9 +14057,10 @@@ F: drivers/platform/x86/toshiba-wmi.
  TPM DEVICE DRIVER
  M:    Peter Huewe <peterhuewe@gmx.de>
  M:    Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
 -R:    Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
 +R:    Jason Gunthorpe <jgg@ziepe.ca>
  L:    linux-integrity@vger.kernel.org
  Q:    https://patchwork.kernel.org/project/linux-integrity/list/
 +W:    https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity
  T:    git git://git.infradead.org/users/jjs/linux-tpmdd.git
  S:    Maintained
  F:    drivers/char/tpm/
@@@ -14098,13 -13849,6 +14099,13 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  K:    ^Subject:.*(?i)trivial
  
 +TEMPO SEMICONDUCTOR DRIVERS
 +M:    Steven Eckhoff <steven.eckhoff.opensource@gmail.com>
 +S:    Maintained
 +F:    sound/soc/codecs/tscs*.c
 +F:    sound/soc/codecs/tscs*.h
 +F:    Documentation/devicetree/bindings/sound/tscs*.txt
 +
  TTY LAYER
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  M:    Jiri Slaby <jslaby@suse.com>
@@@ -14266,8 -14010,6 +14267,8 @@@ UNISYS S-PAR DRIVER
  M:    David Kershner <david.kershner@unisys.com>
  L:    sparmaintainer@unisys.com (Unisys internal)
  S:    Supported
 +F:    include/linux/visorbus.h
 +F:    drivers/visorbus/
  F:    drivers/staging/unisys/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
@@@ -14814,15 -14556,6 +14815,15 @@@ S: Maintaine
  F:    drivers/virtio/virtio_input.c
  F:    include/uapi/linux/virtio_input.h
  
 +VIRTUAL BOX GUEST DEVICE DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +M:    Arnd Bergmann <arnd@arndb.de>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +S:    Maintained
 +F:    include/linux/vbox_utils.h
 +F:    include/uapi/linux/vbox*.h
 +F:    drivers/virt/vboxguest/
 +
  VIRTUAL SERIO DEVICE DRIVER
  M:    Stephen Chandler Paul <thatslyude@gmail.com>
  S:    Maintained
@@@ -14914,7 -14647,6 +14915,7 @@@ W:   http://www.slimlogic.co.uk/?p=4
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
  S:    Supported
  F:    Documentation/devicetree/bindings/regulator/
 +F:    Documentation/power/regulator/
  F:    drivers/regulator/
  F:    include/dt-bindings/regulator/
  F:    include/linux/regulator/
@@@ -14987,8 -14719,8 +14988,8 @@@ S:   Maintaine
  F:    drivers/input/tablet/wacom_serial4.c
  
  WATCHDOG DEVICE DRIVERS
 -M:    Wim Van Sebroeck <wim@iguana.be>
 -R:    Guenter Roeck <linux@roeck-us.net>
 +M:    Wim Van Sebroeck <wim@linux-watchdog.org>
 +M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-watchdog@vger.kernel.org
  W:    http://www.linux-watchdog.org/
  T:    git git://www.linux-watchdog.org/linux-watchdog.git
@@@ -15012,9 -14744,9 +15013,9 @@@ S:   Maintaine
  F:    drivers/hid/hid-wiimote*
  
  WILOCITY WIL6210 WIRELESS DRIVER
 -M:    Maya Erez <qca_merez@qca.qualcomm.com>
 +M:    Maya Erez <merez@codeaurora.org>
  L:    linux-wireless@vger.kernel.org
 -L:    wil6210@qca.qualcomm.com
 +L:    wil6210@qti.qualcomm.com
  S:    Supported
  W:    http://wireless.kernel.org/en/users/Drivers/wil6210
  F:    drivers/net/wireless/ath/wil6210/
@@@ -15108,12 -14840,6 +15109,12 @@@ F: include/linux/workqueue.
  F:    kernel/workqueue.c
  F:    Documentation/core-api/workqueue.rst
  
 +X-POWERS AXP288 PMIC DRIVERS
 +M:    Hans de Goede <hdegoede@redhat.com>
 +S:    Maintained
 +N:    axp288
 +F:    drivers/acpi/pmic/intel_pmic_xpower.c
 +
  X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Chen-Yu Tsai <wens@csie.org>
  L:    linux-kernel@vger.kernel.org
@@@ -15155,7 -14881,7 +15156,7 @@@ 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/users/dvhart/linux-platform-drivers-x86.git
 +T:    git git://git.infradead.org/linux-platform-drivers-x86.git
  S:    Maintained
  F:    drivers/platform/x86/
  F:    drivers/platform/olpc/
@@@ -15241,7 -14967,6 +15242,7 @@@ F:   include/xen/interface/io/vscsiif.
  XEN SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
 +L:    iommu@lists.linux-foundation.org
  S:    Supported
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*
diff --combined fs/orangefs/super.c
index 62d49e53061ca0d23a6b03562e091667b14466b4,b28b75c7d275eebf8264e88286f5012720211de8..3ae5fdba0225b5670491b9cbfbf68be7bccf84a9
--- 1/fs/orangefs/super.c
--- 2/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@@ -335,7 -335,7 +335,7 @@@ static int orangefs_encode_fh(struct in
        struct orangefs_object_kref refn;
  
        if (*max_len < len) {
-               gossip_lerr("fh buffer is too small for encoding\n");
+               gossip_err("fh buffer is too small for encoding\n");
                *max_len = len;
                type = 255;
                goto out;
@@@ -383,7 -383,7 +383,7 @@@ static int orangefs_unmount(int id, __s
        op->upcall.req.fs_umount.id = id;
        op->upcall.req.fs_umount.fs_id = fs_id;
        strncpy(op->upcall.req.fs_umount.orangefs_config_server,
-           devname, ORANGEFS_MAX_SERVER_ADDR_LEN);
+           devname, ORANGEFS_MAX_SERVER_ADDR_LEN - 1);
        r = service_operation(op, "orangefs_fs_umount", 0);
        /* Not much to do about an error here. */
        if (r)
@@@ -478,7 -478,7 +478,7 @@@ struct dentry *orangefs_mount(struct fi
  
        strncpy(new_op->upcall.req.fs_mount.orangefs_config_server,
                devname,
-               ORANGEFS_MAX_SERVER_ADDR_LEN);
+               ORANGEFS_MAX_SERVER_ADDR_LEN - 1);
  
        gossip_debug(GOSSIP_SUPER_DEBUG,
                     "Attempting ORANGEFS Mount via host %s\n",
@@@ -520,7 -520,7 +520,7 @@@
         */
        strncpy(ORANGEFS_SB(sb)->devname,
                devname,
-               ORANGEFS_MAX_SERVER_ADDR_LEN);
+               ORANGEFS_MAX_SERVER_ADDR_LEN - 1);
  
        /* mount_pending must be cleared */
        ORANGEFS_SB(sb)->mount_pending = 0;
@@@ -610,16 -610,11 +610,16 @@@ void orangefs_kill_sb(struct super_bloc
  
  int orangefs_inode_cache_initialize(void)
  {
 -      orangefs_inode_cache = kmem_cache_create("orangefs_inode_cache",
 -                                            sizeof(struct orangefs_inode_s),
 -                                            0,
 -                                            ORANGEFS_CACHE_CREATE_FLAGS,
 -                                            orangefs_inode_cache_ctor);
 +      orangefs_inode_cache = kmem_cache_create_usercopy(
 +                                      "orangefs_inode_cache",
 +                                      sizeof(struct orangefs_inode_s),
 +                                      0,
 +                                      ORANGEFS_CACHE_CREATE_FLAGS,
 +                                      offsetof(struct orangefs_inode_s,
 +                                              link_target),
 +                                      sizeof_field(struct orangefs_inode_s,
 +                                              link_target),
 +                                      orangefs_inode_cache_ctor);
  
        if (!orangefs_inode_cache) {
                gossip_err("Cannot create orangefs_inode_cache\n");
Linux 6.x block layer and io_uring tree(s)