Orangefs: merge to v4.5

Merge tag 'v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current

Linux 4.5

diff --combined MAINTAINERS
index 3782438dd4289e182f7b156e7c416447fb90ca53,6ee06ea47be4d1cb2f865587f5e175e3f0235c32..5e194003e2943a4299e3e79c82c427e4a9de8e0b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -206,7 -206,7 +206,7 @@@ F: include/trace/events/9p.
  A8293 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -223,9 -223,7 +223,7 @@@ F: drivers/scsi/aacraid
  
  ABI/API
  L:    linux-api@vger.kernel.org
- F:    Documentation/ABI/
  F:    include/linux/syscalls.h
- F:    include/uapi/
  F:    kernel/sys_ni.c
  
  ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
@@@ -240,6 -238,12 +238,12 @@@ L:       lm-sensors@lm-sensors.or
  S:    Maintained
  F:    drivers/hwmon/abituguru3.c
  
+ ACCES 104-IDI-48 GPIO DRIVER
+ M:    "William Breathitt Gray" <vilhelm.gray@gmail.com>
+ L:    linux-gpio@vger.kernel.org
+ S:    Maintained
+ F:    drivers/gpio/gpio-104-idi-48.c
+ 
  ACCES 104-IDIO-16 GPIO DRIVER
  M:    "William Breathitt Gray" <vilhelm.gray@gmail.com>
  L:    linux-gpio@vger.kernel.org
