Merge tag 'ofs-pull-tag-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap...

Pull orangefs filesystem from Mike Marshall.

This finally merges the long-pending orangefs filesystem, which has been
much cleaned up with input from Al Viro over the last six months.  From
the documentation file:

 "OrangeFS is an LGPL userspace scale-out parallel storage system.  It
  is ideal for large storage problems faced by HPC, BigData, Streaming
  Video, Genomics, Bioinformatics.

  Orangefs, originally called PVFS, was first developed in 1993 by Walt
  Ligon and Eric Blumer as a parallel file system for Parallel Virtual
  Machine (PVM) as part of a NASA grant to study the I/O patterns of
  parallel programs.

  Orangefs features include:

    - Distributes file data among multiple file servers
    - Supports simultaneous access by multiple clients
    - Stores file data and metadata on servers using local file system
      and access methods
    - Userspace implementation is easy to install and maintain
    - Direct MPI support
    - Stateless"

see Documentation/filesystems/orangefs.txt for more in-depth details.

* tag 'ofs-pull-tag-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux: (174 commits)
  orangefs: fix orangefs_superblock locking
  orangefs: fix do_readv_writev() handling of error halfway through
  orangefs: have ->kill_sb() evict the VFS side of things first
  orangefs: sanitize ->llseek()
  orangefs-bufmap.h: trim unused junk
  orangefs: saner calling conventions for getting a slot
  orangefs_copy_{to,from}_bufmap(): don't pass bufmap pointer
  orangefs: get rid of readdir_handle_s
  ornagefs: ensure that truncate has an up to date inode size
  orangefs: move code which sets i_link to orangefs_inode_getattr
  orangefs: remove needless wrapper around GFP_KERNEL
  orangefs: remove wrapper around mutex_lock(&inode->i_mutex)
  orangefs: refactor inode type or link_target change detection
  orangefs: use new getattr for revalidate and remove old getattr
  orangefs: use new getattr in inode getattr and permission
  orangefs: use new orangefs_inode_getattr to get size in write and llseek
  orangefs: use new orangefs_inode_getattr to create new inodes
  orangefs: rename orangefs_inode_getattr to orangefs_inode_old_getattr
  orangefs: remove inode->i_lock wrapper
  orangefs: put register_chrdev immediately before register_filesystem
  ...

diff --combined MAINTAINERS
index df8cf6b924c6deb780e49b0e33075ae49d1bc09e,5e194003e2943a4299e3e79c82c427e4a9de8e0b..03e00c7c88ebca4161bff9d4be82d59f3698f177
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -151,7 -151,7 +151,7 @@@ S: Maintaine
  F:    drivers/scsi/53c700*
  
  6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
 -M:    Alexander Aring <a[email protected]>
 +M:    Alexander Aring <a[email protected]>
  M:    Jukka Rissanen <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -228,22 -228,16 +228,22 @@@ F:      kernel/sys_ni.
  
  ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
  M:    Hans de Goede <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    drivers/hwmon/abituguru.c
  
  ABIT UGURU 3 HARDWARE MONITOR DRIVER
  M:    Alistair John Strachan <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    drivers/hwmon/abituguru3.c
  
 +ACCES 104-DIO-48E GPIO DRIVER
 +M:    William Breathitt Gray <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-104-dio-48e.c
 +
  ACCES 104-IDI-48 GPIO DRIVER
  M:    "William Breathitt Gray" <[email protected]>
  L:    [email protected]
@@@ -392,14 -386,14 +392,14 @@@ F:      Documentation/devicetree/bindings/ne
  
  ADM1025 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/adm1025
  F:    drivers/hwmon/adm1025.c
  
  ADM1029 HARDWARE MONITOR DRIVER
  M:    Corentin Labbe <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    drivers/hwmon/adm1029.c
  
@@@ -444,7 -438,7 +444,7 @@@ F: drivers/video/backlight/adp8860_bl.
  
  ADS1015 HARDWARE MONITOR DRIVER
  M:    Dirk Eibach <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/ads1015
  F:    drivers/hwmon/ads1015.c
@@@ -457,7 -451,7 +457,7 @@@ F: drivers/macintosh/therm_adt746x.
  
  ADT7475 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/adt7475
  F:    drivers/hwmon/adt7475.c
@@@ -634,7 -628,7 +634,7 @@@ F: include/linux/ccp.
  
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
  M:    Huang Rui <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Supported
  F:    Documentation/hwmon/fam15h_power
  F:    drivers/hwmon/fam15h_power.c
@@@ -679,19 -673,11 +679,19 @@@ F:      drivers/gpu/drm/radeon/radeon_kfd.
  F:    drivers/gpu/drm/radeon/radeon_kfd.h
  F:    include/uapi/linux/kfd_ioctl.h
  
 +AMD SEATTLE DEVICE TREE SUPPORT
 +M:    Brijesh Singh <[email protected]>
 +M:    Suravee Suthikulpanit <[email protected]>
 +M:    Tom Lendacky <[email protected]>
 +S:    Supported
 +F:    arch/arm64/boot/dts/amd/
 +
  AMD XGBE DRIVER
  M:    Tom Lendacky <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/amd/xgbe/
 +F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
  
  AMS (Apple Motion Sensor) DRIVER
  M:    Michael Hanselmann <[email protected]>