@@@ -371,6 -375,15 +375,15 @@@ ADDRESS SPACE LAYOUT RANDOMIZATION (ASL
  M:    Jiri Kosina <jikos@kernel.org>
  S:    Maintained
  
+ ADF7242 IEEE 802.15.4 RADIO DRIVER
+ M:    Michael Hennerich <michael.hennerich@analog.com>
+ W:    https://wiki.analog.com/ADF7242
+ W:    http://ez.analog.com/community/linux-device-drivers
+ L:    linux-wpan@vger.kernel.org
+ S:    Supported
+ F:    drivers/net/ieee802154/adf7242.c
+ F:    Documentation/devicetree/bindings/net/ieee802154/adf7242.txt
+ 
  ADM1025 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
  L:    lm-sensors@lm-sensors.org
@@@ -388,14 -401,14 +401,14 @@@ ADM8211 WIRELESS DRIVE
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/
  S:    Orphan
- F:    drivers/net/wireless/adm8211.*
+ F:    drivers/net/wireless/admtek/adm8211.*
  
  ADP1653 FLASH CONTROLLER DRIVER
  M:    Sakari Ailus <sakari.ailus@iki.fi>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/i2c/adp1653.c
- F:    include/media/adp1653.h
+ F:    include/media/i2c/adp1653.h
  
  ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
  M:    Michael Hennerich <michael.hennerich@analog.com>
@@@ -466,7 -479,7 +479,7 @@@ F: sound/oss/aedsp16.
  AF9013 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -476,7 -489,7 +489,7 @@@ F: drivers/media/dvb-frontends/af9013
  AF9033 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -522,7 -535,7 +535,7 @@@ AIMSLAB FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-aimslab*
  
@@@ -536,7 -549,7 +549,7 @@@ F: include/linux/*aio*.
  AIRSPY MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -614,9 -627,9 +627,9 @@@ F: drivers/crypto/ccp
  F:    include/linux/ccp.h
  
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
- M:    Andreas Herrmann <herrmann.der.user@googlemail.com>
+ M:    Huang Rui <ray.huang@amd.com>
  L:    lm-sensors@lm-sensors.org
- S:    Maintained
+ S:    Supported
  F:    Documentation/hwmon/fam15h_power
  F:    drivers/hwmon/fam15h_power.c
  
@@@ -671,13 -684,6 +684,6 @@@ M:        Michael Hanselmann <linux-kernel@han
  S:    Supported
  F:    drivers/macintosh/ams/
  
- AMSO1100 RNIC DRIVER
- M:    Tom Tucker <tom@opengridcomputing.com>
- M:    Steve Wise <swise@opengridcomputing.com>
- L:    linux-rdma@vger.kernel.org
- S:    Maintained
- F:    drivers/infiniband/hw/amso1100/
- 
  ANALOG DEVICES INC AD9389B DRIVER
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
@@@ -766,6 -772,7 +772,7 @@@ F: sound/aoa
  APM DRIVER
  M:    Jiri Kosina <jikos@kernel.org>
  S:    Odd fixes
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git
  F:    arch/x86/kernel/apm_32.c
  F:    include/linux/apm_bios.h
  F:    include/uapi/linux/apm_bios.h
@@@ -913,17 -920,24 +920,24 @@@ M:      Emilio López <emilio@elopez.com.ar
  S:    Maintained
  F:    drivers/clk/sunxi/
  
- ARM/Amlogic MesonX SoC support
+ ARM/Amlogic Meson SoC support
  M:    Carlo Caione <carlo@caione.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ L:    linux-meson@googlegroups.com
+ W:    http://linux-meson.com/
  S:    Maintained
- F:    drivers/media/rc/meson-ir.c
- N:    meson[x68]
+ F:    arch/arm/mach-meson/
+ F:    arch/arm/boot/dts/meson*
+ N:    meson
  
  ARM/Annapurna Labs ALPINE ARCHITECTURE
  M:    Tsahee Zidenberg <tsahee@annapurnalabs.com>
+ M:    Antoine Tenart <antoine.tenart@free-electrons.com>
  S:    Maintained
  F:    arch/arm/mach-alpine/
+ F:    arch/arm/boot/dts/alpine*
+ F:    arch/arm64/boot/dts/al/
+ F:    drivers/*/*alpine*
  
  ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
@@@ -931,6 -945,7 +945,7 @@@ M: Alexandre Belloni <alexandre.belloni
  M:    Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.linux4sam.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
  S:    Supported
  F:    arch/arm/mach-at91/
  F:    include/soc/at91/
@@@ -950,6 -965,8 +965,8 @@@ M: Rob Herring <robh@kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-highbank/
+ F:    arch/arm/boot/dts/highbank.dts
+ F:    arch/arm/boot/dts/ecx-*.dts*
  
  ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
  M:    Krzysztof Halasa <khalasa@piap.pl>
@@@ -1025,6 -1042,7 +1042,7 @@@ M:      Barry Song <baohua@kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
  S:    Maintained
+ F:    arch/arm/boot/dts/prima2*
  F:    arch/arm/mach-prima2/
  F:    drivers/clk/sirf/
  F:    drivers/clocksource/timer-prima2.c
@@@ -1126,6 -1144,10 +1144,10 @@@ W:    http://www.hisilicon.co
  S:    Supported
  T:    git git://github.com/hisilicon/linux-hisi.git
  F:    arch/arm/mach-hisi/
+ F:    arch/arm/boot/dts/hi3*
+ F:    arch/arm/boot/dts/hip*
+ F:    arch/arm/boot/dts/hisi*
+ F:    arch/arm64/boot/dts/hisilicon/
  
  ARM/HP JORNADA 7XX MACHINE SUPPORT
  M:    Kristoffer Ericson <kristoffer.ericson@gmail.com>
@@@ -1202,6 -1224,7 +1224,7 @@@ M:      Santosh Shilimkar <ssantosh@kernel.o
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-keystone/
+ F:    arch/arm/boot/dts/k2*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
  
  ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
@@@ -1270,6 -1293,7 +1293,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    arch/arm/mach-berlin/
  F:    arch/arm/boot/dts/berlin*
+ F:    arch/arm64/boot/dts/marvell/berlin*
  
  
  ARM/Marvell Dove/MV78xx0/Orion SOC support
@@@ -1400,26 -1424,37 +1424,37 @@@ W:   http://www.arm.linux.org.uk
  S:    Maintained
  
  ARM/QUALCOMM SUPPORT
- M:    Kumar Gala <galak@codeaurora.org>
- M:    Andy Gross <agross@codeaurora.org>
- M:    David Brown <davidb@codeaurora.org>
+ M:    Andy Gross <andy.gross@linaro.org>
+ M:    David Brown <david.brown@linaro.org>
  L:    linux-arm-msm@vger.kernel.org
  L:    linux-soc@vger.kernel.org
  S:    Maintained
+ F:    arch/arm/boot/dts/qcom-*.dts
+ F:    arch/arm/boot/dts/qcom-*.dtsi
  F:    arch/arm/mach-qcom/
+ F:    arch/arm64/boot/dts/qcom/*
  F:    drivers/soc/qcom/
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*
  F:    drivers/mfd/ssbi.c
  F:    drivers/firmware/qcom_scm.c
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
  
  ARM/RADISYS ENP2611 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
+ ARM/RENESAS ARM64 ARCHITECTURE
+ M:    Simon Horman <horms@verge.net.au>
+ M:    Magnus Damm <magnus.damm@gmail.com>
+ L:    linux-renesas-soc@vger.kernel.org
+ Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
+ S:    Supported
+ F:    arch/arm64/boot/dts/renesas/
+ 
  ARM/RISCPC ARCHITECTURE
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1439,6 -1474,7 +1474,7 @@@ ARM/Rockchip SoC suppor
  M:    Heiko Stuebner <heiko@sntech.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-rockchip@lists.infradead.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
  S:    Maintained
  F:    arch/arm/boot/dts/rk3*
  F:    arch/arm/mach-rockchip/
@@@ -1456,6 -1492,8 +1492,8 @@@ L:      linux-arm-kernel@lists.infradead.or
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/s3c*
+ F:    arch/arm/boot/dts/s5p*
+ F:    arch/arm/boot/dts/samsung*
  F:    arch/arm/boot/dts/exynos*
  F:    arch/arm64/boot/dts/exynos/
  F:    arch/arm/plat-samsung/
@@@ -1516,9 -1554,8 +1554,8 @@@ F:      drivers/media/platform/s5p-jpeg
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Simon Horman <horms@verge.net.au>
  M:    Magnus Damm <magnus.damm@gmail.com>
- L:    linux-sh@vger.kernel.org
- W:    http://oss.renesas.com
- Q:    http://patchwork.kernel.org/project/linux-sh/list/
+ L:    linux-renesas-soc@vger.kernel.org
+ Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
  F:    arch/arm/boot/dts/emev2*
@@@ -1536,6 -1573,7 +1573,7 @@@ S:      Maintaine
  F:    arch/arm/mach-socfpga/
  F:    arch/arm/boot/dts/socfpga*
  F:    arch/arm/configs/socfpga_defconfig
+ F:    arch/arm64/boot/dts/altera/
  W:    http://www.rocketboards.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
  
@@@ -1588,6 -1626,13 +1626,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  N:    stm32
  F:    drivers/clocksource/armv7m_systick.c
  
+ ARM/TANGO ARCHITECTURE
+ M:    Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
+ L:    linux-arm-kernel@lists.infradead.org
+ S:    Maintained
+ F:    arch/arm/mach-tango/
+ F:    arch/arm/boot/dts/tango*
+ 
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1642,6 -1687,8 +1687,8 @@@ F:      arch/arm/boot/dts/uniphier
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
  F:    arch/arm/mach-uniphier/
  F:    arch/arm/mm/cache-uniphier.c
+ F:    arch/arm64/boot/dts/socionext/
+ F:    drivers/bus/uniphier-system-bus.c
  F:    drivers/i2c/busses/i2c-uniphier*
  F:    drivers/pinctrl/uniphier/
  F:    drivers/tty/serial/8250/8250_uniphier.c
@@@ -1680,7 -1727,7 +1727,7 @@@ M:      Lorenzo Pieralisi <lorenzo.pieralisi
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/vexpress*
- F:    arch/arm64/boot/dts/arm/vexpress*
+ F:    arch/arm64/boot/dts/arm/
  F:    arch/arm/mach-vexpress/
  F:    */*/vexpress*
  F:    */*/*/vexpress*
@@@ -1763,6 -1810,7 +1810,7 @@@ ARM64 PORT (AARCH64 ARCHITECTURE
  M:    Catalin Marinas <catalin.marinas@arm.com>
  M:    Will Deacon <will.deacon@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
  S:    Maintained
  F:    arch/arm64/
  F:    Documentation/arm64/
@@@ -1773,7 -1821,7 +1821,7 @@@ L:      linux-media@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/i2c/as3645a.c
- F:    include/media/as3645a.h
+ F:    include/media/i2c/as3645a.h
  
  ASC7621 HARDWARE MONITOR DRIVER
  M:    George Joseph <george.joseph@fairview5.com>
@@@ -1791,6 -1839,12 +1839,12 @@@ S:    Maintaine
  F:    drivers/platform/x86/asus*.c
  F:    drivers/platform/x86/eeepc*.c
  
+ ASUS WIRELESS RADIO CONTROL DRIVER
+ M:    João Paulo Rechi Vita <jprvita@gmail.com>
+ L:    platform-driver-x86@vger.kernel.org
+ S:    Maintained
+ F:    drivers/platform/x86/asus-wireless.c
+ 
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
  R:    Dan Williams <dan.j.williams@intel.com>
  W:    http://sourceforge.net/projects/xscaleiop
@@@ -1842,7 -1896,7 +1896,7 @@@ ATHEROS ATH6KL WIRELESS DRIVE
  M:    Kalle Valo <kvalo@qca.qualcomm.com>
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath6kl
- T:    git git://github.com/kvalo/ath.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  S:    Supported
  F:    drivers/net/wireless/ath/ath6kl/
  
@@@ -1896,7 -1950,6 +1950,6 @@@ ATMEL AT91 / AT32 MCI DRIVE
  M:    Ludovic Desroches <ludovic.desroches@atmel.com>
  S:    Maintained
  F:    drivers/mmc/host/atmel-mci.c
- F:    drivers/mmc/host/atmel-mci-regs.h
  
  ATMEL AT91 / AT32 SERIAL DRIVER
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
@@@ -1993,7 -2046,7 +2046,7 @@@ L:      linux-wireless@vger.kernel.or
  W:    http://www.thekelleys.org.uk/atmel
  W:    http://atmelwlandriver.sourceforge.net/
  S:    Maintained
- F:    drivers/net/wireless/atmel*
+ F:    drivers/net/wireless/atmel/atmel*
  
  ATMEL MAXTOUCH DRIVER
  M:    Nick Dyer <nick.dyer@itdev.co.uk>
@@@ -2064,7 -2117,7 +2117,7 @@@ F:      net/ax25
  AZ6007 DVB DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/usb/dvb-usb-v2/az6007.c
@@@ -2073,7 -2126,7 +2126,7 @@@ AZTECH FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-aztech*
  
@@@ -2082,7 -2135,7 +2135,7 @@@ L:      linux-wireless@vger.kernel.or
  L:    b43-dev@lists.infradead.org
  W:    http://wireless.kernel.org/en/users/Drivers/b43
  S:    Odd Fixes
- F:    drivers/net/wireless/b43/
+ F:    drivers/net/wireless/broadcom/b43/
  
  B43LEGACY WIRELESS DRIVER
  M:    Larry Finger <Larry.Finger@lwfinger.net>
@@@ -2090,11 -2143,12 +2143,12 @@@ L:   linux-wireless@vger.kernel.or
  L:    b43-dev@lists.infradead.org
  W:    http://wireless.kernel.org/en/users/Drivers/b43
  S:    Maintained
- F:    drivers/net/wireless/b43legacy/
+ F:    drivers/net/wireless/broadcom/b43legacy/
  
  BACKLIGHT CLASS/SUBSYSTEM
  M:    Jingoo Han <jingoohan1@gmail.com>
  M:    Lee Jones <lee.jones@linaro.org>
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git
  S:    Maintained
  F:    drivers/video/backlight/
  F:    include/linux/backlight.h
@@@ -2102,7 -2156,7 +2156,7 @@@
  BATMAN ADVANCED
  M:    Marek Lindner <mareklindner@neomailbox.ch>
  M:    Simon Wunderlich <sw@simonwunderlich.de>
- M:    Antonio Quartulli <antonio@meshcoding.com>
+ M:    Antonio Quartulli <a@unstable.cc>
  L:    b.a.t.m.a.n@lists.open-mesh.org
  W:    http://www.open-mesh.org/
  S:    Maintained
@@@ -2126,7 -2180,7 +2180,7 @@@ BDISP ST MEDIA DRIVE
  M:    Fabien Dessenne <fabien.dessenne@st.com>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Supported
  F:    drivers/media/platform/sti/bdisp
  
@@@ -2300,6 -2354,7 +2354,7 @@@ F:      arch/arm/mach-bcm
  F:    arch/arm/boot/dts/bcm113*
  F:    arch/arm/boot/dts/bcm216*
  F:    arch/arm/boot/dts/bcm281*
+ F:    arch/arm64/boot/dts/broadcom/
  F:    arch/arm/configs/bcm_defconfig
  F:    drivers/mmc/host/sdhci-bcm-kona.c
  F:    drivers/clocksource/bcm_kona_timer.c
@@@ -2314,14 -2369,6 +2369,6 @@@ T:     git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  N:    bcm2835
  
- BROADCOM BCM33XX MIPS ARCHITECTURE
- M:    Kevin Cernekee <cernekee@gmail.com>
- L:    linux-mips@linux-mips.org
- S:    Maintained
- F:    arch/mips/bcm3384/*
- F:    arch/mips/include/asm/mach-bcm3384/*
- F:    arch/mips/kernel/*bmips*
- 
  BROADCOM BCM47XX MIPS ARCHITECTURE
  M:    Hauke Mehrtens <hauke@hauke-m.de>
  M:    Rafał Miłecki <zajec5@gmail.com>
@@@ -2357,6 -2404,7 +2404,7 @@@ M:      Brian Norris <computersforpeace@gmai
  M:    Gregory Fong <gregory.0xf0@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ L:    bcm-kernel-feedback-list@broadcom.com
  T:    git git://github.com/broadcom/stblinux.git
  S:    Maintained
  F:    arch/arm/mach-bcm/*brcmstb*
@@@ -2376,6 -2424,8 +2424,8 @@@ F:      arch/mips/kernel/*bmips
  F:    arch/mips/boot/dts/brcm/bcm*.dts*
  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:    Prashant Sreedharan <prashant@broadcom.com>
@@@ -2392,7 -2442,7 +2442,7 @@@ M:      Hante Meuleman <meuleman@broadcom.co
  L:    linux-wireless@vger.kernel.org
  L:    brcm80211-dev-list@broadcom.com
  S:    Supported
- F:    drivers/net/wireless/brcm80211/
+ F:    drivers/net/wireless/broadcom/brcm80211/
  
  BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
  M:    QLogic-Storage-Upstream@qlogic.com
@@@ -2430,7 -2480,7 +2480,7 @@@ N:      bcm8831
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Gregory Fong <gregory.0xf0@gmail.com>
- L:    bcm-kernel-feedback-list@broadcom.com>
+ L:    bcm-kernel-feedback-list@broadcom.com
  S:    Supported
  F:    drivers/gpio/gpio-brcmstb.c
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
@@@ -2519,7 -2569,7 +2569,7 @@@ F:      fs/btrfs
  BTTV VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    Documentation/video4linux/bttv/
@@@ -2558,7 -2608,7 +2608,7 @@@ CADET FM/AM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-cadet*
  
@@@ -2692,10 -2742,11 +2742,11 @@@ F:   fs/ceph
  CERTIFICATE HANDLING:
  M:    David Howells <dhowells@redhat.com>
  M:    David Woodhouse <dwmw2@infradead.org>
- L:    keyrings@linux-nfs.org
+ L:    keyrings@vger.kernel.org
  S:    Maintained
  F:    Documentation/module-signing.txt
  F:    certs/
+ F:    scripts/sign-file.c
  F:    scripts/extract-cert.c
  
  CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
@@@ -2759,7 -2810,7 +2810,7 @@@ S:      Maintaine
  F:    Documentation/zh_CN/
  
  CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
- M:    Peter Chen <Peter.Chen@freescale.com>
+ M:    Peter Chen <Peter.Chen@nxp.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
  L:    linux-usb@vger.kernel.org
  S:    Maintained
@@@ -2775,6 -2826,7 +2826,7 @@@ F:      drivers/input/touchscreen/chipone_ic
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Olof Johansson <olof@lixom.net>
  S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git
  F:    drivers/platform/chrome/
  
  CISCO VIC ETHERNET NIC DRIVER
@@@ -2851,7 -2903,7 +2903,7 @@@ COBALT MEDIA DRIVE
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Supported
  F:    drivers/media/pci/cobalt/
  
@@@ -2939,7 -2991,8 +2991,8 @@@ F:      drivers/usb/atm/cxacru.
  
  CONFIGFS
  M:    Joel Becker <jlbec@evilplan.org>
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git
+ M:    Christoph Hellwig <hch@lst.de>
+ T:    git git://git.infradead.org/users/hch/configfs.git
  S:    Supported
  F:    fs/configfs/
  F:    include/linux/configfs.h
@@@ -3072,6 -3125,7 +3125,7 @@@ M:      Mikael Starvik <starvik@axis.com
  M:    Jesper Nilsson <jesper.nilsson@axis.com>
  L:    linux-cris-kernel@axis.com
  W:    http://developer.axis.com
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git
  S:    Maintained
  F:    arch/cris/
  F:    drivers/tty/serial/crisv10.*
@@@ -3080,6 -3134,7 +3134,7 @@@ CRYPTO AP
  M:    Herbert Xu <herbert@gondor.apana.org.au>
  M:    "David S. Miller" <davem@davemloft.net>
  L:    linux-crypto@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
  S:    Maintained
  F:    Documentation/crypto/
@@@ -3096,6 -3151,15 +3151,15 @@@ S:    Maintaine
  F:    crypto/ansi_cprng.c
  F:    crypto/rng.c
  
+ CS3308 MEDIA DRIVER
+ M:    Hans Verkuil <hverkuil@xs4all.nl>
+ L:    linux-media@vger.kernel.org
+ T:    git git://linuxtv.org/media_tree.git
+ W:    http://linuxtv.org
+ S:    Odd Fixes
+ F:    drivers/media/i2c/cs3308.c
+ F:    drivers/media/i2c/cs3308.h
+ 
  CS5535 Audio ALSA driver
  M:    Jaya Kumar <jayakumar.alsa@gmail.com>
  S:    Maintained
@@@ -3104,14 -3168,14 +3168,14 @@@ F:   sound/pci/cs5535audio
  CW1200 WLAN driver
  M:    Solomon Peachy <pizza@shaftnet.org>
  S:    Maintained
- F:    drivers/net/wireless/cw1200/
+ F:    drivers/net/wireless/st/cw1200/
  
  CX18 VIDEO4LINUX DRIVER
  M:    Andy Walls <awalls@md.metrocast.net>
  L:    ivtv-devel@ivtvdriver.org (subscribers-only)
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  W:    http://www.ivtvdriver.org/index.php/Cx18
  S:    Maintained
  F:    Documentation/video4linux/cx18.txt
@@@ -3122,7 -3186,7 +3186,7 @@@ CX2341X MPEG ENCODER HELPER MODUL
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/common/cx2341x*
  F:    include/media/cx2341x*
@@@ -3131,7 -3195,7 +3195,7 @@@ CX24120 MEDIA DRIVE
  M:    Jemma Denson <jdenson@gmail.com>
  M:    Patrick Boettcher <patrick.boettcher@posteo.de>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  S:    Maintained
  F:    drivers/media/dvb-frontends/cx24120*
@@@ -3139,7 -3203,7 +3203,7 @@@
  CX88 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    Documentation/video4linux/cx88/
@@@ -3148,7 -3212,7 +3212,7 @@@ F:      drivers/media/pci/cx88
  CXD2820R MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -3254,7 -3318,7 +3318,7 @@@ F:      drivers/net/wan/pc300
  CYPRESS_FIRMWARE MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -3385,9 -3449,8 +3449,8 @@@ S:      Maintaine
  F:    drivers/usb/dwc2/
  
  DESIGNWARE USB3 DRD IP DRIVER
- M:    Felipe Balbi <balbi@ti.com>
+ M:    Felipe Balbi <balbi@kernel.org>
  L:    linux-usb@vger.kernel.org
- L:    linux-omap@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/dwc3/
@@@ -3403,8 -3466,21 +3466,21 @@@ DEVICE FREQUENCY (DEVFREQ
  M:    MyungJoo Ham <myungjoo.ham@samsung.com>
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    linux-pm@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
  S:    Maintained
  F:    drivers/devfreq/
+ F:    include/linux/devfreq.h
+ F:    Documentation/devicetree/bindings/devfreq/
+ 
+ DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)
+ M:    Chanwoo Choi <cw00.choi@samsung.com>
+ L:    linux-pm@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
+ S:    Supported
+ F:    drivers/devfreq/event/
+ F:    drivers/devfreq/devfreq-event.c
+ F:    include/linux/devfreq-event.h
+ F:    Documentation/devicetree/bindings/devfreq/event/
  
  DEVICE NUMBER REGISTRY
  M:    Torben Mathiasen <device@lanana.org>
@@@ -3520,7 -3596,7 +3596,7 @@@ M:      Christine Caulfield <ccaulfie@redhat
  M:    David Teigland <teigland@redhat.com>
  L:    cluster-devel@redhat.com
  W:    http://sources.redhat.com/cluster/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git
  S:    Supported
  F:    fs/dlm/
  
@@@ -3594,13 -3670,12 +3670,12 @@@ F:   drivers/scsi/dpt
  F:    drivers/scsi/dpt/
  
  DRBD DRIVER
- P:    Philipp Reisner
- P:    Lars Ellenberg
- M:    drbd-dev@lists.linbit.com
- L:    drbd-user@lists.linbit.com
+ M:    Philipp Reisner <philipp.reisner@linbit.com>
+ M:    Lars Ellenberg <lars.ellenberg@linbit.com>
+ L:    drbd-dev@lists.linbit.com
  W:    http://www.drbd.org
- T:    git git://git.drbd.org/linux-2.6-drbd.git drbd
- T:    git git://git.drbd.org/drbd-8.3.git
+ T:    git git://git.linbit.com/linux-drbd.git
+ T:    git git://git.linbit.com/drbd-8.4.git
  S:    Supported
  F:    drivers/block/drbd/
  F:    lib/lru_cache.c
@@@ -3721,7 -3796,7 +3796,7 @@@ F:      Documentation/devicetree/bindings/di
  DRM DRIVERS FOR RENESAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    dri-devel@lists.freedesktop.org
- L:    linux-sh@vger.kernel.org
+ L:    linux-renesas-soc@vger.kernel.org
  T:    git git://people.freedesktop.org/~airlied/linux
  S:    Supported
  F:    drivers/gpu/drm/rcar-du/
@@@ -3744,6 -3819,15 +3819,15 @@@ S:    Maintaine
  F:    drivers/gpu/drm/sti
  F:    Documentation/devicetree/bindings/display/st,stih4xx.txt
  
+ DRM DRIVERS FOR VIVANTE GPU IP
+ M:    Lucas Stach <l.stach@pengutronix.de>
+ R:    Russell King <linux+etnaviv@arm.linux.org.uk>
+ R:    Christian Gmeiner <christian.gmeiner@gmail.com>
+ L:    dri-devel@lists.freedesktop.org
+ S:    Maintained
+ F:    drivers/gpu/drm/etnaviv
+ F:    Documentation/devicetree/bindings/display/etnaviv
+ 
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <klimov.linux@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -3761,14 -3845,14 +3845,14 @@@ DT3155 MEDIA DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/pci/dt3155/
  
  DVB_USB_AF9015 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -3778,7 -3862,7 +3862,7 @@@ F:      drivers/media/usb/dvb-usb-v2/af9015
  DVB_USB_AF9035 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -3788,7 -3872,7 +3872,7 @@@ F:      drivers/media/usb/dvb-usb-v2/af9035
  DVB_USB_ANYSEE MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -3798,7 -3882,7 +3882,7 @@@ F:      drivers/media/usb/dvb-usb-v2/anysee
  DVB_USB_AU6610 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -3808,7 -3892,7 +3892,7 @@@ F:      drivers/media/usb/dvb-usb-v2/au6610
  DVB_USB_CE6230 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -3818,7 -3902,7 +3902,7 @@@ F:      drivers/media/usb/dvb-usb-v2/ce6230
  DVB_USB_CXUSB MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/media_tree.git
@@@ -3828,7 -3912,7 +3912,7 @@@ F:      drivers/media/usb/dvb-usb/cxusb
  DVB_USB_EC168 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -3838,7 -3922,7 +3922,7 @@@ F:      drivers/media/usb/dvb-usb-v2/ec168
  DVB_USB_GL861 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/anttip/media_tree.git
  S:    Maintained
@@@ -3847,7 -3931,7 +3931,7 @@@ F:      drivers/media/usb/dvb-usb-v2/gl861
  DVB_USB_MXL111SF MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/mxl111sf.git
@@@ -3857,7 -3941,7 +3941,7 @@@ F:      drivers/media/usb/dvb-usb-v2/mxl111s
  DVB_USB_RTL28XXU MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -3867,7 -3951,7 +3951,7 @@@ F:      drivers/media/usb/dvb-usb-v2/rtl28xx
  DVB_USB_V2 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -3897,7 -3981,7 +3981,7 @@@ F:      Documentation/devicetree/bindings/in
  E4000 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -3913,7 -3997,7 +3997,7 @@@ F:      drivers/scsi/eata.
  EC100 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -3925,6 -4009,7 +4009,7 @@@ M:      Tyler Hicks <tyhicks@canonical.com
  L:    ecryptfs@vger.kernel.org
  W:    http://ecryptfs.org
  W:    https://launchpad.net/ecryptfs
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
  S:    Supported
  F:    Documentation/filesystems/ecryptfs.txt
  F:    fs/ecryptfs/
@@@ -3934,9 -4019,8 +4019,8 @@@ M:      Doug Thompson <dougthompson@xmission
  M:    Borislav Petkov <bp@alien8.de>
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
- T:    git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
- T:    git://git.kernel.org/pub/linux/kernel/git/mchehab/linux-edac.git#linux_next
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
  S:    Supported
  F:    Documentation/edac.txt
  F:    drivers/edac/
@@@ -3946,7 -4030,6 +4030,6 @@@ EDAC-AMD6
  M:    Doug Thompson <dougthompson@xmission.com>
  M:    Borislav Petkov <bp@alien8.de>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/amd64_edac*
  
@@@ -3954,7 -4037,6 +4037,6 @@@ EDAC-CALXED
  M:    Doug Thompson <dougthompson@xmission.com>
  M:    Robert Richter <rric@kernel.org>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/highbank*
  
@@@ -3963,7 -4045,6 +4045,6 @@@ M:      Ralf Baechle <ralf@linux-mips.org
  M:    David Daney <david.daney@cavium.com>
  L:    linux-edac@vger.kernel.org
  L:    linux-mips@linux-mips.org
- W:    bluesmoke.sourceforge.net
  S:    Supported
  F:    drivers/edac/octeon_edac*
  
@@@ -3971,63 -4052,54 +4052,54 @@@ EDAC-E752
  M:    Mark Gross <mark.gross@intel.com>
  M:    Doug Thompson <dougthompson@xmission.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/e752x_edac.c
  
  EDAC-E7XXX
  M:    Doug Thompson <dougthompson@xmission.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/e7xxx_edac.c
  
  EDAC-GHES
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/ghes_edac.c
  
  EDAC-I82443BXGX
  M:    Tim Small <tim@buttersideup.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i82443bxgx_edac.c
  
  EDAC-I3000
  M:    Jason Uhlenkott <juhlenko@akamai.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i3000_edac.c
  
  EDAC-I5000
  M:    Doug Thompson <dougthompson@xmission.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i5000_edac.c
  
  EDAC-I5400
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i5400_edac.c
  
  EDAC-I7300
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i7300_edac.c
  
  EDAC-I7CORE
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i7core_edac.c
  
@@@ -4035,42 -4107,36 +4107,36 @@@ EDAC-I82975
  M:    Ranganathan Desikan <ravi@jetztechnologies.com>
  M:    "Arvind R." <arvino55@gmail.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i82975x_edac.c
  
  EDAC-IE31200
  M:    Jason Baron <jbaron@akamai.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/ie31200_edac.c
  
  EDAC-MPC85XX
  M:    Johannes Thumshirn <morbidrsa@gmail.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/mpc85xx_edac.[ch]
  
  EDAC-PASEMI
  M:    Egor Martovetsky <egor@pasemi.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/pasemi_edac.c
  
  EDAC-R82600
  M:    Tim Small <tim@buttersideup.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/r82600_edac.c
  
  EDAC-SBRIDGE
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
- W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/sb_edac.c
  
@@@ -4121,13 -4187,6 +4187,6 @@@ W:     http://aeschi.ch.eu.org/efs
  S:    Orphan
  F:    fs/efs/
  
- EHCA (IBM GX bus InfiniBand adapter) DRIVER
- M:    Hoang-Nam Nguyen <hnguyen@de.ibm.com>
- M:    Christoph Raisch <raisch@de.ibm.com>
- L:    linux-rdma@vger.kernel.org
- S:    Supported
- F:    drivers/infiniband/hw/ehca/
- 
  EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
  M:    Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
  L:    netdev@vger.kernel.org
@@@ -4137,7 -4196,7 +4196,7 @@@ F:      drivers/net/ethernet/ibm/ehea
  EM28XX VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/usb/em28xx/
@@@ -4222,6 -4281,7 +4281,7 @@@ M:      Andreas Dilger <adilger.kernel@dilge
  L:    linux-ext4@vger.kernel.org
  W:    http://ext4.wiki.kernel.org
  Q:    http://patchwork.ozlabs.org/project/linux-ext4/list/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
  S:    Maintained
  F:    Documentation/filesystems/ext4.txt
  F:    fs/ext4/
@@@ -4277,7 -4337,7 +4337,7 @@@ F:      drivers/media/tuners/fc0011.
  FC2580 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -4458,6 -4518,12 +4518,12 @@@ L:    linuxppc-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
+ FREESCALE GPMI NAND DRIVER
+ M:    Han Xu <han.xu@nxp.com>
+ L:    linux-mtd@lists.infradead.org
+ S:    Maintained
+ F:    drivers/mtd/nand/gpmi-nand/*
+ 
  FREESCALE I2C CPM DRIVER
  M:    Jochen Friedrich <jochen@scram.de>
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -4474,7 -4540,7 +4540,7 @@@ F:      include/linux/platform_data/video-im
  F:    drivers/video/fbdev/imxfb.c
  
  FREESCALE QUAD SPI DRIVER
- M:    Han Xu <han.xu@freescale.com>
+ M:    Han Xu <han.xu@nxp.com>
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
  F:    drivers/mtd/spi-nor/fsl-quadspi.c
@@@ -4488,11 -4554,21 +4554,21 @@@ S:   Maintaine
  F:    drivers/net/ethernet/freescale/fs_enet/
  F:    include/linux/fs_enet_pd.h
  
+ FREESCALE IMX / MXC FEC DRIVER
+ M:    Fugang Duan <fugang.duan@nxp.com>
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ F:    drivers/net/ethernet/freescale/fec_main.c
+ F:    drivers/net/ethernet/freescale/fec_ptp.c
+ F:    drivers/net/ethernet/freescale/fec.h
+ F:    Documentation/devicetree/bindings/net/fsl-fec.txt
+ 
  FREESCALE QUICC ENGINE LIBRARY
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Orphan
- F:    arch/powerpc/sysdev/qe_lib/
- F:    arch/powerpc/include/asm/*qe.h
+ F:    drivers/soc/fsl/qe/
+ F:    include/soc/fsl/*qe*.h
+ F:    include/soc/fsl/*ucc*.h
  
  FREESCALE USB PERIPHERAL DRIVERS
  M:    Li Yang <leoli@freescale.com>
@@@ -4584,8 -4660,7 +4660,7 @@@ F:      include/linux/f2fs_fs.
  F:    include/trace/events/f2fs.h
  
  FUJITSU FR-V (FRV) PORT
- M:    David Howells <dhowells@redhat.com>
- S:    Maintained
+ S:    Orphan
  F:    arch/frv/
  
  FUJITSU LAPTOP EXTRAS
@@@ -4600,7 -4675,7 +4675,7 @@@ M:      Heungjun Kim <riverful.kim@samsung.c
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/i2c/m5mols/
- F:    include/media/m5mols.h
+ F:    include/media/i2c/m5mols.h
  
  FUJITSU TABLET EXTRAS
  M:    Robert Gerlach <khnz@gmx.de>
@@@ -4646,7 -4721,7 +4721,7 @@@ GEMTEK FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-gemtek*
  
@@@ -4854,7 -4929,7 +4929,7 @@@ HDPVR USB VIDEO ENCODER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/usb/hdpvr/
  
@@@ -4873,7 -4948,7 +4948,7 @@@ F:      drivers/tty/hvc
  HACKRF MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -4904,6 -4979,7 +4979,7 @@@ F:      include/linux/hw_random.
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <ohad@wizery.com>
  S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
  F:    Documentation/hwspinlock.txt
  F:    drivers/hwspinlock/hwspinlock_*
  F:    include/linux/hwspinlock.h
@@@ -4916,7 -4992,7 +4992,7 @@@ F:      sound/parisc/harmony.
  HD29L2 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -4985,6 -5061,7 +5061,7 @@@ F:      arch/*/include/asm/suspend*.
  
  HID CORE LAYER
  M:    Jiri Kosina <jikos@kernel.org>
+ R:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
  L:    linux-input@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
@@@ -5039,13 -5116,20 +5116,20 @@@ F:   include/uapi/linux/if_hippi.
  F:    net/802/hippi.c
  F:    drivers/net/hippi/
  
+ HISILICON SAS Controller
+ M:    John Garry <john.garry@huawei.com>
+ W:    http://www.hisilicon.com
+ S:    Supported
+ F:    drivers/scsi/hisi_sas/
+ F:    Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
+ 
  HOST AP DRIVER
  M:    Jouni Malinen <j@w1.fi>
  L:    hostap@shmoo.com (subscribers-only)
  L:    linux-wireless@vger.kernel.org
  W:    http://hostap.epitest.fi/
  S:    Maintained
- F:    drivers/net/wireless/hostap/
+ F:    drivers/net/wireless/intersil/hostap/
  
  HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
  L:    platform-driver-x86@vger.kernel.org
@@@ -5283,6 -5367,13 +5367,13 @@@ L:    netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
  
+ IBM Power SRIOV Virtual NIC Device Driver
+ M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
+ M:    John Allen <jallen@linux.vnet.ibm.com>
+ L:    netdev@vger.kernel.org
+ S:    Supported
+ F:    drivers/net/ethernet/ibm/ibmvnic.*
+ 
  IBM Power Virtual SCSI Device Drivers
  M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
  L:    linux-scsi@vger.kernel.org
@@@ -5427,6 -5518,7 +5518,7 @@@ M:      Dmitry Kasatkin <dmitry.kasatkin@gma
  L:    linux-ima-devel@lists.sourceforge.net
  L:    linux-ima-user@lists.sourceforge.net
  L:    linux-security-module@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  S:    Supported
  F:    security/integrity/ima/
  
@@@ -5502,6 -5594,12 +5594,12 @@@ T:    git git://git.code.sf.net/p/intel-sa
  S:    Supported
  F:    drivers/scsi/isci/
  
+ INTEL HID EVENT DRIVER
+ M:    Alex Hung <alex.hung@canonical.com>
+ L:    platform-driver-x86@vger.kernel.org
+ S:    Maintained
+ F:    drivers/platform/x86/intel-hid.c
+ 
  INTEL IDLE DRIVER
  M:    Len Brown <lenb@kernel.org>
  L:    linux-pm@vger.kernel.org
@@@ -5613,7 -5711,7 +5711,7 @@@ L:      linux-wireless@vger.kernel.or
  S:    Maintained
  F:    Documentation/networking/README.ipw2100
  F:    Documentation/networking/README.ipw2200
- F:    drivers/net/wireless/ipw2x00/
+ F:    drivers/net/wireless/intel/ipw2x00/
  
  INTEL(R) TRACE HUB
  M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
@@@ -5622,9 -5720,7 +5720,7 @@@ F:      Documentation/trace/intel_th.tx
  F:    drivers/hwtracing/intel_th/
  
  INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
- M:    Richard L Maliszewski <richard.l.maliszewski@intel.com>
- M:    Gang Wei <gang.wei@intel.com>
- M:    Shane Wang <shane.wang@intel.com>
+ M:    Ning Sun <ning.sun@intel.com>
  L:    tboot-devel@lists.sourceforge.net
  W:    http://tboot.sourceforge.net
  T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
@@@ -5647,7 -5743,7 +5743,7 @@@ INTEL WIRELESS 3945ABG/BG, 4965AGN (iwl
  M:    Stanislaw Gruszka <sgruszka@redhat.com>
  L:    linux-wireless@vger.kernel.org
  S:    Supported
- F:    drivers/net/wireless/iwlegacy/
+ F:    drivers/net/wireless/intel/iwlegacy/
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Johannes Berg <johannes.berg@intel.com>
@@@ -5657,7 -5753,7 +5753,7 @@@ L:      linux-wireless@vger.kernel.or
  W:    http://intellinuxwireless.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
  S:    Supported
- F:    drivers/net/wireless/iwlwifi/
+ F:    drivers/net/wireless/intel/iwlwifi/
  
  INTEL MANAGEMENT ENGINE (mei)
  M:    Tomas Winkler <tomas.winkler@intel.com>
@@@ -5678,18 -5774,27 +5774,27 @@@ F:   include/linux/mic_bus.
  F:    include/linux/scif.h
  F:    include/uapi/linux/mic_common.h
  F:    include/uapi/linux/mic_ioctl.h
- F     include/uapi/linux/scif_ioctl.h
+ F:    include/uapi/linux/scif_ioctl.h
  F:    drivers/misc/mic/
  F:    drivers/dma/mic_x100_dma.c
  F:    drivers/dma/mic_x100_dma.h
- F     Documentation/mic/
+ F:    Documentation/mic/
  
- INTEL PMC IPC DRIVER
+ INTEL PMC/P-Unit IPC DRIVER
  M:    Zha Qipeng<qipeng.zha@intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/intel_pmc_ipc.c
+ F:    drivers/platform/x86/intel_punit_ipc.c
  F:    arch/x86/include/asm/intel_pmc_ipc.h
+ F:    arch/x86/include/asm/intel_punit_ipc.h
+ 
+ INTEL TELEMETRY DRIVER
+ M:    Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
+ L:    platform-driver-x86@vger.kernel.org
+ S:    Maintained
+ F:    arch/x86/include/asm/intel_telemetry.h
+ F:    drivers/platform/x86/intel_telemetry*
  
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <ralf@linux-mips.org>
@@@ -5715,12 -5820,6 +5820,6 @@@ M:     Juanjo Ciarlante <jjciarla@raiz.uncu
  S:    Maintained
  F:    net/ipv4/netfilter/ipt_MASQUERADE.c
  
- IPATH DRIVER
- M:    Mike Marciniszyn <infinipath@intel.com>
- L:    linux-rdma@vger.kernel.org
- S:    Maintained
- F:    drivers/staging/rdma/ipath/
- 
  IPMI SUBSYSTEM
  M:    Corey Minyard <minyard@acm.org>
  L:    openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
@@@ -5752,6 -5851,8 +5851,8 @@@ M:      Julian Anastasov <ja@ssi.bg
  L:    netdev@vger.kernel.org
  L:    lvs-devel@vger.kernel.org
  S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git
  F:    Documentation/networking/ipvs-sysctl.txt
  F:    include/net/ip_vs.h
  F:    include/uapi/linux/ip_vs.h
@@@ -5822,7 -5923,7 +5923,7 @@@ ISA RADIO MODUL
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-isa*
  
@@@ -5892,7 -5993,7 +5993,7 @@@ F:      drivers/hwmon/it87.
  IT913X MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -5913,7 -6014,7 +6014,7 @@@ F:      include/uapi/linux/ivtv
  IX2505V MEDIA DRIVER
  M:    Malcolm Priestley <tvboxspy@gmail.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  S:    Maintained
  F:    drivers/media/dvb-frontends/ix2505v*
@@@ -6002,7 -6103,7 +6103,7 @@@ KEENE FM RADIO TRANSMITTER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-keene*
  
@@@ -6035,6 -6136,7 +6136,7 @@@ M:      "J. Bruce Fields" <bfields@fieldses.
  M:    Jeff Layton <jlayton@poochiereds.net>
  L:    linux-nfs@vger.kernel.org
  W:    http://nfs.sourceforge.net/
+ T:    git git://linux-nfs.org/~bfields/linux.git
  S:    Supported
  F:    fs/nfsd/
  F:    include/uapi/linux/nfsd/
@@@ -6047,7 -6149,7 +6149,7 @@@ F:      include/uapi/linux/sunrpc
  
  KERNEL SELFTEST FRAMEWORK
  M:    Shuah Khan <shuahkh@osg.samsung.com>
- L:    linux-api@vger.kernel.org
+ L:    linux-kselftest@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/shuah/linux-kselftest
  S:    Maintained
  F:    tools/testing/selftests
@@@ -6091,6 -6193,7 +6193,7 @@@ M:      Christian Borntraeger <borntraeger@d
  M:    Cornelia Huck <cornelia.huck@de.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
  S:    Supported
  F:    Documentation/s390/kvm.txt
  F:    arch/s390/include/asm/kvm*
@@@ -6102,6 -6205,7 +6205,7 @@@ M:      Marc Zyngier <marc.zyngier@arm.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    kvmarm@lists.cs.columbia.edu
  W:    http://systems.cs.columbia.edu/projects/kvm-arm
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
  S:    Supported
  F:    arch/arm/include/uapi/asm/kvm*
  F:    arch/arm/include/asm/kvm*
@@@ -6119,6 -6223,14 +6223,14 @@@ F:    arch/arm64/include/uapi/asm/kvm
  F:    arch/arm64/include/asm/kvm*
  F:    arch/arm64/kvm/
  
+ KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
+ M:    James Hogan <james.hogan@imgtec.com>
+ L:    linux-mips@linux-mips.org
+ S:    Supported
+ F:    arch/mips/include/uapi/asm/kvm*
+ F:    arch/mips/include/asm/kvm*
+ F:    arch/mips/kvm/
+ 
  KEXEC
  M:    Eric Biederman <ebiederm@xmission.com>
  W:    http://kernel.org/pub/linux/utils/kernel/kexec/
@@@ -6163,6 -6275,7 +6275,7 @@@ KGDB / KDB /debug_cor
  M:    Jason Wessel <jason.wessel@windriver.com>
  W:    http://kgdb.wiki.kernel.org/
  L:    kgdb-bugreport@lists.sourceforge.net
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
  S:    Maintained
  F:    Documentation/DocBook/kgdb.tmpl
  F:    drivers/misc/kgdbts.c
@@@ -6215,6 -6328,12 +6328,12 @@@ S:    Maintaine
  F:    net/l3mdev
  F:    include/net/l3mdev.h
  
+ LANTIQ MIPS ARCHITECTURE
+ M:    John Crispin <blogic@openwrt.org>
+ L:    linux-mips@linux-mips.org
+ S:    Maintained
+ F:    arch/mips/lantiq
+ 
  LAPB module
  L:    linux-x25@vger.kernel.org
  S:    Orphan
@@@ -6254,7 -6373,7 +6373,7 @@@ F:      drivers/usb/misc/legousbtower.
  LG2160 MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -6264,7 -6383,7 +6383,7 @@@ F:      drivers/media/dvb-frontends/lg2160.
  LGDT3305 MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -6334,6 -6453,7 +6453,7 @@@ LIBNVDIMM: NON-VOLATILE MEMORY DEVICE S
  M:    Dan Williams <dan.j.williams@intel.com>
  L:    linux-nvdimm@lists.01.org
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
  S:    Supported
  F:    drivers/nvdimm/*
  F:    include/linux/nd.h
@@@ -6431,7 -6551,7 +6551,7 @@@ S:      Maintaine
  F:    arch/powerpc/platforms/8xx/
  
  LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
- M:    Scott Wood <scottwood@freescale.com>
+ M:    Scott Wood <oss@buserror.net>
  M:    Kumar Gala <galak@kernel.crashing.org>
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -6521,7 -6641,7 +6641,7 @@@ F:      drivers/hwmon/lm95234.
  LME2510 MEDIA DRIVER
  M:    Malcolm Priestley <tvboxspy@gmail.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  S:    Maintained
  F:    drivers/media/usb/dvb-usb-v2/lmedm04*
@@@ -6627,7 -6747,7 +6747,7 @@@ F:      arch/m68k/hp300
  M88DS3103 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -6637,7 -6757,7 +6757,7 @@@ F:      drivers/media/dvb-frontends/m88ds310
  M88RS2000 MEDIA DRIVER
  M:    Malcolm Priestley <tvboxspy@gmail.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  S:    Maintained
  F:    drivers/media/dvb-frontends/m88rs2000*
@@@ -6659,6 -6779,7 +6779,7 @@@ S:      Maintaine
  F:    Documentation/networking/mac80211-injection.txt
  F:    include/net/mac80211.h
  F:    net/mac80211/
+ F:    drivers/net/wireless/mac80211_hwsim.[ch]
  
  MACVLAN DRIVER
  M:    Patrick McHardy <kaber@trash.net>
@@@ -6708,7 -6829,7 +6829,7 @@@ F:      drivers/net/ethernet/marvell/sk
  MARVELL LIBERTAS WIRELESS DRIVER
  L:    libertas-dev@lists.infradead.org
  S:    Orphan
- F:    drivers/net/wireless/libertas/
+ F:    drivers/net/wireless/marvell/libertas/
  
  MARVELL MV643XX ETHERNET DRIVER
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@@ -6728,13 -6849,13 +6849,13 @@@ M:   Amitkumar Karwar <akarwar@marvell.co
  M:    Nishant Sarmukadam <nishants@marvell.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
- F:    drivers/net/wireless/mwifiex/
+ F:    drivers/net/wireless/marvell/mwifiex/
  
  MARVELL MWL8K WIRELESS DRIVER
  M:    Lennert Buytenhek <buytenh@wantstofly.org>
  L:    linux-wireless@vger.kernel.org
  S:    Odd Fixes
- F:    drivers/net/wireless/mwl8k.c
+ F:    drivers/net/wireless/marvell/mwl8k.c
  
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
  M:    Nicolas Pitre <nico@fluxnic.net>
@@@ -6816,7 -6937,7 +6937,7 @@@ MAXIRADIO FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-maxiradio*
  
@@@ -6829,7 -6950,7 +6950,7 @@@ F:      drivers/iio/potentiometer/mcp4531.
  MEDIA DRIVERS FOR RENESAS - VSP1
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
- L:    linux-sh@vger.kernel.org
+ L:    linux-renesas-soc@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
@@@ -6838,7 -6959,7 +6959,7 @@@ F:      drivers/media/platform/vsp1
  MEDIA DRIVERS FOR ASCOT2E
  M:    Sergey Kozlov <serjk@netup.ru>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6847,7 -6968,7 +6968,7 @@@ F:      drivers/media/dvb-frontends/ascot2e
  MEDIA DRIVERS FOR CXD2841ER
  M:    Sergey Kozlov <serjk@netup.ru>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6856,7 -6977,7 +6977,7 @@@ F:      drivers/media/dvb-frontends/cxd2841e
  MEDIA DRIVERS FOR HORUS3A
  M:    Sergey Kozlov <serjk@netup.ru>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6865,7 -6986,7 +6986,7 @@@ F:      drivers/media/dvb-frontends/horus3a
  MEDIA DRIVERS FOR LNBH25
  M:    Sergey Kozlov <serjk@netup.ru>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6874,7 -6995,7 +6995,7 @@@ F:      drivers/media/dvb-frontends/lnbh25
  MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
  M:    Sergey Kozlov <serjk@netup.ru>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6884,7 -7005,7 +7005,7 @@@ MEDIA INPUT INFRASTRUCTURE (V4L/DVB
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  P:    LinuxTV.org Project
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  Q:    http://patchwork.kernel.org/project/linux-media/list/
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
@@@ -6893,6 -7014,7 +7014,7 @@@ F:      Documentation/video4linux
  F:    Documentation/DocBook/media/
  F:    drivers/media/
  F:    drivers/staging/media/
+ F:    include/linux/platform_data/media/
  F:    include/media/
  F:    include/uapi/linux/dvb/
  F:    include/uapi/linux/videodev2.h
@@@ -7002,6 -7124,7 +7124,7 @@@ F:      Documentation/hwmon/menf21bm
  METAG ARCHITECTURE
  M:    James Hogan <james.hogan@imgtec.com>
  L:    linux-metag@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
  S:    Odd Fixes
  F:    arch/metag/
  F:    Documentation/metag/
@@@ -7044,31 -7167,49 +7167,49 @@@ MIROSOUND PCM20 FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/radio/radio-miropcm20*
  
- Mellanox MLX5 core VPI driver
- M:    Eli Cohen <eli@mellanox.com>
+ MELLANOX MLX4 core VPI driver
+ M:    Yishai Hadas <yishaih@mellanox.com>
  L:    netdev@vger.kernel.org
  L:    linux-rdma@vger.kernel.org
  W:    http://www.mellanox.com
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
+ S:    Supported
+ F:    drivers/net/ethernet/mellanox/mlx4/
+ F:    include/linux/mlx4/
+ 
+ MELLANOX MLX4 IB driver
+ M:    Yishai Hadas <yishaih@mellanox.com>
+ L:    linux-rdma@vger.kernel.org
+ W:    http://www.mellanox.com
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
- T:    git git://openfabrics.org/~eli/connect-ib.git
+ S:    Supported
+ F:    drivers/infiniband/hw/mlx4/
+ F:    include/linux/mlx4/
+ 
+ MELLANOX MLX5 core VPI driver
+ M:    Matan Barak <matanb@mellanox.com>
+ M:    Leon Romanovsky <leonro@mellanox.com>
+ L:    netdev@vger.kernel.org
+ L:    linux-rdma@vger.kernel.org
+ W:    http://www.mellanox.com
+ Q:    http://patchwork.ozlabs.org/project/netdev/list/
  S:    Supported
  F:    drivers/net/ethernet/mellanox/mlx5/core/
  F:    include/linux/mlx5/
  
- Mellanox MLX5 IB driver
- M:    Eli Cohen <eli@mellanox.com>
+ MELLANOX MLX5 IB driver
+ M:    Matan Barak <matanb@mellanox.com>
+ M:    Leon Romanovsky <leonro@mellanox.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.mellanox.com
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
- T:    git git://openfabrics.org/~eli/connect-ib.git
  S:    Supported
- F:    include/linux/mlx5/
  F:    drivers/infiniband/hw/mlx5/
+ F:    include/linux/mlx5/
  
  MELEXIS MLX90614 DRIVER
  M:    Crt Mori <cmo@melexis.com>
@@@ -7080,7 -7221,7 +7221,7 @@@ F:      drivers/iio/temperature/mlx90614.
  MN88472 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -7091,7 -7232,7 +7232,7 @@@ F:      drivers/media/dvb-frontends/mn88472.
  MN88473 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -7146,7 -7287,7 +7287,7 @@@ F:      drivers/platform/x86/msi-wmi.
  MSI001 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -7156,7 -7297,7 +7297,7 @@@ F:      drivers/media/tuners/msi001
  MSI2500 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -7175,7 -7316,7 +7316,7 @@@ L:      linux-media@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/i2c/mt9m032.c
- F:    include/media/mt9m032.h
+ F:    include/media/i2c/mt9m032.h
  
  MT9P031 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@@ -7183,7 -7324,7 +7324,7 @@@ L:      linux-media@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/i2c/mt9p031.c
- F:    include/media/mt9p031.h
+ F:    include/media/i2c/mt9p031.h
  
  MT9T001 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@@ -7191,7 -7332,7 +7332,7 @@@ L:      linux-media@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/i2c/mt9t001.c
- F:    include/media/mt9t001.h
+ F:    include/media/i2c/mt9t001.h
  
  MT9V032 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@@ -7200,7 -7341,7 +7341,7 @@@ T:      git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/i2c/mt9v032.txt
  F:    drivers/media/i2c/mt9v032.c
- F:    include/media/mt9v032.h
+ F:    include/media/i2c/mt9v032.h
  
  MULTIFUNCTION DEVICES (MFD)
  M:    Lee Jones <lee.jones@linaro.org>
@@@ -7235,7 -7376,7 +7376,7 @@@ F:      drivers/tty/isicom.
  F:    include/linux/isicom.h
  
  MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
- M:    Felipe Balbi <balbi@ti.com>
+ M:    Bin Liu <b-liu@ti.com>
  L:    linux-usb@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
@@@ -7244,7 -7385,7 +7385,7 @@@ F:      drivers/usb/musb
  MXL5007T MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -7258,6 -7399,17 +7399,17 @@@ W:    https://www.myricom.com/support/down
  S:    Supported
  F:    drivers/net/ethernet/myricom/myri10ge/
  
+ NAND FLASH SUBSYSTEM
+ M:    Boris Brezillon <boris.brezillon@free-electrons.com>
+ R:    Richard Weinberger <richard@nod.at>
+ L:    linux-mtd@lists.infradead.org
+ W:    http://www.linux-mtd.infradead.org/
+ Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
+ T:    git git://github.com/linux-nand/linux.git
+ S:    Maintained
+ F:    drivers/mtd/nand/
+ F:    include/linux/mtd/nand*.h
+ 
  NATSEMI ETHERNET DRIVER (DP8381x)
  S:    Orphan
  F:    drivers/net/ethernet/natsemi/natsemi.c
@@@ -7369,6 -7521,13 +7521,13 @@@ F:    include/net/netrom.
  F:    include/uapi/linux/netrom.h
  F:    net/netrom/
  
+ NETRONOME ETHERNET DRIVERS
+ M:    Jakub Kicinski <jakub.kicinski@netronome.com>
+ M:    Rolf Neugebauer <rolf.neugebauer@netronome.com>
+ L:    oss-drivers@netronome.com
+ S:    Maintained
+ F:    drivers/net/ethernet/netronome/
+ 
  NETWORK BLOCK DEVICE (NBD)
  M:    Markus Pargmann <mpa@pengutronix.de>
  S:    Maintained
@@@ -7476,7 -7635,8 +7635,8 @@@ NETWORKING DRIVERS (WIRELESS
  M:    Kalle Valo <kvalo@codeaurora.org>
  L:    linux-wireless@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-wireless/list/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
  S:    Maintained
  F:    drivers/net/wireless/
  
@@@ -7500,7 -7660,12 +7660,12 @@@ 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
+ F:    include/linux/platform_data/st21nfca.h
+ F:    include/linux/platform_data/st-nci.h
  F:    Documentation/devicetree/bindings/net/nfc/
  
  NFS, SUNRPC, AND LOCKD CLIENTS
@@@ -7554,13 -7719,13 +7719,13 @@@ S:   Maintaine
  F:    arch/nios2/
  
  NOKIA N900 POWER SUPPLY DRIVERS
- M:    Pali Rohár <pali.rohar@gmail.com>
- S:    Maintained
+ R:    Pali Rohár <pali.rohar@gmail.com>
  F:    include/linux/power/bq2415x_charger.h
  F:    include/linux/power/bq27xxx_battery.h
  F:    include/linux/power/isp1704_charger.h
  F:    drivers/power/bq2415x_charger.c
  F:    drivers/power/bq27xxx_battery.c
+ F:    drivers/power/bq27xxx_battery_i2c.c
  F:    drivers/power/isp1704_charger.c
  F:    drivers/power/rx51_battery.c
  
@@@ -7586,6 -7751,12 +7751,12 @@@ W:    https://github.com/jonmason/ntb/wik
  T:    git git://github.com/jonmason/ntb.git
  F:    drivers/ntb/hw/intel/
  
+ NTB AMD DRIVER
+ M:    Xiangliang Yu <Xiangliang.Yu@amd.com>
+ L:    linux-ntb@googlegroups.com
+ S:    Supported
+ F:    drivers/ntb/hw/amd/
+ 
  NTFS FILESYSTEM
  M:    Anton Altaparmakov <anton@tuxera.com>
  L:    linux-ntfs-dev@lists.sourceforge.net
@@@ -7785,20 -7956,19 +7956,19 @@@ F:   drivers/media/platform/omap3isp
  F:    drivers/staging/media/omap4iss/
  
  OMAP USB SUPPORT
- M:    Felipe Balbi <balbi@ti.com>
  L:    linux-usb@vger.kernel.org
  L:    linux-omap@vger.kernel.org
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
- S:    Maintained
+ S:    Orphan
  F:    drivers/usb/*/*omap*
  F:    arch/arm/*omap*/usb*
  
  OMAP GPIO DRIVER
- M:    Javier Martinez Canillas <javier@dowhile0.org>
+ M:    Grygorii Strashko <grygorii.strashko@ti.com>
  M:    Santosh Shilimkar <ssantosh@kernel.org>
  M:    Kevin Hilman <khilman@deeprootsystems.com>
  L:    linux-omap@vger.kernel.org
  S:    Maintained
+ F:    Documentation/devicetree/bindings/gpio/gpio-omap.txt
  F:    drivers/gpio/gpio-omap.c
  
  OMAP/NEWFLOW NANOBONE MACHINE SUPPORT
@@@ -7876,6 -8046,7 +8046,7 @@@ M:      Mark Rutland <mark.rutland@arm.com
  M:    Ian Campbell <ijc+devicetree@hellion.org.uk>
  M:    Kumar Gala <galak@codeaurora.org>
  L:    devicetree@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  S:    Maintained
  F:    Documentation/devicetree/
  F:    arch/*/boot/dts/
@@@ -7950,7 -8121,7 +8121,7 @@@ L:      linux-wireless@vger.kernel.or
  W:    http://wireless.kernel.org/en/users/Drivers/orinoco
  W:    http://www.nongnu.org/orinoco/
  S:    Orphan
- F:    drivers/net/wireless/orinoco/
+ F:    drivers/net/wireless/intersil/orinoco/
  
  OSD LIBRARY and FILESYSTEM
  M:    Boaz Harrosh <ooo@electrozaur.com>
@@@ -7971,20 -8142,12 +8142,20 @@@ S:   Supporte
  F:    fs/overlayfs/
  F:    Documentation/filesystems/overlayfs.txt
  
 +ORANGEFS FILESYSTEM
 +M:    Mike Marshall <hubcap@omnibond.com>
 +L:    pvfs2-developers@beowulf-underground.org
 +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 <chunkeey@googlemail.com>
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/en/users/Drivers/p54
  S:    Maintained
- F:    drivers/net/wireless/p54/
+ F:    drivers/net/wireless/intersil/p54/
  
  PA SEMI ETHERNET DRIVER
  M:    Olof Johansson <olof@lixom.net>
@@@ -8200,7 -8363,7 +8371,7 @@@ F:      drivers/pci/host/pci-dra7xx.
  PCI DRIVER FOR RENESAS R-CAR
  M:    Simon Horman <horms@verge.net.au>
  L:    linux-pci@vger.kernel.org
- L:    linux-sh@vger.kernel.org
+ L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/pci/host/*rcar*
  
@@@ -8227,6 -8390,12 +8398,12 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
  F:    drivers/pci/host/pci-host-generic.c
  
+ PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
+ M:    Keith Busch <keith.busch@intel.com>
+ L:    linux-pci@vger.kernel.org
+ S:    Supported
+ F:    arch/x86/pci/vmd.c
+ 
  PCIE DRIVER FOR ST SPEAR13XX
  M:    Pratyush Anand <pratyush.anand@gmail.com>
  L:    linux-pci@vger.kernel.org
@@@ -8251,16 -8420,24 +8428,24 @@@ F:   drivers/pci/host/pci-xgene-msi.
  
  PCIE DRIVER FOR HISILICON
  M:    Zhou Wang <wangzhou1@hisilicon.com>
+ M:    Gabriele Paoloni <gabriele.paoloni@huawei.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
  F:    drivers/pci/host/pcie-hisi.c
  
+ PCIE DRIVER FOR QUALCOMM MSM
+ M:     Stanimir Varbanov <svarbanov@mm-sol.com>
+ L:     linux-pci@vger.kernel.org
+ L:     linux-arm-msm@vger.kernel.org
+ S:     Maintained
+ F:     drivers/pci/host/*qcom*
+ 
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    linux-pcmcia@lists.infradead.org
  W:    http://lists.infradead.org/mailman/listinfo/linux-pcmcia
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git
  S:    Maintained
  F:    Documentation/pcmcia/
  F:    drivers/pcmcia/
@@@ -8377,7 -8554,8 +8562,8 @@@ F:      drivers/pinctrl/intel
  
  PIN CONTROLLER - RENESAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- L:    linux-sh@vger.kernel.org
+ M:    Geert Uytterhoeven <geert+renesas@glider.be>
+ L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/pinctrl/sh-pfc/
  
@@@ -8455,6 -8633,17 +8641,17 @@@ F:    fs/timerfd.
  F:    include/linux/timer*
  F:    kernel/time/*timer*
  
+ POWER MANAGEMENT CORE
+ M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
+ L:    linux-pm@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+ S:    Supported
+ F:    drivers/base/power/
+ F:    include/linux/pm.h
+ F:    include/linux/pm_*
+ F:    include/linux/powercap.h
+ F:    drivers/powercap/
+ 
  POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
  M:    Sebastian Reichel <sre@kernel.org>
  M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
@@@ -8534,7 -8723,7 +8731,7 @@@ M:      "Luis R. Rodriguez" <mcgrof@gmail.co
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/en/users/Drivers/p54
  S:    Obsolete
- F:    drivers/net/wireless/prism54/
+ F:    drivers/net/wireless/intersil/prism54/
  
  PS3 NETWORK SUPPORT
  M:    Geoff Levand <geoff@infradead.org>
@@@ -8570,7 -8759,7 +8767,7 @@@ M:      Colin Cross <ccross@android.com
  M:    Kees Cook <keescook@chromium.org>
  M:    Tony Luck <tony.luck@intel.com>
  S:    Maintained
- T:    git git://git.infradead.org/users/cbou/linux-pstore.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
  F:    fs/pstore/
  F:    include/linux/pstore*
  F:    drivers/firmware/efi/efi-pstore.c
@@@ -8644,15 -8833,23 +8841,23 @@@ L:   linux-arm-kernel@lists.infradead.or
  T:    git git://github.com/hzhuang1/linux.git
  T:    git git://github.com/rjarzmik/linux.git
  S:    Maintained
+ F:    arch/arm/boot/dts/pxa*
  F:    arch/arm/mach-pxa/
  F:    drivers/dma/pxa*
  F:    drivers/pcmcia/pxa2xx*
+ F:    drivers/pinctrl/pxa/
  F:    drivers/spi/spi-pxa2xx*
  F:    drivers/usb/gadget/udc/pxa2*
  F:    include/sound/pxa2xx-lib.h
  F:    sound/arm/pxa*
  F:    sound/soc/pxa/
  
+ PXA GPIO DRIVER
+ M:    Robert Jarzmik <robert.jarzmik@free.fr>
+ L:    linux-gpio@vger.kernel.org
+ S:    Maintained
+ F:    drivers/gpio/gpio-pxa.c
+ 
  PXA3xx NAND FLASH DRIVER
  M:    Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  L:    linux-mtd@lists.infradead.org
@@@ -8666,6 -8863,7 +8871,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  T:    git git://github.com/hzhuang1/linux.git
  T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
  S:    Maintained
+ F:    arch/arm/boot/dts/mmp*
  F:    arch/arm/mach-mmp/
  
  PXA MMCI DRIVER
@@@ -8753,7 -8951,7 +8959,7 @@@ F:      include/uapi/linux/qnxtypes.
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -8772,13 -8970,14 +8978,14 @@@ QUALCOMM ATHEROS ATH10K WIRELESS DRIVE
  M:    Kalle Valo <kvalo@qca.qualcomm.com>
  L:    ath10k@lists.infradead.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath10k
- T:    git git://github.com/kvalo/ath.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  S:    Supported
  F:    drivers/net/wireless/ath/ath10k/
  
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Richard Kuo <rkuo@codeaurora.org>
  L:    linux-hexagon@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git
  S:    Supported
  F:    arch/hexagon/
  
@@@ -8831,13 -9030,19 +9038,19 @@@ L:   linux-fbdev@vger.kernel.or
  S:    Maintained
  F:    drivers/video/fbdev/aty/aty128fb.c
  
+ RALINK MIPS ARCHITECTURE
+ M:    John Crispin <blogic@openwrt.org>
+ L:    linux-mips@linux-mips.org
+ S:    Maintained
+ F:    arch/mips/ralink
+ 
  RALINK RT2X00 WIRELESS LAN DRIVER
  P:    rt2x00 project
  M:    Stanislaw Gruszka <sgruszka@redhat.com>
  M:    Helmut Schaa <helmut.schaa@googlemail.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
- F:    drivers/net/wireless/rt2x00/
+ F:    drivers/net/wireless/ralink/rt2x00/
  
  RAMDISK RAM BLOCK DEVICE DRIVER
  M:    Jens Axboe <axboe@kernel.dk>
@@@ -8965,12 -9170,19 +9178,19 @@@ F:   include/linux/rpmsg.
  RENESAS ETHERNET DRIVERS
  R:    Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
  L:    netdev@vger.kernel.org
- L:    linux-sh@vger.kernel.org
+ L:    linux-renesas-soc@vger.kernel.org
  F:    drivers/net/ethernet/renesas/
  F:    include/linux/sh_eth.h
  
+ RENESAS USB2 PHY DRIVER
+ M:    Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
+ L:    linux-renesas-soc@vger.kernel.org
+ S:    Maintained
+ F:    drivers/phy/phy-rcar-gen3-usb2.c
+ 
  RESET CONTROLLER FRAMEWORK
  M:    Philipp Zabel <p.zabel@pengutronix.de>
+ T:    git git://git.pengutronix.de/git/pza/linux
  S:    Maintained
  F:    drivers/reset/
  F:    Documentation/devicetree/bindings/reset/
@@@ -9046,7 -9258,7 +9266,7 @@@ F:      net/rose
  RTL2830 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -9056,7 -9268,7 +9276,7 @@@ F:      drivers/media/dvb-frontends/rtl2830
  RTL2832 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -9066,7 -9278,7 +9286,7 @@@ F:      drivers/media/dvb-frontends/rtl2832
  RTL2832_SDR MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -9078,7 -9290,7 +9298,7 @@@ L:      linux-wireless@vger.kernel.or
  W:    http://wireless.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Orphan
- F:    drivers/net/wireless/rtl818x/rtl8180/
+ F:    drivers/net/wireless/realtek/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
  M:    Herton Ronaldo Krzesinski <herton@canonical.com>
@@@ -9088,7 -9300,7 +9308,7 @@@ L:      linux-wireless@vger.kernel.or
  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/rtl818x/rtl8187/
+ F:    drivers/net/wireless/realtek/rtl818x/rtl8187/
  
  RTL8192CE WIRELESS DRIVER
  M:    Larry Finger <Larry.Finger@lwfinger.net>
@@@ -9097,8 -9309,8 +9317,8 @@@ L:      linux-wireless@vger.kernel.or
  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/rtlwifi/
- F:    drivers/net/wireless/rtlwifi/rtl8192ce/
+ F:    drivers/net/wireless/realtek/rtlwifi/
+ F:    drivers/net/wireless/realtek/rtlwifi/rtl8192ce/
  
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <Jes.Sorensen@redhat.com>
@@@ -9118,6 -9330,7 +9338,7 @@@ M:      Martin Schwidefsky <schwidefsky@de.i
  M:    Heiko Carstens <heiko.carstens@de.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
  S:    Supported
  F:    arch/s390/
  F:    drivers/s390/
@@@ -9142,7 -9355,7 +9363,7 @@@ F:      drivers/s390/block/dasd
  F:    block/partitions/ibm.c
  
  S390 NETWORK DRIVERS
- M:    Ursula Braun <ursula.braun@de.ibm.com>
+ M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -9172,7 -9385,7 +9393,7 @@@ S:      Supporte
  F:    drivers/s390/scsi/zfcp_*
  
  S390 IUCV NETWORK LAYER
- M:    Ursula Braun <ursula.braun@de.ibm.com>
+ M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -9197,14 -9410,14 +9418,14 @@@ SAA6588 RDS RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/i2c/saa6588*
  
  SAA7134 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    Documentation/video4linux/*.saa7134
@@@ -9249,8 -9462,10 +9470,10 @@@ F:    drivers/regulator/s5m*.
  F:    drivers/clk/clk-s2mps11.c
  F:    drivers/rtc/rtc-s5m.c
  F:    include/linux/mfd/samsung/
- F:    Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
- F:    Documentation/devicetree/bindings/mfd/s2mp*.txt
+ F:    Documentation/devicetree/bindings/mfd/samsung,sec-core.txt
+ F:    Documentation/devicetree/bindings/regulator/samsung,s2m*.txt
+ F:    Documentation/devicetree/bindings/regulator/samsung,s5m*.txt
+ F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.txt
  
  SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
  M:    Kyungmin Park <kyungmin.park@samsung.com>
@@@ -9266,7 -9481,7 +9489,7 @@@ L:      linux-media@vger.kernel.or
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/media/platform/s3c-camif/
- F:    include/media/s3c_camif.h
+ F:    include/media/drv-intf/s3c_camif.h
  
  SAMSUNG S5C73M3 CAMERA DRIVER
  M:    Kyungmin Park <kyungmin.park@samsung.com>
@@@ -9308,7 -9523,7 +9531,7 @@@ M:      Lukasz Majewski <l.majewski@samsung.
  L:    linux-pm@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Supported
- T:    https://github.com/lmajewski/linux-samsung-thermal.git
+ T:    git https://github.com/lmajewski/linux-samsung-thermal.git
  F:    drivers/thermal/samsung/
  
  SAMSUNG USB2 PHY DRIVER
@@@ -9374,7 -9589,13 +9597,13 @@@ M:    Andreas Noever <andreas.noever@gmail
  S:    Maintained
  F:    drivers/thunderbolt/
  
- TIMEKEEPING, CLOCKSOURCE CORE, NTP
+ TI BQ27XXX POWER SUPPLY DRIVER
+ R:    Andrew F. Davis <afd@ti.com>
+ F:    include/linux/power/bq27xxx_battery.h
+ F:    drivers/power/bq27xxx_battery.c
+ F:    drivers/power/bq27xxx_battery_i2c.c
+ 
+ TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
  M:    John Stultz <john.stultz@linaro.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
  L:    linux-kernel@vger.kernel.org
@@@ -9387,6 -9608,7 +9616,7 @@@ F:      include/uapi/linux/time.
  F:    include/uapi/linux/timex.h
  F:    kernel/time/clocksource.c
  F:    kernel/time/time*.c
+ F:    kernel/time/alarmtimer.c
  F:    kernel/time/ntp.c
  F:    tools/testing/selftests/timers/
  
@@@ -9594,10 -9816,11 +9824,11 @@@ S:   Supporte
  F:    drivers/scsi/be2iscsi/
  
  Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER
- M:    Sathya Perla <sathya.perla@avagotech.com>
- M:    Ajit Khaparde <ajit.khaparde@avagotech.com>
- M:    Padmanabh Ratnakar <padmanabh.ratnakar@avagotech.com>
- M:    Sriharsha Basavapatna <sriharsha.basavapatna@avagotech.com>
+ M:    Sathya Perla <sathya.perla@broadcom.com>
+ M:    Ajit Khaparde <ajit.khaparde@broadcom.com>
+ M:    Padmanabh Ratnakar <padmanabh.ratnakar@broadcom.com>
+ M:    Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
+ M:    Somnath Kotur <somnath.kotur@broadcom.com>
  L:    netdev@vger.kernel.org
  W:    http://www.emulex.com
  S:    Supported
@@@ -9641,7 -9864,7 +9872,7 @@@ F:      drivers/misc/sgi-xp
  SI2157 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -9651,7 -9874,7 +9882,7 @@@ F:      drivers/media/tuners/si2157
  SI2168 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -9662,7 -9885,7 +9893,7 @@@ SI470X FM RADIO RECEIVER I2C DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/radio/si470x/radio-si470x-i2c.c
  
@@@ -9670,7 -9893,7 +9901,7 @@@ SI470X FM RADIO RECEIVER USB DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/si470x/radio-si470x-common.c
  F:    drivers/media/radio/si470x/radio-si470x.h
@@@ -9680,7 -9903,7 +9911,7 @@@ SI4713 FM RADIO TRANSMITTER I2C DRIVE
  M:    Eduardo Valentin <edubezval@gmail.com>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/radio/si4713/si4713.?
  
@@@ -9688,7 -9911,7 +9919,7 @@@ SI4713 FM RADIO TRANSMITTER PLATFORM DR
  M:    Eduardo Valentin <edubezval@gmail.com>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/radio/si4713/radio-platform-si4713.c
  
@@@ -9696,14 -9919,14 +9927,14 @@@ SI4713 FM RADIO TRANSMITTER USB DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/si4713/radio-usb-si4713.c
  
  SIANO DVB DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    drivers/media/common/siano/
@@@ -9728,7 -9951,7 +9959,7 @@@ SH_VOU V4L2 OUTPUT DRIVE
  L:    linux-media@vger.kernel.org
  S:    Orphan
  F:    drivers/media/platform/sh_vou.c
- F:    include/media/sh_vou.h
+ F:    include/media/drv-intf/sh_vou.h
  
  SIMPLE FIRMWARE INTERFACE (SFI)
  M:    Len Brown <lenb@kernel.org>
@@@ -9769,7 -9992,7 +10000,7 @@@ F:     drivers/i2c/busses/i2c-davinci.
  TI DAVINCI SERIES MEDIA DRIVER
  M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
  S:    Maintained
@@@ -9779,7 -10002,7 +10010,7 @@@ F:    include/media/davinci
  TI AM437X VPFE DRIVER
  M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
  S:    Maintained
@@@ -9788,12 -10011,12 +10019,12 @@@ F: drivers/media/platform/am437x
  OV2659 OMNIVISION SENSOR DRIVER
  M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
  S:    Maintained
  F:    drivers/media/i2c/ov2659.c
- F:    include/media/ov2659.h
+ F:    include/media/i2c/ov2659.h
  
  SILICON MOTION SM712 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@@ -9882,7 -10105,7 +10113,7 @@@ M:    Sakari Ailus <sakari.ailus@iki.fi
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/i2c/smiapp/
- F:    include/media/smiapp.h
+ F:    include/media/i2c/smiapp.h
  F:    drivers/media/i2c/smiapp-pll.c
  F:    drivers/media/i2c/smiapp-pll.h
  F:    include/uapi/linux/smiapp.h
@@@ -9959,8 -10182,9 +10190,9 @@@ S:    Supporte
  F:    drivers/media/pci/solo6x10/
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
- M:    Neil Brown <neilb@suse.com>
+ M:    Shaohua Li <shli@kernel.org>
  L:    linux-raid@vger.kernel.org
+ T:    git git://neil.brown.name/md
  S:    Supported
  F:    drivers/md/
  F:    include/linux/raid/
@@@ -9974,7 -10198,7 +10206,7 @@@ F:    drivers/net/ethernet/natsemi/sonic.
  
  SONICS SILICON BACKPLANE DRIVER (SSB)
  M:    Michael Buesch <m@bues.ch>
- L:    netdev@vger.kernel.org
+ L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/ssb/
  F:    include/linux/ssb/
@@@ -10046,7 -10270,7 +10278,7 @@@ F:   sound/soc/soc-generic-dmaengine-pcm.
  SP2 MEDIA DRIVER
  M:    Olli Salonen <olli.salonen@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  S:    Maintained
  F:    drivers/media/dvb-frontends/sp2*
@@@ -10092,6 -10316,7 +10324,7 @@@ L:   spear-devel@list.st.co
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
+ F:    arch/arm/boot/dts/spear*
  F:    arch/arm/mach-spear/
  
  SPEAR CLOCK FRAMEWORK SUPPORT
@@@ -10132,6 -10357,7 +10365,7 @@@ SQUASHFS FILE SYSTE
  M:    Phillip Lougher <phillip@squashfs.org.uk>
  L:    squashfs-devel@lists.sourceforge.net (subscribers-only)
  W:    http://squashfs.org.uk
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git
  S:    Maintained
  F:    Documentation/filesystems/squashfs.txt
  F:    fs/squashfs/
@@@ -10297,9 -10523,11 +10531,11 @@@ S: Maintaine
  F:    drivers/net/ethernet/dlink/sundance.c
  
  SUPERH
+ M:    Yoshinori Sato <ysato@users.sourceforge.jp>
+ M:    Rich Felker <dalias@libc.org>
  L:    linux-sh@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
- S:    Orphan
+ S:    Maintained
  F:    Documentation/sh/
  F:    arch/sh/
  F:    drivers/sh/
@@@ -10328,6 -10556,7 +10564,7 @@@ F:   arch/x86/boot/video
  SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  L:    linux-kernel@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
  S:    Supported
  F:    lib/swiotlb.c
  F:    arch/*/kernel/pci-swiotlb.c
@@@ -10408,7 -10637,7 +10645,7 @@@ F:   net/ipv4/tcp_lp.
  TDA10071 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -10418,7 -10647,7 +10655,7 @@@ F:   drivers/media/dvb-frontends/tda10071
  TDA18212 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -10428,7 -10657,7 +10665,7 @@@ F:   drivers/media/tuners/tda18212
  TDA18218 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -10438,7 -10667,7 +10675,7 @@@ F:   drivers/media/tuners/tda18218
  TDA18271 MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -10448,7 -10677,7 +10685,7 @@@ F:   drivers/media/tuners/tda18271
  TDA827x MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -10458,7 -10687,7 +10695,7 @@@ F:   drivers/media/tuners/tda8290.
  TDA8290 MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -10469,14 -10698,14 +10706,14 @@@ TDA9840 MEDIA DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/i2c/tda9840*
  
  TEA5761 TUNER DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    drivers/media/tuners/tea5761.*
@@@ -10484,7 -10713,7 +10721,7 @@@
  TEA5767 TUNER DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/tuners/tea5767.*
@@@ -10493,7 -10722,7 +10730,7 @@@ TEA6415C MEDIA DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/i2c/tea6415c*
  
@@@ -10501,7 -10730,7 +10738,7 @@@ TEA6420 MEDIA DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/i2c/tea6420*
  
@@@ -10591,6 -10820,7 +10828,7 @@@ TENSILICA XTENSA PORT (xtensa
  M:    Chris Zankel <chris@zankel.net>
  M:    Max Filippov <jcmvbkbc@gmail.com>
  L:    linux-xtensa@linux-xtensa.org
+ T:    git git://github.com/czankel/xtensa-linux.git
  S:    Maintained
  F:    arch/xtensa/
  F:    drivers/irqchip/irq-xtensa-*
@@@ -10599,7 -10829,7 +10837,7 @@@ THANKO'S RAREMONO AM/FM/SW RADIO RECEIV
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-raremono.c
  
@@@ -10749,6 -10979,7 +10987,7 @@@ F:   net/tipc
  TILE ARCHITECTURE
  M:    Chris Metcalf <cmetcalf@ezchip.com>
  W:    http://www.ezchip.com/scm/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git
  S:    Supported
  F:    arch/tile/
  F:    drivers/char/tile-srom.c
@@@ -10823,7 -11054,7 +11062,7 @@@ M:   Mats Randgaard <matrandg@cisco.com
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/i2c/tc358743*
- F:    include/media/tc358743.h
+ F:    include/media/i2c/tc358743.h
  
  TMIO MMC DRIVER
  M:    Ian Molton <ian@mnementh.co.uk>
@@@ -10851,7 -11082,7 +11090,7 @@@ F:   mm/shmem.
  TM6000 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    drivers/media/usb/tm6000/
@@@ -10860,7 -11091,7 +11099,7 @@@ TW68 VIDEO4LINUX DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/pci/tw68/
  
@@@ -10872,7 -11103,7 +11111,7 @@@ R:   Jason Gunthorpe <jgunthorpe@obsidian
  W:    http://tpmdd.sourceforge.net
  L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
  Q:    git git://github.com/PeterHuewe/linux-tpmdd.git
- T:    https://github.com/PeterHuewe/linux-tpmdd
+ T:    git https://github.com/PeterHuewe/linux-tpmdd
  S:    Maintained
  F:    drivers/char/tpm/
  
@@@ -10921,7 -11152,7 +11160,7 @@@ F:   include/uapi/linux/tty.
  TUA9001 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org/
+ 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
@@@ -11113,7 -11344,7 +11352,7 @@@ F:   Documentation/usb/ehci.tx
  F:    drivers/usb/host/ehci*
  
  USB GADGET/PERIPHERAL SUBSYSTEM
- M:    Felipe Balbi <balbi@ti.com>
+ M:    Felipe Balbi <balbi@kernel.org>
  L:    linux-usb@vger.kernel.org
  W:    http://www.linux-usb.org/gadget
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
@@@ -11123,6 -11354,7 +11362,7 @@@ F:   include/linux/usb/gadget
  
  USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
  M:    Jiri Kosina <jikos@kernel.org>
+ R:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
  L:    linux-usb@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
@@@ -11164,7 -11396,7 +11404,7 @@@ F:   Documentation/usb/ohci.tx
  F:    drivers/usb/host/ohci*
  
  USB OTG FSM (Finite State Machine)
- M:    Peter Chen <Peter.Chen@freescale.com>
+ M:    Peter Chen <Peter.Chen@nxp.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
  L:    linux-usb@vger.kernel.org
  S:    Maintained
@@@ -11188,7 -11420,7 +11428,7 @@@ S:   Maintaine
  F:    drivers/net/usb/pegasus.*
  
  USB PHY LAYER
- M:    Felipe Balbi <balbi@ti.com>
+ M:    Felipe Balbi <balbi@kernel.org>
  L:    linux-usb@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
@@@ -11200,6 -11432,13 +11440,13 @@@ L: linux-usb@vger.kernel.or
  S:    Supported
  F:    drivers/usb/class/usblp.c
  
+ USB QMI WWAN NETWORK DRIVER
+ M:    Bjørn Mork <bjorn@mork.no>
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/ABI/testing/sysfs-class-net-qmi
+ F:    drivers/net/usb/qmi_wwan.c
+ 
  USB RTL8150 DRIVER
  M:    Petko Manolov <petkan@nucleusys.com>
  L:    linux-usb@vger.kernel.org
@@@ -11268,7 -11507,7 +11515,7 @@@ USB VISION DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/usb/usbvision/
  
@@@ -11296,7 -11535,7 +11543,7 @@@ USB ZD1201 DRIVE
  L:    linux-wireless@vger.kernel.org
  W:    http://linux-lc100020.sourceforge.net
  S:    Orphan
- F:    drivers/net/wireless/zd1201.*
+ F:    drivers/net/wireless/zydas/zd1201.*
  
  USB ZR364XX DRIVER
  M:    Antoine Jacquet <royale@zerezo.com>
@@@ -11321,6 -11560,7 +11568,7 @@@ M:   Richard Weinberger <richard@nod.at
  L:    user-mode-linux-devel@lists.sourceforge.net
  L:    user-mode-linux-user@lists.sourceforge.net
  W:    http://user-mode-linux.sourceforge.net
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
  S:    Maintained
  F:    Documentation/virtual/uml/
  F:    arch/um/
@@@ -11367,6 -11607,7 +11615,7 @@@ F:   fs/fat
  VFIO DRIVER
  M:    Alex Williamson <alex.williamson@redhat.com>
  L:    kvm@vger.kernel.org
+ T:    git git://github.com/awilliam/linux-vfio.git
  S:    Maintained
  F:    Documentation/vfio.txt
  F:    drivers/vfio/
@@@ -11436,6 -11677,7 +11685,7 @@@ M:   "Michael S. Tsirkin" <mst@redhat.com
  L:    kvm@vger.kernel.org
  L:    virtualization@lists.linux-foundation.org
  L:    netdev@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
  S:    Maintained
  F:    drivers/vhost/
  F:    include/uapi/linux/vhost.h
@@@ -11482,7 -11724,7 +11732,7 @@@ VIVID VIRTUAL VIDEO DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/platform/vivid/*
  
@@@ -11628,6 -11870,7 +11878,7 @@@ F:   drivers/input/tablet/wacom_serial4.
  
  WATCHDOG DEVICE DRIVERS
  M:    Wim Van Sebroeck <wim@iguana.be>
+ R:    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
@@@ -11699,6 -11942,7 +11950,7 @@@ F:   drivers/input/touchscreen/wm831x-ts.
  F:    drivers/input/touchscreen/wm97*.c
  F:    drivers/mfd/arizona*
  F:    drivers/mfd/wm*.c
+ F:    drivers/mfd/cs47l24*
  F:    drivers/power/wm83*.c
  F:    drivers/rtc/rtc-wm83*.c
  F:    drivers/regulator/wm8*.c
@@@ -11712,6 -11956,7 +11964,7 @@@ F:   include/linux/wm97xx.
  F:    include/sound/wm????.h
  F:    sound/soc/codecs/arizona.?
  F:    sound/soc/codecs/wm*
+ F:    sound/soc/codecs/cs47l24*
  
  WORKQUEUE
  M:    Tejun Heo <tj@kernel.org>
@@@ -11771,7 -12016,7 +12024,7 @@@ F:   arch/x86/entry/vdso
  XC2028/3028 TUNER DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
- W:    http://linuxtv.org
+ W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/tuners/tuner-xc2028.*
@@@ -11805,7 -12050,6 +12058,6 @@@ F:   arch/arm64/xen
  F:    arch/arm64/include/asm/xen/
  
  XEN NETWORK BACKEND DRIVER
- M:    Ian Campbell <ian.campbell@citrix.com>
  M:    Wei Liu <wei.liu2@citrix.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  L:    netdev@vger.kernel.org
@@@ -11849,7 -12093,7 +12101,7 @@@ M:   Dave Chinner <david@fromorbit.com
  M:    xfs@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs
- T:    git git://oss.sgi.com/xfs/xfs.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
  S:    Supported
  F:    Documentation/filesystems/xfs.txt
  F:    fs/xfs/
@@@ -11914,7 -12158,7 +12166,7 @@@ F:   drivers/net/hamradio/*scc.
  F:    drivers/net/hamradio/z8530.h
  
  ZBUD COMPRESSED PAGE ALLOCATOR
- M:    Seth Jennings <sjennings@variantweb.net>
+ M:    Seth Jennings <sjenning@redhat.com>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/zbud.c
@@@ -11927,7 -12171,7 +12179,7 @@@ W:   http://zd1211.ath.cx/wiki/DriverRewr
  L:    linux-wireless@vger.kernel.org
  L:    zd1211-devs@lists.sourceforge.net (subscribers-only)
  S:    Maintained
- F:    drivers/net/wireless/zd1211rw/
+ F:    drivers/net/wireless/zydas/zd1211rw/
  
  ZPOOL COMPRESSED PAGE STORAGE API
  M:    Dan Streetman <ddstreet@ieee.org>
@@@ -11940,7 -12184,7 +12192,7 @@@ ZR36067 VIDEO FOR LINUX DRIVE
  L:    mjpeg-users@lists.sourceforge.net
  L:    linux-media@vger.kernel.org
  W:    http://mjpeg.sourceforge.net/driver-zoran/
- T:    hg http://linuxtv.org/hg/v4l-dvb
+ T:    hg https://linuxtv.org/hg/v4l-dvb
  S:    Odd Fixes
  F:    drivers/media/pci/zoran/
  
@@@ -11969,7 -12213,7 +12221,7 @@@ F:   include/linux/zsmalloc.
  F:    Documentation/vm/zsmalloc.txt
  
  ZSWAP COMPRESSED SWAP CACHING
- M:    Seth Jennings <sjennings@variantweb.net>
+ M:    Seth Jennings <sjenning@redhat.com>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/zswap.c

diff --combined fs/Kconfig
index 916d8348705b574c05c12cccf8d2e2dfdcad0db8,9adee0d7536e11343c9050b84174be6d2b90bdfc..922893f8ab4a5f6f2f9241e713c6fd4a6de103a0
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -50,7 -50,8 +50,8 @@@ config FS_DAX_PM
        bool
        default FS_DAX
        depends on FS_DAX
-       depends on BROKEN
+       depends on ZONE_DEVICE
+       depends on TRANSPARENT_HUGEPAGE
  
  endif # BLOCK
  
@@@ -73,6 -74,16 +74,16 @@@ config FILE_LOCKIN
            for filesystems like NFS and for the flock() system
            call. Disabling this option saves about 11k.
  
+ config MANDATORY_FILE_LOCKING
+       bool "Enable Mandatory file locking"
+       depends on FILE_LOCKING
+       default y
+       help
+         This option enables files appropriately marked files on appropriely
+         mounted filesystems to support mandatory locking.
+ 
+         To the best of my knowledge this is dead code that no one cares about.
+ 
  source "fs/notify/Kconfig"
  
  source "fs/quota/Kconfig"
@@@ -196,7 -207,6 +207,7 @@@ menuconfig MISC_FILESYSTEM
  
  if MISC_FILESYSTEMS
  
 +source "fs/orangefs/Kconfig"
  source "fs/adfs/Kconfig"
  source "fs/affs/Kconfig"
  source "fs/ecryptfs/Kconfig"