@@@ -783,12 -769,6 +783,12 @@@ L:       [email protected] (moderat
  S:    Maintained
  F:    sound/aoa/
  
 +APEX EMBEDDED SYSTEMS STX104 DAC DRIVER
 +M:    William Breathitt Gray <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iio/dac/stx104.c
 +
  APM DRIVER
  M:    Jiri Kosina <[email protected]>
  S:    Odd fixes
@@@ -806,7 -786,7 +806,7 @@@ F: drivers/input/mouse/bcm5974.
  
  APPLE SMC DRIVER
  M:    Henrik Rydberg <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Odd fixes
  F:    drivers/hwmon/applesmc.c
  
@@@ -847,12 -827,6 +847,12 @@@ S:       Maintaine
  F:    drivers/net/arcnet/
  F:    include/uapi/linux/if_arcnet.h
  
 +ARM HDLCD DRM DRIVER
 +M:    Liviu Dudau <[email protected]>
 +S:    Supported
 +F:    drivers/gpu/drm/arm/
 +F:    Documentation/devicetree/bindings/display/arm,hdlcd.txt
 +
  ARM MFM AND FLOPPY DRIVERS
  M:    Ian Molton <[email protected]>
  S:    Maintained
@@@ -965,16 -939,6 +965,16 @@@ F:       arch/arm/boot/dts/alpine
  F:    arch/arm64/boot/dts/al/
  F:    drivers/*/*alpine*
  
 +ARM/ARTPEC MACHINE SUPPORT
 +M:    Jesper Nilsson <[email protected]>
 +M:    Lars Persson <[email protected]>
 +M:    Niklas Cassel <[email protected]>
 +S:    Maintained
 +L:    [email protected]
 +F:    arch/arm/mach-artpec
 +F:    arch/arm/boot/dts/artpec6*
 +F:    drivers/clk/clk-artpec6.c
 +
  ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
  M:    Nicolas Ferre <[email protected]>
  M:    Alexandre Belloni <[email protected]>
@@@ -1321,7 -1285,6 +1321,7 @@@ F:      arch/arm/mach-mvebu
  F:    drivers/rtc/rtc-armada38x.c
  F:    arch/arm/boot/dts/armada*
  F:    arch/arm/boot/dts/kirkwood*
 +F:    arch/arm64/boot/dts/marvell/armada*
  
  
  ARM/Marvell Berlin SoC support
@@@ -1540,7 -1503,6 +1540,7 @@@ F:      arch/arm/mach-s5p*
  F:    arch/arm/mach-exynos*/
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
 +F:    drivers/soc/samsung/*
  F:    drivers/spi/spi-s3c*
  F:    sound/soc/samsung/*
  F:    Documentation/arm/Samsung/
@@@ -1838,13 -1800,11 +1838,13 @@@ F:   drivers/edac/synopsys_edac.
  
  ARM SMMU DRIVERS
  M:    Will Deacon <[email protected]>
 +R:    Robin Murphy <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/iommu/arm-smmu.c
  F:    drivers/iommu/arm-smmu-v3.c
  F:    drivers/iommu/io-pgtable-arm.c
 +F:    drivers/iommu/io-pgtable-arm-v7s.c
  
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:    Catalin Marinas <[email protected]>
@@@ -1865,7 -1825,7 +1865,7 @@@ F:      include/media/i2c/as3645a.
  
  ASC7621 HARDWARE MONITOR DRIVER
  M:    George Joseph <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/asc7621
  F:    drivers/hwmon/asc7621.c
@@@ -1958,7 -1918,7 +1958,7 @@@ F:      drivers/net/wireless/ath/carl9170
  
  ATK0110 HWMON DRIVER
  M:    Luca Tettamanti <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    drivers/hwmon/asus_atk0110.c
  
@@@ -1996,12 -1956,6 +1996,12 @@@ M:    Nicolas Ferre <[email protected]
  S:    Supported
  F:    drivers/tty/serial/atmel_serial.c
  
 +ATMEL SAMA5D2 ADC DRIVER
 +M:    Ludovic Desroches <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/iio/adc/at91-sama5d2_adc.c
 +
  ATMEL Audio ALSA driver
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2204,8 -2158,7 +2204,8 @@@ M:      Marek Lindner <mareklindner@neomailb
  M:    Simon Wunderlich <[email protected]>
  M:    Antonio Quartulli <[email protected]>
  L:    [email protected]
 -W:    http://www.open-mesh.org/
 +W:    https://www.open-mesh.org/
 +Q:    https://patchwork.open-mesh.org/project/batman/list/
  S:    Maintained
  F:    net/batman-adv/
  
@@@ -2434,9 -2387,8 +2434,9 @@@ F:      arch/arm/boot/dts/bcm470
  
  BROADCOM BCM63XX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
 -L:    [email protected]
 -T:    git git://github.com/broadcom/arm-bcm63xx.git
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +T:    git git://github.com/broadcom/stblinux.git
  S:    Maintained
  F:    arch/arm/mach-bcm/bcm63xx.c
  F:    arch/arm/include/debug/bcm63xx.S
@@@ -2470,14 -2422,12 +2470,14 @@@ F:   arch/mips/bmips/
  F:    arch/mips/include/asm/mach-bmips/*
  F:    arch/mips/kernel/*bmips*
  F:    arch/mips/boot/dts/brcm/bcm*.dts*
 +F:    drivers/irqchip/irq-bcm63*
  F:    drivers/irqchip/irq-bcm7*
  F:    drivers/irqchip/irq-brcmstb*
  F:    include/linux/bcm963xx_nvram.h
  F:    include/linux/bcm963xx_tag.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
 +M:    Siva Reddy Kallam <[email protected]>
  M:    Prashant Sreedharan <[email protected]>
  M:    Michael Chan <[email protected]>
  L:    [email protected]
@@@ -2569,13 -2519,6 +2569,13 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
  
 +BROADCOM VULCAN ARM64 SOC
 +M:    Jayachandran C. <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm64/boot/dts/broadcom/vulcan*
 +
  BROCADE BFA FC SCSI DRIVER
  M:    Anil Gurumurthy <[email protected]>
  M:    Sudarsana Kalluru <[email protected]>
@@@ -3094,7 -3037,7 +3094,7 @@@ F:      mm/swap_cgroup.
  
  CORETEMP HARDWARE MONITORING DRIVER
  M:    Fenghua Yu <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/coretemp
  F:    drivers/hwmon/coretemp.c
@@@ -3561,14 -3504,6 +3561,14 @@@ F:    include/linux/device-mapper.
  F:    include/linux/dm-*.h
  F:    include/uapi/linux/dm-*.h
  
 +DEVLINK
 +M:    Jiri Pirko <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    net/core/devlink.c
 +F:    include/net/devlink.h
 +F:    include/uapi/linux/devlink.h
 +
  DIALOG SEMICONDUCTOR DRIVERS
  M:    Support Opensource <[email protected]>
  W:    http://www.dialog-semiconductor.com/products
@@@ -3606,6 -3541,13 +3606,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/staging/dgnc/
  
 -DIGI EPCA PCI PRODUCTS
 -M:    Lidza Louina <[email protected]>
 -M:    Daeseok Youn <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/staging/dgap/
 -
  DIOLAN U2C-12 I2C DRIVER
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
@@@ -3683,7 -3625,7 +3683,7 @@@ T:      git git://git.infradead.org/users/vk
  
  DME1737 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/dme1737
  F:    drivers/hwmon/dme1737.c
@@@ -3762,7 -3704,7 +3762,7 @@@ F:      drivers/gpu/vga
  F:    include/drm/
  F:    include/uapi/drm/
  
 -RADEON DRM DRIVERS
 +RADEON and AMDGPU DRM DRIVERS
  M:    Alex Deucher <[email protected]>
  M:    Christian König <[email protected]>
  L:    [email protected]
@@@ -3770,8 -3712,6 +3770,8 @@@ T:      git git://people.freedesktop.org/~ag
  S:    Supported
  F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/radeon*
 +F:    drivers/gpu/drm/amd/
 +F:    include/uapi/drm/amdgpu*
  
  DRM PANEL DRIVERS
  M:    Thierry Reding <[email protected]>
@@@ -3816,7 -3756,7 +3816,7 @@@ F:      include/drm/exynos
  F:    include/uapi/drm/exynos*
  
  DRM DRIVERS FOR FREESCALE DCU
 -M:    Jianwei Wang <[email protected]>
 +M:    Stefan Agner <[email protected]>
  M:    Alison Wang <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -4288,6 -4228,13 +4288,6 @@@ M:     Maxim Levitsky <maximlevitsky@gmail.
  S:    Maintained
  F:    drivers/media/rc/ene_ir.*
  
 -ENHANCED ERROR HANDLING (EEH)
 -M:    Gavin Shan <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    Documentation/powerpc/eeh-pci-error-recovery.txt
 -F:    arch/powerpc/kernel/eeh*.c
 -
  EPSON S1D13XXX FRAMEBUFFER DRIVER
  M:    Kristoffer Ericson <[email protected]>
  S:    Maintained
@@@ -4364,12 -4311,6 +4364,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/gpu/drm/exynos/exynos_dp*
  
 +EXYNOS SYSMMU (IOMMU) driver
 +M:    Marek Szyprowski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iommu/exynos-iommu.c
 +
  EXYNOS MIPI DISPLAY DRIVERS
  M:    Inki Dae <[email protected]>
  M:    Donghwa Lee <[email protected]>
@@@ -4381,7 -4322,7 +4381,7 @@@ F:      include/video/exynos_mipi
  
  F71805F HARDWARE MONITORING DRIVER
  M:    Jean Delvare <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/f71805f
  F:    drivers/hwmon/f71805f.c
@@@ -4460,7 -4401,7 +4460,7 @@@ F:      fs/
  
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    Riku Voipio <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    drivers/hwmon/f75375s.c
  F:    include/linux/f75375s.h
@@@ -4885,14 -4826,10 +4885,14 @@@ L:   [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
  S:    Maintained
  F:    Documentation/gpio/
 +F:    Documentation/ABI/testing/gpio-cdev
 +F:    Documentation/ABI/obsolete/sysfs-gpio
  F:    drivers/gpio/
  F:    include/linux/gpio/
  F:    include/linux/gpio.h
  F:    include/asm-generic/gpio.h
 +F:    include/uapi/linux/gpio.h
 +F:    tools/gpio/
  
  GRE DEMULTIPLEXER DRIVER
  M:    Dmitry Kozlov <[email protected]>
@@@ -5021,8 -4958,8 +5021,8 @@@ F:      drivers/media/usb/hackrf
  HARDWARE MONITORING
  M:    Jean Delvare <[email protected]>
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 -W:    http://www.lm-sensors.org/
 +L:    l[email protected].org
 +W:    http://hwmon.wiki.kernel.org/
  T:    quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
  S:    Maintained
@@@ -5041,7 -4978,6 +5041,7 @@@ F:      include/linux/hw_random.
  
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <[email protected]>
 +M:    Bjorn Andersson <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
  F:    Documentation/hwspinlock.txt
@@@ -5063,10 -4999,16 +5063,10 @@@ T:   git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/dvb-frontends/hd29l2*
  
 -HEWLETT-PACKARD SMART2 RAID DRIVER
 -L:    [email protected]
 -S:    Orphan
 -F:    Documentation/blockdev/cpqarray.txt
 -F:    drivers/block/cpqarray.*
 -
  HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
 -M:    Don Brace <don.brace@pmcs.com>
 +M:    Don Brace <don.brace@microsemi.com>
  L:    [email protected]
 -L:    storagedev@pmcs.com
 +L:    esc.storagedev@microsemi.com
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/hpsa.txt
@@@ -5075,9 -5017,9 +5075,9 @@@ F:      include/linux/cciss*.
  F:    include/uapi/linux/cciss*.h
  
  HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
 -M:    Don Brace <don.brace@pmcs.com>
 +M:    Don Brace <don.brace@microsemi.com>
  L:    [email protected]
 -L:    storagedev@pmcs.com
 +L:    esc.storagedev@microsemi.com
  L:    [email protected]
  S:    Supported
  F:    Documentation/blockdev/cciss.txt
@@@ -5262,7 -5204,6 +5262,7 @@@ F:      arch/x86/kernel/cpu/mshyperv.
  F:    drivers/hid/hid-hyperv.c
  F:    drivers/hv/
  F:    drivers/input/serio/hyperv-keyboard.c
 +F:    drivers/pci/host/pci-hyperv.c
  F:    drivers/net/hyperv/
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/video/fbdev/hyperv_fb.c
@@@ -5270,16 -5211,6 +5270,16 @@@ F:    include/linux/hyperv.
  F:    tools/hv/
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  
 +I2C MUXES
 +M:    Peter Rosin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/i2c/muxes/
 +F:    Documentation/devicetree/bindings/i2c/i2c-mux*
 +F:    drivers/i2c/i2c-mux.c
 +F:    drivers/i2c/muxes/
 +F:    include/linux/i2c-mux.h
 +
  I2C OVER PARALLEL PORT
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
@@@ -5504,11 -5435,10 +5504,11 @@@ S:   Supporte
  F:    drivers/idle/i7300_idle.c
  
  IEEE 802.15.4 SUBSYSTEM
 -M:    Alexander Aring <a[email protected]>
 +M:    Alexander Aring <a[email protected]>
  L:    [email protected]
 -W:    https://github.com/linux-wpan
 -T:    git git://github.com/linux-wpan/linux-wpan-next.git
 +W:    http://wpan.cakelab.org/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
  S:    Maintained
  F:    net/ieee802154/
  F:    net/mac802154/
@@@ -5554,7 -5484,7 +5554,7 @@@ F:      drivers/usb/atm/ueagle-atm.
  
  INA209 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/ina209
  F:    Documentation/devicetree/bindings/i2c/ina209.txt
@@@ -5562,7 -5492,7 +5562,7 @@@ F:      drivers/hwmon/ina209.
  
  INA2XX HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/ina2xx
  F:    drivers/hwmon/ina2xx.c
@@@ -5638,7 -5568,6 +5638,7 @@@ F:      drivers/input
  F:    include/linux/input.h
  F:    include/uapi/linux/input.h
  F:    include/linux/input/
 +F:    Documentation/devicetree/bindings/input/
  
  INPUT MULTITOUCH (MT) PROTOCOL
  M:    Henrik Rydberg <[email protected]>
@@@ -5770,16 -5699,6 +5770,16 @@@ F:    Documentation/networking/i40evf.tx
  F:    drivers/net/ethernet/intel/
  F:    drivers/net/ethernet/intel/*/
  
 +INTEL RDMA RNIC DRIVER
 +M:     Faisal Latif <[email protected]>
 +R:     Chien Tin Tung <[email protected]>
 +R:     Mustafa Ismail <[email protected]>
 +R:     Shiraz Saleem <[email protected]>
 +R:     Tatyana Nikolova <[email protected]>
 +L:     [email protected]
 +S:     Supported
 +F:     drivers/infiniband/hw/i40iw/
 +
  INTEL-MID GPIO DRIVER
  M:    David Cohen <[email protected]>
  L:    [email protected]
@@@ -5843,7 -5762,6 +5843,7 @@@ S:      Supporte
  F:    include/uapi/linux/mei.h
  F:    include/linux/mei_cl_bus.h
  F:    drivers/misc/mei/*
 +F:    drivers/watchdog/mei_wdt.c
  F:    Documentation/misc-devices/mei/*
  
  INTEL MIC DRIVERS (mic)
@@@ -6067,7 -5985,7 +6067,7 @@@ F:      drivers/isdn/hardware/eicon
  
  IT87 HARDWARE MONITORING DRIVER
  M:    Jean Delvare <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/it87
  F:    drivers/hwmon/it87.c
@@@ -6103,7 -6021,7 +6103,7 @@@ F:      drivers/media/dvb-frontends/ix2505v
  
  JC42.4 TEMPERATURE SENSOR DRIVER
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    drivers/hwmon/jc42.c
  F:    Documentation/hwmon/jc42
@@@ -6146,39 -6064,25 +6146,39 @@@ S:   Maintaine
  F:    drivers/media/platform/rcar_jpu.c
  
  JSM Neo PCI based serial card
 -M:    Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
 +M:    Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/tty/serial/jsm/
  
  K10TEMP HARDWARE MONITORING DRIVER
  M:    Clemens Ladisch <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/k10temp
  F:    drivers/hwmon/k10temp.c
  
  K8TEMP HARDWARE MONITORING DRIVER
  M:    Rudolf Marek <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/k8temp
  F:    drivers/hwmon/k8temp.c
  
 +KASAN
 +M:    Andrey Ryabinin <[email protected]>
 +R:    Alexander Potapenko <[email protected]>
 +R:    Dmitry Vyukov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/*/include/asm/kasan.h
 +F:    arch/*/mm/kasan_init*
 +F:    Documentation/kasan.txt
 +F:    include/linux/kasan.h
 +F:    lib/test_kasan.c
 +F:    mm/kasan/
 +F:    scripts/Makefile.kasan
 +
  KCONFIG
  M:    "Yann E. MORIN" <[email protected]>
  L:    [email protected]
@@@ -6678,10 -6582,9 +6678,10 @@@ F:    drivers/platform/x86/hp_accel.
  
  LIVE PATCHING
  M:    Josh Poimboeuf <[email protected]>
 -M:    Seth Jennings <sjenning@redhat.com>
 +M:    Jessica Yu <jeyu@redhat.com>
  M:    Jiri Kosina <[email protected]>
 -M:    Vojtech Pavlik <[email protected]>
 +M:    Miroslav Benes <[email protected]>
 +R:    Petr Mladek <[email protected]>
  S:    Maintained
  F:    kernel/livepatch/
  F:    include/linux/livepatch.h
@@@ -6692,11 -6595,6 +6692,11 @@@ F:    samples/livepatch
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
  
 +LINUX KERNEL DUMP TEST MODULE (LKDTM)
 +M:    Kees Cook <[email protected]>
 +S:    Maintained
 +F:    drivers/misc/lkdtm.c
 +
  LLC (802.2)
  M:    Arnaldo Carvalho de Melo <[email protected]>
  S:    Maintained
@@@ -6707,27 -6605,27 +6707,27 @@@ F:   net/llc
  
  LM73 HARDWARE MONITOR DRIVER
  M:    Guillaume Ligneul <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    drivers/hwmon/lm73.c
  
  LM78 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/lm78
  F:    drivers/hwmon/lm78.c
  
  LM83 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/lm83
  F:    drivers/hwmon/lm83.c
  
  LM90 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/lm90
  F:    Documentation/devicetree/bindings/hwmon/lm90.txt
@@@ -6735,7 -6633,7 +6735,7 @@@ F:      drivers/hwmon/lm90.
  
  LM95234 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/lm95234
  F:    drivers/hwmon/lm95234.c
@@@ -6782,12 -6680,13 +6782,12 @@@ S:   Maintaine
  F:    arch/arm/mach-lpc32xx/
  
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 -M:    Nagalakshmi Nandigama <[email protected]>
 -M:    Praveen Krishnamoorthy <[email protected]>
 -M:    Sreekanth Reddy <[email protected]>
 -M:    Abhijit Mahajan <[email protected]>
 -L:    [email protected]
 +M:    Sathya Prakash <[email protected]>
 +M:    Chaitra P B <[email protected]>
 +M:    Suganath Prabu Subramani <[email protected]>
 +L:    [email protected]
  L:    [email protected]
 -W:    http://www.lsilogic.com/support
 +W:    http://www.avagotech.com/support/
  S:    Supported
  F:    drivers/message/fusion/
  F:    drivers/scsi/mpt2sas/
@@@ -6801,7 -6700,7 +6801,7 @@@ F:      drivers/scsi/sym53c8xx_2
  
  LTC4261 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/ltc4261
  F:    drivers/hwmon/ltc4261.c
@@@ -6971,28 -6870,28 +6971,28 @@@ F:   include/uapi/linux/matroxfb.
  
  MAX16065 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/max16065
  F:    drivers/hwmon/max16065.c
  
  MAX20751 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/max20751
  F:    drivers/hwmon/max20751.c
  
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    "Hans J. Koch" <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/max6650
  F:    drivers/hwmon/max6650.c
  
  MAX6697 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/max6697
  F:    Documentation/devicetree/bindings/i2c/max6697.txt
@@@ -7010,7 -6909,7 +7010,7 @@@ MAXIM MAX77802 MULTIFUNCTION PMIC DEVIC
  M:    Javier Martinez Canillas <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/*/*max77802.c
 +F:    drivers/*/*max77802*.c
  F:    Documentation/devicetree/bindings/*/*max77802.txt
  F:    include/dt-bindings/*/*max77802.h
  
@@@ -7020,7 -6919,7 +7020,7 @@@ M:      Krzysztof Kozlowski <k.kozlowski@sam
  L:    [email protected]
  S:    Supported
  F:    drivers/*/max14577.c
 -F:    drivers/*/max77686.c
 +F:    drivers/*/max77686*.c
  F:    drivers/*/max77693.c
  F:    drivers/extcon/extcon-max14577.c
  F:    drivers/extcon/extcon-max77693.c
@@@ -7125,13 -7024,6 +7125,13 @@@ F:    include/uapi/linux/meye.
  F:    include/uapi/linux/ivtv*
  F:    include/uapi/linux/uvcvideo.h
  
 +MEDIATEK ETHERNET DRIVER
 +M:    Felix Fietkau <[email protected]>
 +M:    John Crispin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/mediatek/
 +
  MEDIATEK MT7601U WIRELESS LAN DRIVER
  M:    Jakub Kicinski <[email protected]>
  L:    [email protected]
@@@ -7343,8 -7235,10 +7343,8 @@@ L:     [email protected]
  W:    https://linuxtv.org
  W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  S:    Maintained
 -F:    drivers/staging/media/mn88473/
 -F:    drivers/media/dvb-frontends/mn88473.h
 +F:    drivers/media/dvb-frontends/mn88473*
  
  MODULE SUPPORT
  M:    Rusty Russell <[email protected]>
@@@ -7561,7 -7455,7 +7561,7 @@@ F:      drivers/scsi/NCR_D700.
  
  NCT6775 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/nct6775
  F:    drivers/hwmon/nct6775.c
@@@ -7629,6 -7523,7 +7629,6 @@@ F:      net/netrom
  
  NETRONOME ETHERNET DRIVERS
  M:    Jakub Kicinski <[email protected]>
 -M:    Rolf Neugebauer <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/netronome/
@@@ -7765,6 -7660,7 +7765,6 @@@ F:      net/nfc
  F:    include/net/nfc/
  F:    include/uapi/linux/nfc.h
  F:    drivers/nfc/
 -F:    include/linux/platform_data/microread.h
  F:    include/linux/platform_data/nfcmrvl.h
  F:    include/linux/platform_data/nxp-nci.h
  F:    include/linux/platform_data/pn544.h
@@@ -7915,11 -7811,6 +7915,11 @@@ L:    [email protected] (moderat
  S:    Maintained
  F:    sound/soc/codecs/tfa9879*
  
 +OBJTOOL
 +M:    Josh Poimboeuf <[email protected]>
 +S:    Supported
 +F:    tools/objtool/
 +
  OMAP SUPPORT
  M:    Tony Lindgren <[email protected]>
  L:    [email protected]
@@@ -7970,7 -7861,7 +7970,7 @@@ S:      Maintaine
  F:    arch/arm/*omap*/*clock*
  
  OMAP POWER MANAGEMENT SUPPORT
 -M:    Kevin Hilman <khilman@deeprootsystems.com>
 +M:    Kevin Hilman <khilman@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    arch/arm/*omap*/*pm*
@@@ -8074,7 -7965,7 +8074,7 @@@ F:      arch/arm/*omap*/usb
  OMAP GPIO DRIVER
  M:    Grygorii Strashko <[email protected]>
  M:    Santosh Shilimkar <[email protected]>
 -M:    Kevin Hilman <khilman@deeprootsystems.com>
 +M:    Kevin Hilman <khilman@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/gpio-omap.txt
@@@ -8251,6 -8142,14 +8251,14 @@@ S:    Supporte
  F:    fs/overlayfs/
  F:    Documentation/filesystems/overlayfs.txt
  
+ ORANGEFS FILESYSTEM
+ M:    Mike Marshall <[email protected]>
+ L:    [email protected]
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
+ S:    Supported
+ F:    fs/orangefs/
+ F:    Documentation/filesystems/orangefs.txt
+ 
  P54 WIRELESS DRIVER
  M:    Christian Lamparter <[email protected]>
  L:    [email protected]
@@@ -8293,13 -8192,6 +8301,13 @@@ S:    Maintaine
  F:    Documentation/mn10300/
  F:    arch/mn10300/
  
 +PARALLEL LCD/KEYPAD PANEL DRIVER
 +M:      Willy Tarreau <[email protected]>
 +M:      Ksenija Stanojevic <[email protected]>
 +S:      Odd Fixes
 +F:      Documentation/misc-devices/lcd-panel-cgram.txt
 +F:      drivers/misc/panel.c
 +
  PARALLEL PORT SUBSYSTEM
  M:    Sudip Mukherjee <[email protected]>
  M:    Sudip Mukherjee <[email protected]>
@@@ -8351,7 -8243,7 +8359,7 @@@ F:      drivers/video/logo/logo_parisc
  
  PC87360 HARDWARE MONITORING DRIVER
  M:    Jim Cromie <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/pc87360
  F:    drivers/hwmon/pc87360.c
@@@ -8363,7 -8255,7 +8371,7 @@@ F:      drivers/char/pc8736x_gpio.
  
  PC87427 HARDWARE MONITORING DRIVER
  M:    Jean Delvare <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/pc87427
  F:    drivers/hwmon/pc87427.c
@@@ -8391,15 -8283,6 +8399,15 @@@ L:    [email protected]
  S:    Supported
  F:    Documentation/PCI/pci-error-recovery.txt
  
 +PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
 +M:    Russell Currey <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/powerpc/eeh-pci-error-recovery.txt
 +F:    arch/powerpc/kernel/eeh*.c
 +F:    arch/powerpc/platforms/*/eeh*.c
 +F:    arch/powerpc/include/*/eeh*.h
 +
  PCI SUBSYSTEM
  M:    Bjorn Helgaas <[email protected]>
  L:    [email protected]
@@@ -8507,20 -8390,12 +8515,20 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/pci/host/*designware*
  
 +PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE
 +M:    Joao Pinto <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/designware-pcie.txt
 +F:    drivers/pci/host/pcie-designware-plat.c
 +
  PCI DRIVER FOR GENERIC OF HOSTS
  M:    Will Deacon <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
 +F:    drivers/pci/host/pci-host-common.c
  F:    drivers/pci/host/pci-host-generic.c
  
  PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
@@@ -8566,14 -8441,6 +8574,14 @@@ L:     [email protected]
  S:     Maintained
  F:     drivers/pci/host/*qcom*
  
 +PCIE DRIVER FOR CAVIUM THUNDERX
 +M:    David Daney <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/pci-thunder-*
 +F:    drivers/pci/host/pci-thunder-*
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    [email protected]
@@@ -8599,7 -8466,7 +8607,7 @@@ F:      include/crypto/pcrypt.
  
  PER-CPU MEMORY ALLOCATOR
  M:    Tejun Heo <[email protected]>
 -M:    Christoph Lameter <cl@linux-foundation.org>
 +M:    Christoph Lameter <cl@linux.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git
  S:    Maintained
  F:    include/linux/percpu*.h
@@@ -8616,7 -8483,6 +8624,7 @@@ PERFORMANCE EVENTS SUBSYSTE
  M:    Peter Zijlstra <[email protected]>
  M:    Ingo Molnar <[email protected]>
  M:    Arnaldo Carvalho de Melo <[email protected]>
 +R:    Alexander Shishkin <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Supported
@@@ -8743,8 -8609,8 +8751,8 @@@ F:      drivers/rtc/rtc-puv3.
  
  PMBUS HARDWARE MONITORING DRIVERS
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 -W:    http://www.lm-sensors.org/
 +L:    l[email protected].org
 +W:    http://hwmon.wiki.kernel.org/
  W:    http://www.roeck-us.net/linux/drivers/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
  S:    Maintained
@@@ -8949,7 -8815,7 +8957,7 @@@ F:      drivers/media/usb/pwc/
  
  PWM FAN DRIVER
  M:    Kamil Debski <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Supported
  F:    Documentation/devicetree/bindings/hwmon/pwm-fan.txt
  F:    Documentation/hwmon/pwm-fan
@@@ -9239,20 -9105,10 +9247,20 @@@ S:   Maintaine
  F:    drivers/net/ethernet/rdc/r6040.c
  
  RDS - RELIABLE DATAGRAM SOCKETS
 -M:    Chien Yen <[email protected]>
 +M:    Santosh Shilimkar <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 +W:    https://oss.oracle.com/projects/rds/
  S:    Supported
  F:    net/rds/
 +F:    Documentation/networking/rds.txt
 +
 +RDMAVT - RDMA verbs software
 +M:    Dennis Dalessandro <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/infiniband/sw/rdmavt
  
  READ-COPY UPDATE (RCU)
  M:    "Paul E. McKenney" <[email protected]>
@@@ -9305,7 -9161,6 +9313,7 @@@ F:      include/linux/regmap.
  
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
  M:    Ohad Ben-Cohen <[email protected]>
 +M:    Bjorn Andersson <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
  S:    Maintained
  F:    drivers/remoteproc/
@@@ -9314,7 -9169,6 +9322,7 @@@ F:      include/linux/remoteproc.
  
  REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
  M:    Ohad Ben-Cohen <[email protected]>
 +M:    Bjorn Andersson <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
  S:    Maintained
  F:    drivers/rpmsg/
@@@ -9653,7 -9507,6 +9661,7 @@@ F:      drivers/media/i2c/s5k5baf.
  
  SAMSUNG S3FWRN5 NFC DRIVER
  M:    Robert Baldyga <[email protected]>
 +M:    Krzysztof Opasiak <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    drivers/nfc/s3fwrn5
@@@ -9716,9 -9569,9 +9724,9 @@@ F: Documentation/devicetree/bindings/ne
  F: drivers/net/ethernet/synopsys/dwc_eth_qos.c
  
  SYNOPSYS DESIGNWARE I2C DRIVER
 -M:    Andy Shevchenko <[email protected]>
  M:    Jarkko Nikula <[email protected]>
 -M:    Mika Westerberg <[email protected]>
 +R:    Andy Shevchenko <[email protected]>
 +R:    Mika Westerberg <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-designware-*
@@@ -9827,7 -9680,7 +9835,7 @@@ F:      drivers/scsi/sg.
  F:    include/scsi/sg.h
  
  SCSI SUBSYSTEM
 -M:    "James E.J. Bottomley" <JBottomley@odin.com>
 +M:    "James E.J. Bottomley" <[email protected].com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
  M:    "Martin K. Petersen" <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
@@@ -9884,12 -9737,10 +9892,12 @@@ S:   Maintaine
  F:    drivers/mmc/host/sdricoh_cs.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 +M:    Adrian Hunter <[email protected]>
  L:    [email protected]
 -S:    Orphan
 -F:    drivers/mmc/host/sdhci.*
 -F:    drivers/mmc/host/sdhci-pltfm.[ch]
 +T:    git git://git.infradead.org/users/ahunter/linux-sdhci.git
 +S:    Maintained
 +F:    drivers/mmc/host/sdhci*
 +F:    include/linux/mmc/sdhci*
  
  SECURE COMPUTING
  M:    Kees Cook <[email protected]>
@@@ -10139,7 -9990,7 +10147,7 @@@ F:    arch/arm/mach-s3c24xx/bast-irq.
  
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <[email protected]>
 -M:    Kevin Hilman <khilman@deeprootsystems.com>
 +M:    Kevin Hilman <khilman@kernel.org>
  T:    git git://gitorious.org/linux-davinci/linux-davinci.git
  Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
@@@ -10270,28 -10121,28 +10278,28 @@@ F:        Documentation/devicetree/bindings/me
  
  SMM665 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/smm665
  F:    drivers/hwmon/smm665.c
  
  SMSC EMC2103 HARDWARE MONITOR DRIVER
  M:    Steve Glendinning <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/emc2103
  F:    drivers/hwmon/emc2103.c
  
  SMSC SCH5627 HARDWARE MONITOR DRIVER
  M:    Hans de Goede <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Supported
  F:    Documentation/hwmon/sch5627
  F:    drivers/hwmon/sch5627.c
  
  SMSC47B397 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/smsc47b397
  F:    drivers/hwmon/smsc47b397.c
@@@ -10341,7 -10192,7 +10349,7 @@@ F:   drivers/media/pci/solo6x10
  SOFTWARE RAID (Multiple Disks) SUPPORT
  M:    Shaohua Li <[email protected]>
  L:    [email protected]
 -T:    git git://neil.brown.name/md
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
  S:    Supported
  F:    drivers/md/
  F:    include/linux/raid/
@@@ -10575,6 -10426,19 +10583,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/staging/nvec/
  
 -STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 -M:    Jens Frederich <[email protected]>
 -M:    Daniel Drake <[email protected]>
 -M:    Jon Nettleton <[email protected]>
 -W:    http://wiki.laptop.org/go/DCON
 -S:    Maintained
 -F:    drivers/staging/olpc_dcon/
 -
 -STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER
 -M:    Willy Tarreau <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/panel/
 -
  STAGING - REALTEK RTL8712U DRIVERS
  M:    Larry Finger <[email protected]>
  M:    Florian Schilhabel <[email protected]>.
@@@ -11023,14 -10887,6 +11031,14 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/thermal/ti-soc-thermal/
  
 +TI VPE/CAL DRIVERS
 +M:    Benoit Parrot <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +S:    Maintained
 +F:    drivers/media/platform/ti-vpe/
 +
  TI CDCE706 CLOCK DRIVER
  M:    Max Filippov <[email protected]>
  S:    Maintained
@@@ -11219,7 -11075,7 +11227,7 @@@ F:   include/linux/mmc/sh_mobile_sdhi.
  
  TMP401 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/tmp401
  F:    drivers/hwmon/tmp401.c
@@@ -11254,8 -11110,8 +11262,8 @@@ M:   Jarkko Sakkinen <jarkko.sakkinen@lin
  R:    Jason Gunthorpe <[email protected]>
  W:    http://tpmdd.sourceforge.net
  L:    [email protected] (moderated for non-subscribers)
 -Q:    git git://github.com/PeterHuewe/linux-tpmdd.git
 -T:    git https://github.com/PeterHuewe/linux-tpmdd
 +Q:    https://patchwork.kernel.org/project/tpmdd-devel/list/
 +T:    git git://git.infradead.org/users/jjs/linux-tpmdd.git
  S:    Maintained
  F:    drivers/char/tpm/
  
@@@ -11340,13 -11196,12 +11348,13 @@@ S:        Maintaine
  F:    drivers/scsi/u14-34f.c
  
  UBI FILE SYSTEM (UBIFS)
 +M:    Richard Weinberger <[email protected]>
  M:    Artem Bityutskiy <[email protected]>
  M:    Adrian Hunter <[email protected]>
  L:    [email protected]
  T:    git git://git.infradead.org/ubifs-2.6.git
  W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
 -S:    Maintained
 +S:    Supported
  F:    Documentation/filesystems/ubifs.txt
  F:    fs/ubifs/
  
@@@ -11411,6 -11266,7 +11419,6 @@@ F:   include/linux/cdrom.
  F:    include/uapi/linux/cdrom.h
  
  UNISYS S-PAR DRIVERS
 -M:    Benjamin Romer <[email protected]>
  M:    David Kershner <[email protected]>
  L:    [email protected] (Unisys internal)
  S:    Supported
@@@ -11435,7 -11291,7 +11443,7 @@@ F:   include/linux/mtd/ubi.
  F:    include/uapi/mtd/ubi-user.h
  
  USB ACM DRIVER
 -M:    Oliver Neukum <o[email protected]>
 +M:    Oliver Neukum <o[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/usb/acm.txt
@@@ -11520,13 -11376,6 +11528,13 @@@ S: Maintaine
  F:    drivers/usb/host/isp116x*
  F:    include/linux/usb/isp116x.h
  
 +USB LAN78XX ETHERNET DRIVER
 +M:    Woojung Huh <[email protected]>
 +M:    Microchip Linux Driver Support <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/usb/lan78xx.*
 +
  USB MASS STORAGE DRIVER
  M:    Matthew Dharm <[email protected]>
  L:    [email protected]
@@@ -11566,7 -11415,6 +11574,7 @@@ M:   Valentina Manea <valentina.manea.m@g
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/usb/usbip_protocol.txt
  F:    drivers/usb/usbip/
  F:    tools/usb/usbip/
  
@@@ -11972,14 -11820,14 +11980,14 @@@ F:        Documentation/networking/vrf.tx
  
  VT1211 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/vt1211
  F:    drivers/hwmon/vt1211.c
  
  VT8231 HARDWARE MONITOR DRIVER
  M:    Roger Lucas <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    drivers/hwmon/vt8231.c
  
@@@ -11998,21 -11846,21 +12006,21 @@@ F:        drivers/w1
  
  W83791D HARDWARE MONITORING DRIVER
  M:    Marc Hulsman <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/w83791d
  F:    drivers/hwmon/w83791d.c
  
  W83793 HARDWARE MONITORING DRIVER
  M:    Rudolf Marek <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    Documentation/hwmon/w83793
  F:    drivers/hwmon/w83793.c
  
  W83795 HARDWARE MONITORING DRIVER
  M:    Jean Delvare <[email protected]>
 -L:    lm-sensors@lm-sensors.org
 +L:    l[email protected].org
  S:    Maintained
  F:    drivers/hwmon/w83795.c
  
@@@ -12057,18 -11905,6 +12065,18 @@@ M: David Härdeman <[email protected]
  S:    Maintained
  F:    drivers/media/rc/winbond-cir.c
  
 +WINSYSTEMS EBC-C384 WATCHDOG DRIVER
 +M:    William Breathitt Gray <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/watchdog/ebc-c384_wdt.c
 +
 +WINSYSTEMS WS16C48 GPIO DRIVER
 +M:    William Breathitt Gray <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-ws16c48.c
 +
  WIMAX STACK
  M:    Inaky Perez-Gonzalez <[email protected]>
  M:    [email protected]

diff --combined fs/Kconfig
index 9d757673bf40f0a93a1380d565a1de6309176295,922893f8ab4a5f6f2f9241e713c6fd4a6de103a0..6725f59c18e6b5f6b2ddcabaf1c83bd3d7c48406
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -84,8 -84,6 +84,8 @@@ config MANDATORY_FILE_LOCKIN
  
          To the best of my knowledge this is dead code that no one cares about.
  
 +source "fs/crypto/Kconfig"
 +
  source "fs/notify/Kconfig"
  
  source "fs/quota/Kconfig"
@@@ -209,6 -207,7 +209,7 @@@ menuconfig MISC_FILESYSTEM
  
  if MISC_FILESYSTEMS
  
+ source "fs/orangefs/Kconfig"
  source "fs/adfs/Kconfig"
  source "fs/affs/Kconfig"
  source "fs/ecryptfs/Kconfig"

diff --combined fs/Makefile
index 252c96898a43ae01a22b1a7f4a0d892033b266ff,f0f2f00951f505db759590419b1b04a091ee8874..85b6e13b62d363c36a727baa0452b278ae8a1d5e
--- 1/fs/Makefile
--- 2/fs/Makefile
+++ b/fs/Makefile
@@@ -30,7 -30,6 +30,7 @@@ obj-$(CONFIG_EVENTFD)         += eventfd.
  obj-$(CONFIG_USERFAULTFD)     += userfaultfd.o
  obj-$(CONFIG_AIO)               += aio.o
  obj-$(CONFIG_FS_DAX)          += dax.o
 +obj-$(CONFIG_FS_ENCRYPTION)   += crypto/
  obj-$(CONFIG_FILE_LOCKING)      += locks.o
  obj-$(CONFIG_COMPAT)          += compat.o compat_ioctl.o
  obj-$(CONFIG_BINFMT_AOUT)     += binfmt_aout.o
@@@ -106,6 -105,7 +106,7 @@@ obj-$(CONFIG_AUTOFS4_FS)   += autofs4
  obj-$(CONFIG_ADFS_FS)         += adfs/
  obj-$(CONFIG_FUSE_FS)         += fuse/
  obj-$(CONFIG_OVERLAY_FS)      += overlayfs/
+ obj-$(CONFIG_ORANGEFS_FS)       += orangefs/
  obj-$(CONFIG_UDF_FS)          += udf/
  obj-$(CONFIG_SUN_OPENPROMFS)  += openpromfs/
  obj-$(CONFIG_OMFS_FS)         += omfs/