Merge tag 'mmc-v4.8' of git://git.linaro.org/people/ulf.hansson/mmc

author Linus Torvalds <torvalds@linux-foundation.org>

Mon, 1 Aug 2016 01:36:58 +0000 (21:36 -0400)

committer Linus Torvalds <torvalds@linux-foundation.org>

Mon, 1 Aug 2016 01:36:58 +0000 (21:36 -0400)
author Linus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Aug 2016 01:36:58 +0000 (21:36 -0400)
committer Linus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Aug 2016 01:36:58 +0000 (21:36 -0400)
diff --combined MAINTAINERS

index 0868ea5,6ae7139..72f7703
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -213,7 -213,7 +213,7 @@@ S: Maintaine
   F:    drivers/media/dvb-frontends/a8293*
   
   AACRAID SCSI RAID DRIVER
- -M:    Adaptec OEM Raid Solutions <aacraid@adaptec.com>
+ +M:    Adaptec OEM Raid Solutions <aacraid@microsemi.com>
   L:    linux-scsi@vger.kernel.org
   W:    http://www.adaptec.com/
   S:    Supported
@@@ -288,7 -288,6 +288,7 @@@ F: include/linux/acpi.
   F:    include/acpi/
   F:    Documentation/acpi/
   F:    Documentation/ABI/testing/sysfs-bus-acpi
+ +F:    Documentation/ABI/testing/configfs-acpi
   F:    drivers/pci/*acpi*
   F:    drivers/pci/*/*acpi*
   F:    drivers/pci/*/*/*acpi*
@@@ -840,9 -839,7 +840,9 @@@ M: Iyappan Subramanian <isubramanian@ap
   M:    Keyur Chudgar <kchudgar@apm.com>
   S:    Supported
   F:    drivers/net/ethernet/apm/xgene/
+ +F:    drivers/net/phy/mdio-xgene.c
   F:    Documentation/devicetree/bindings/net/apm-xgene-enet.txt
+ +F:    Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
   
   APTINA CAMERA SENSOR PLL
   M:    Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
@@@ -1611,6 -1608,7 +1611,6 @@@ F:      drivers/*/*/*s3c2410
   F:    drivers/memory/samsung/*
   F:    drivers/soc/samsung/*
   F:    drivers/spi/spi-s3c*
- -F:    sound/soc/samsung/*
   F:    Documentation/arm/Samsung/
   F:    Documentation/devicetree/bindings/arm/samsung/
   F:    Documentation/devicetree/bindings/sram/samsung-sram.txt
@@@ -1649,13 -1647,6 +1649,13 @@@ L:    linux-media@vger.kernel.or
   S:    Maintained
   F:    drivers/media/platform/s5p-tv/
   
+ +ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
+ +M:    Kyungmin Park <kyungmin.park@samsung.com>
+ +L:    linux-arm-kernel@lists.infradead.org
+ +L:    linux-media@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/staging/media/platform/s5p-cec/
+ +
   ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
   M:    Andrzej Pietrasiewicz <andrzej.p@samsung.com>
   M:    Jacek Anaszewski <j.anaszewski@samsung.com>
@@@ -1678,6 -1669,7 +1678,6 @@@ F:      arch/arm/boot/dts/sh
   F:    arch/arm/configs/shmobile_defconfig
   F:    arch/arm/include/debug/renesas-scif.S
   F:    arch/arm/mach-shmobile/
- -F:    drivers/sh/
   F:    drivers/soc/renesas/
   F:    include/linux/soc/renesas/
   
@@@ -2304,7 -2296,6 +2304,7 @@@ S:      Maintaine
   F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
   F:    Documentation/ABI/testing/sysfs-class-net-mesh
   F:    Documentation/networking/batman-adv.txt
+ +F:    include/uapi/linux/batman_adv.h
   F:    net/batman-adv/
   
   BAYCOM/HDLCDRV DRIVERS FOR AX.25
@@@ -2468,14 -2459,6 +2468,14 @@@ L:    netdev@vger.kernel.or
   S:    Supported
   F:    drivers/net/ethernet/broadcom/b44.*
   
+ +BROADCOM B53 ETHERNET SWITCH DRIVER
+ +M:    Florian Fainelli <f.fainelli@gmail.com>
+ +L:    netdev@vger.kernel.org
+ +L:    openwrt-devel@lists.openwrt.org (subscribers-only)
+ +S:    Supported
+ +F:    drivers/net/dsa/b53/*
+ +F:    include/linux/platform_data/b53.h
+ +
   BROADCOM GENET ETHERNET DRIVER
   M:    Florian Fainelli <f.fainelli@gmail.com>
   L:    netdev@vger.kernel.org
@@@ -2592,11 -2575,12 +2592,11 @@@ S:   Supporte
   F:    drivers/net/ethernet/broadcom/tg3.*
   
   BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
- -M:    Brett Rudley <brudley@broadcom.com>
- -M:    Arend van Spriel <arend@broadcom.com>
- -M:    Franky (Zhenhui) Lin <frankyl@broadcom.com>
- -M:    Hante Meuleman <meuleman@broadcom.com>
+ +M:    Arend van Spriel <arend.vanspriel@broadcom.com>
+ +M:    Franky Lin <franky.lin@broadcom.com>
+ +M:    Hante Meuleman <hante.meuleman@broadcom.com>
   L:    linux-wireless@vger.kernel.org
- -L:    brcm80211-dev-list@broadcom.com
+ +L:    brcm80211-dev-list.pdl@broadcom.com
   S:    Supported
   F:    drivers/net/wireless/broadcom/brcm80211/
   
@@@ -2828,7 -2812,6 +2828,7 @@@ W:      https://github.com/linux-ca
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/net/can/
   F:    drivers/net/can/
   F:    include/linux/can/dev.h
   F:    include/linux/can/platform/
@@@ -2836,7 -2819,7 +2836,7 @@@ F:      include/uapi/linux/can/error.
   F:    include/uapi/linux/can/netlink.h
   
   CAPABILITIES
- -M:    Serge Hallyn <serge.hallyn@canonical.com>
+ +M:    Serge Hallyn <serge@hallyn.com>
   L:    linux-security-module@vger.kernel.org
   S:    Supported
   F:    include/linux/capability.h
@@@ -2868,22 -2851,6 +2868,22 @@@ F:    drivers/net/ieee802154/cc2520.
   F:    include/linux/spi/cc2520.h
   F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
   
+ +CEC DRIVER
+ +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
+ +S:    Supported
+ +F:    Documentation/cec.txt
+ +F:    Documentation/DocBook/media/v4l/cec*
+ +F:    drivers/staging/media/cec/
+ +F:    drivers/media/cec-edid.c
+ +F:    drivers/media/rc/keymaps/rc-cec.c
+ +F:    include/media/cec.h
+ +F:    include/media/cec-edid.h
+ +F:    include/linux/cec.h
+ +F:    include/linux/cec-funcs.h
+ +
   CELL BROADBAND ENGINE ARCHITECTURE
   M:    Arnd Bergmann <arnd@arndb.de>
   L:    linuxppc-dev@lists.ozlabs.org
@@@ -3320,7 -3287,6 +3320,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
   S:    Maintained
   F:    Documentation/crypto/
+ +F:    Documentation/devicetree/bindings/crypto/
   F:    Documentation/DocBook/crypto-API.tmpl
   F:    arch/*/crypto/
   F:    crypto/
@@@ -4698,7 -4664,7 +4698,7 @@@ S:      Maintaine
   F:    drivers/staging/fbtft/
   
   FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
- -M:    Vasu Dev <vasu.dev@intel.com>
+ +M:    Johannes Thumshirn <jth@kernel.org>
   L:    fcoe-devel@open-fcoe.org
   W:    www.Open-FCoE.org
   S:    Supported
@@@ -4920,13 -4886,6 +4920,13 @@@ F:    drivers/net/ethernet/freescale/gianf
   X:    drivers/net/ethernet/freescale/gianfar_ptp.c
   F:    Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
   
+ +FREESCALE QUICC ENGINE UCC HDLC DRIVER
+ +M:    Zhao Qiang <qiang.zhao@nxp.com>
+ +L:    netdev@vger.kernel.org
+ +L:    linuxppc-dev@lists.ozlabs.org
+ +S:    Maintained
+ +F:    drivers/net/wan/fsl_ucc_hdlc*
+ +
   FREESCALE QUICC ENGINE UCC UART DRIVER
   M:    Timur Tabi <timur@tabi.org>
   L:    linuxppc-dev@lists.ozlabs.org
@@@ -4982,13 -4941,6 +4982,13 @@@ F:    Documentation/filesystems/caching
   F:    fs/fscache/
   F:    include/linux/fscache*.h
   
+ +FS-CRYPTO: FILE SYSTEM LEVEL ENCRYPTION SUPPORT
+ +M:    Theodore Y. Ts'o <tytso@mit.edu>
+ +M:    Jaegeuk Kim <jaegeuk@kernel.org>
+ +S:    Supported
+ +F:    fs/crypto/
+ +F:    include/linux/fscrypto.h
+ +
   F2FS FILE SYSTEM
   M:    Jaegeuk Kim <jaegeuk@kernel.org>
   M:    Changman Lee <cm224.lee@samsung.com>
@@@ -5217,10 -5169,10 +5217,10 @@@ S:   Maintaine
   F:    drivers/media/usb/gspca/m5602/
   
   GSPCA PAC207 SONIXB SUBDRIVER
- -M:    Hans de Goede <hdegoede@redhat.com>
+ +M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -S:    Maintained
+ +S:    Odd Fixes
   F:    drivers/media/usb/gspca/pac207.c
   
   GSPCA SN9C20X SUBDRIVER
@@@ -5238,10 -5190,10 +5238,10 @@@ S:   Maintaine
   F:    drivers/media/usb/gspca/t613.c
   
   GSPCA USB WEBCAM DRIVER
- -M:    Hans de Goede <hdegoede@redhat.com>
+ +M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -S:    Maintained
+ +S:    Odd Fixes
   F:    drivers/media/usb/gspca/
   
   GUID PARTITION TABLE (GPT)
@@@ -5322,7 -5274,6 +5322,7 @@@ M:      Matt Mackall <mpm@selenic.com
   M:    Herbert Xu <herbert@gondor.apana.org.au>
   L:    linux-crypto@vger.kernel.org
   S:    Odd fixes
+ +F:    Documentation/devicetree/bindings/rng/
   F:    Documentation/hw_random.txt
   F:    drivers/char/hw_random/
   F:    include/linux/hw_random.h
@@@ -5333,9 -5284,8 +5333,9 @@@ M:      Bjorn Andersson <bjorn.andersson@lin
   L:    linux-remoteproc@vger.kernel.org
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
+ +F:    Documentation/devicetree/bindings/hwlock/
   F:    Documentation/hwspinlock.txt
- -F:    drivers/hwspinlock/hwspinlock_*
+ +F:    drivers/hwspinlock/
   F:    include/linux/hwspinlock.h
   
   HARMONY SOUND DRIVER
@@@ -5353,12 -5303,6 +5353,12 @@@ T:    git git://linuxtv.org/anttip/media_t
   S:    Maintained
   F:    drivers/media/dvb-frontends/hd29l2*
   
+ +HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER
+ +M:    Brian Boylston <brian.boylston@hpe.com>
+ +S:    Supported
+ +F:    Documentation/watchdog/hpwdt.txt
+ +F:    drivers/watchdog/hpwdt.c
+ +
   HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
   M:    Don Brace <don.brace@microsemi.com>
   L:    iss_storagedev@hp.com
@@@ -5477,15 -5421,6 +5477,15 @@@ F:    include/uapi/linux/if_hippi.
   F:    net/802/hippi.c
   F:    drivers/net/hippi/
   
+ +HISILICON NETWORK SUBSYSTEM DRIVER
+ +M:    Yisen Zhuang <yisen.zhuang@huawei.com>
+ +M:    Salil Mehta <salil.mehta@huawei.com>
+ +L:    netdev@vger.kernel.org
+ +W:    http://www.hisilicon.com
+ +S:    Maintained
+ +F:    drivers/net/ethernet/hisilicon/
+ +F:    Documentation/devicetree/bindings/net/hisilicon*.txt
+ +
   HISILICON SAS Controller
   M:    John Garry <john.garry@huawei.com>
   W:    http://www.hisilicon.com
@@@ -5853,9 -5788,7 +5853,9 @@@ R:      Hartmut Knaack <knaack.h@gmx.de
   R:    Lars-Peter Clausen <lars@metafoo.de>
   R:    Peter Meerwald-Stadler <pmeerw@pmeerw.net>
   L:    linux-iio@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/iio/
   F:    drivers/iio/
   F:    drivers/staging/iio/
   F:    include/linux/iio/
@@@ -5985,12 -5918,6 +5985,12 @@@ L:    platform-driver-x86@vger.kernel.or
   S:    Maintained
   F:    drivers/platform/x86/intel-hid.c
   
+ +INTEL VIRTUAL BUTTON DRIVER
+ +M:    AceLan Kao <acelan.kao@canonical.com>
+ +L:    platform-driver-x86@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/platform/x86/intel-vbtn.c
+ +
   INTEL IDLE DRIVER
   M:    Len Brown <lenb@kernel.org>
   L:    linux-pm@vger.kernel.org
@@@ -6093,12 -6020,6 +6093,12 @@@ L:     linux-rdma@vger.kernel.or
   S:     Supported
   F:     drivers/infiniband/hw/i40iw/
   
+ +INTEL MERRIFIELD GPIO DRIVER
+ +M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+ +L:    linux-gpio@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/gpio/gpio-merrifield.c
+ +
   INTEL-MID GPIO DRIVER
   M:    David Cohen <david.a.cohen@linux.intel.com>
   L:    linux-gpio@vger.kernel.org
@@@ -6313,6 -6234,7 +6313,6 @@@ F:      Documentation/devicetree/bindings/in
   F:    drivers/irqchip/
   
   IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
- -M:    Jiang Liu <jiang.liu@linux.intel.com>
   M:    Marc Zyngier <marc.zyngier@arm.com>
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@@ -6789,7 -6711,6 +6789,7 @@@ M:      Jacek Anaszewski <j.anaszewski@samsu
   L:    linux-leds@vger.kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/leds/
   F:    drivers/leds/
   F:    include/linux/leds.h
   
@@@ -6845,7 -6766,6 +6845,7 @@@ S:      Maintaine
   F:    drivers/ata/
   F:    include/linux/ata.h
   F:    include/linux/libata.h
+ +F:    Documentation/devicetree/bindings/ata/
   
   LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
   M:    Viresh Kumar <vireshk@kernel.org>
@@@ -6953,7 -6873,6 +6953,7 @@@ F:      drivers/crypto/nx
   F:    drivers/crypto/vmx/
   F:    drivers/net/ethernet/ibm/ibmveth.*
   F:    drivers/net/ethernet/ibm/ibmvnic.*
+ +F:    drivers/pci/hotplug/pnv_php.c
   F:    drivers/pci/hotplug/rpa*
   F:    drivers/scsi/ibmvscsi/
   N:    opal
@@@ -7051,7 -6970,7 +7051,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
   LINUX KERNEL DUMP TEST MODULE (LKDTM)
   M:    Kees Cook <keescook@chromium.org>
   S:    Maintained
- -F:    drivers/misc/lkdtm.c
+ +F:    drivers/misc/lkdtm*
   
   LLC (802.2)
   M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
@@@ -7104,23 -7023,15 +7104,23 @@@ Q:   http://patchwork.linuxtv.org/project
   S:    Maintained
   F:    drivers/media/usb/dvb-usb-v2/lmedm04*
   
- -LOCKDEP AND LOCKSTAT
+ +LOCKING PRIMITIVES
   M:    Peter Zijlstra <peterz@infradead.org>
   M:    Ingo Molnar <mingo@redhat.com>
   L:    linux-kernel@vger.kernel.org
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
   S:    Maintained
- -F:    Documentation/locking/lockdep*.txt
- -F:    Documentation/locking/lockstat.txt
+ +F:    Documentation/locking/
   F:    include/linux/lockdep.h
+ +F:    include/linux/spinlock*.h
+ +F:    arch/*/include/asm/spinlock*.h
+ +F:    include/linux/rwlock*.h
+ +F:    include/linux/mutex*.h
+ +F:    arch/*/include/asm/mutex*.h
+ +F:    include/linux/rwsem*.h
+ +F:    arch/*/include/asm/rwsem.h
+ +F:    include/linux/seqlock.h
+ +F:    lib/locking*.[ch]
   F:    kernel/locking/
   
   LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
@@@ -7261,12 -7172,6 +7261,12 @@@ W:    http://www.kernel.org/doc/man-page
   L:    linux-man@vger.kernel.org
   S:    Maintained
   
+ +MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
+ +M:    Andrew Lunn <andrew@lunn.ch>
+ +M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+ +S:    Maintained
+ +F:    drivers/net/dsa/mv88e6xxx/
+ +
   MARVELL ARMADA DRM SUPPORT
   M:    Russell King <rmk+kernel@armlinux.org.uk>
   S:    Maintained
@@@ -7274,6 -7179,11 +7274,6 @@@ F:     drivers/gpu/drm/armada
   F:    include/uapi/drm/armada_drm.h
   F:    Documentation/devicetree/bindings/display/armada/
   
- -MARVELL 88E6352 DSA support
- -M:    Guenter Roeck <linux@roeck-us.net>
- -S:    Maintained
- -F:    drivers/net/dsa/mv88e6352.c
- -
   MARVELL CRYPTO DRIVER
   M:    Boris Brezillon <boris.brezillon@free-electrons.com>
   M:    Arnaud Ebalard <arno@natisbad.org>
@@@ -7360,13 -7270,6 +7360,13 @@@ F:    Documentation/devicetree/bindings/i2
   F:    drivers/hwmon/max6697.c
   F:    include/linux/platform_data/max6697.h
   
+ +MAX9860 MONO AUDIO VOICE CODEC DRIVER
+ +M:    Peter Rosin <peda@axentia.se>
+ +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/sound/max9860.txt
+ +F:    sound/soc/codecs/max9860.*
+ +
   MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
   M:    Krzysztof Kozlowski <k.kozlowski@samsung.com>
   L:    linux-pm@vger.kernel.org
@@@ -7416,16 -7319,6 +7416,16 @@@ L:    linux-iio@vger.kernel.or
   S:    Maintained
   F:    drivers/iio/potentiometer/mcp4531.c
   
+ +MEDIA DRIVERS FOR RENESAS - FCP
+ +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ +L:    linux-media@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,fcp.txt
+ +F:    drivers/media/platform/rcar-fcp.c
+ +F:    include/media/rcar-fcp.h
+ +
   MEDIA DRIVERS FOR RENESAS - VSP1
   M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
   L:    linux-media@vger.kernel.org
@@@ -7435,18 -7328,8 +7435,18 @@@ S:    Supporte
   F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
   F:    drivers/media/platform/vsp1/
   
+ +MEDIA DRIVERS FOR HELENE
+ +M:    Abylay Ospan <aospan@netup.ru>
+ +L:    linux-media@vger.kernel.org
+ +W:    https://linuxtv.org
+ +W:    http://netup.tv/
+ +T:    git git://linuxtv.org/media_tree.git
+ +S:    Supported
+ +F:    drivers/media/dvb-frontends/helene*
+ +
   MEDIA DRIVERS FOR ASCOT2E
   M:    Sergey Kozlov <serjk@netup.ru>
+ +M:    Abylay Ospan <aospan@netup.ru>
   L:    linux-media@vger.kernel.org
   W:    https://linuxtv.org
   W:    http://netup.tv/
@@@ -7456,7 -7339,6 +7456,7 @@@ F:      drivers/media/dvb-frontends/ascot2e
   
   MEDIA DRIVERS FOR CXD2841ER
   M:    Sergey Kozlov <serjk@netup.ru>
+ +M:    Abylay Ospan <aospan@netup.ru>
   L:    linux-media@vger.kernel.org
   W:    https://linuxtv.org
   W:    http://netup.tv/
@@@ -7466,7 -7348,6 +7466,7 @@@ F:      drivers/media/dvb-frontends/cxd2841e
   
   MEDIA DRIVERS FOR HORUS3A
   M:    Sergey Kozlov <serjk@netup.ru>
+ +M:    Abylay Ospan <aospan@netup.ru>
   L:    linux-media@vger.kernel.org
   W:    https://linuxtv.org
   W:    http://netup.tv/
@@@ -7476,7 -7357,6 +7476,7 @@@ F:      drivers/media/dvb-frontends/horus3a
   
   MEDIA DRIVERS FOR LNBH25
   M:    Sergey Kozlov <serjk@netup.ru>
+ +M:    Abylay Ospan <aospan@netup.ru>
   L:    linux-media@vger.kernel.org
   W:    https://linuxtv.org
   W:    http://netup.tv/
@@@ -7486,7 -7366,6 +7486,7 @@@ F:      drivers/media/dvb-frontends/lnbh25
   
   MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
   M:    Sergey Kozlov <serjk@netup.ru>
+ +M:    Abylay Ospan <aospan@netup.ru>
   L:    linux-media@vger.kernel.org
   W:    https://linuxtv.org
   W:    http://netup.tv/
@@@ -7736,8 -7615,10 +7736,8 @@@ L:     linux-media@vger.kernel.or
   W:    https://linuxtv.org
   W:    http://palosaari.fi/linux/
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
- -T:    git git://linuxtv.org/anttip/media_tree.git
   S:    Maintained
- -F:    drivers/staging/media/mn88472/
- -F:    drivers/media/dvb-frontends/mn88472.h
+ +F:    drivers/media/dvb-frontends/mn88472*
   
   MN88473 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
@@@ -7863,6 -7744,7 +7863,7 @@@ M:      Ulf Hansson <ulf.hansson@linaro.org
   L:    linux-mmc@vger.kernel.org
   T:    git git://git.linaro.org/people/ulf.hansson/mmc.git
   S:    Maintained
+ F:    Documentation/devicetree/bindings/mmc/
   F:    drivers/mmc/
   F:    include/linux/mmc/
   F:    include/uapi/linux/mmc/
@@@ -8292,13 -8174,6 +8293,13 @@@ S:    Supporte
   F:    drivers/nvme/host/
   F:    include/linux/nvme.h
   
+ +NVM EXPRESS TARGET DRIVER
+ +M:    Christoph Hellwig <hch@lst.de>
+ +M:    Sagi Grimberg <sagi@grimberg.me>
+ +L:    linux-nvme@lists.infradead.org
+ +S:    Supported
+ +F:    drivers/nvme/target/
+ +
   NVMEM FRAMEWORK
   M:    Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
   M:    Maxime Ripard <maxime.ripard@free-electrons.com>
@@@ -9212,8 -9087,6 +9213,8 @@@ M:      David Woodhouse <dwmw2@infradead.org
   L:    linux-pm@vger.kernel.org
   T:    git git://git.infradead.org/battery-2.6.git
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/power/
+ +F:    Documentation/devicetree/bindings/power_supply/
   F:    include/linux/power_supply.h
   F:    drivers/power/
   X:    drivers/power/avs/
@@@ -9227,12 -9100,6 +9228,12 @@@ F:    drivers/firmware/psci.
   F:    include/linux/psci.h
   F:    include/uapi/linux/psci.h
   
+ +POWERNV OPERATOR PANEL LCD DISPLAY DRIVER
+ +M:    Suraj Jitindar Singh <sjitindarsingh@gmail.com>
+ +L:    linuxppc-dev@lists.ozlabs.org
+ +S:    Maintained
+ +F:    drivers/char/powernv-op-panel.c
+ +
   PNP SUPPORT
   M:    "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
   S:    Maintained
@@@ -9357,13 -9224,6 +9358,13 @@@ F:    include/linux/tracehook.
   F:    include/uapi/linux/ptrace.h
   F:    kernel/ptrace.c
   
+ +PULSE8-CEC DRIVER
+ +M:    Hans Verkuil <hverkuil@xs4all.nl>
+ +L:    linux-media@vger.kernel.org
+ +T:    git git://linuxtv.org/media_tree.git
+ +S:    Maintained
+ +F:    drivers/staging/media/pulse8-cec
+ +
   PVRUSB2 VIDEO4LINUX DRIVER
   M:    Mike Isely <isely@pobox.com>
   L:    pvrusb2@isely.net       (subscribers-only)
@@@ -9375,10 -9235,10 +9376,10 @@@ F:   Documentation/video4linux/README.pvr
   F:    drivers/media/usb/pvrusb2/
   
   PWC WEBCAM DRIVER
- -M:    Hans de Goede <hdegoede@redhat.com>
+ +M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -S:    Maintained
+ +S:    Odd Fixes
   F:    drivers/media/usb/pwc/*
   
   PWM FAN DRIVER
@@@ -9451,8 -9311,7 +9452,8 @@@ L:      rtc-linux@googlegroups.co
   S:    Maintained
   
   QAT DRIVER
- -M:    Tadeusz Struk <tadeusz.struk@intel.com>
+ +M:    Giovanni Cabiddu <giovanni.cabiddu@intel.com>
+ +M:    Salvatore Benedetto <salvatore.benedetto@intel.com>
   L:    qat-linux@intel.com
   S:    Supported
   F:    drivers/crypto/qat/
@@@ -9594,14 -9453,14 +9595,14 @@@ F:   drivers/video/fbdev/aty/radeon
   F:    include/uapi/linux/radeonfb.h
   
   RADIOSHARK RADIO DRIVER
- -M:    Hans de Goede <hdegoede@redhat.com>
+ +M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Maintained
   F:    drivers/media/radio/radio-shark.c
   
   RADIOSHARK2 RADIO DRIVER
- -M:    Hans de Goede <hdegoede@redhat.com>
+ +M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Maintained
@@@ -9675,7 -9534,7 +9676,7 @@@ M:      Florian Fainelli <florian@openwrt.or
   S:    Maintained
   
   RDC R6040 FAST ETHERNET DRIVER
- -M:    Florian Fainelli <florian@openwrt.org>
+ +M:    Florian Fainelli <f.fainelli@gmail.com>
   L:    netdev@vger.kernel.org
   S:    Maintained
   F:    drivers/net/ethernet/rdc/r6040.c
@@@ -9742,7 -9601,6 +9743,7 @@@ M:      Mark Brown <broonie@kernel.org
   L:    linux-kernel@vger.kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
   S:    Supported
+ +F:    Documentation/devicetree/bindings/regmap/
   F:    drivers/base/regmap/
   F:    include/linux/regmap.h
   
@@@ -9752,9 -9610,8 +9753,9 @@@ M:      Bjorn Andersson <bjorn.andersson@lin
   L:    linux-remoteproc@vger.kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
   S:    Maintained
- -F:    drivers/remoteproc/
+ +F:    Documentation/devicetree/bindings/remoteproc/
   F:    Documentation/remoteproc.txt
+ +F:    drivers/remoteproc/
   F:    include/linux/remoteproc.h
   
   REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
@@@ -9828,6 -9685,7 +9829,6 @@@ F:      Documentation/ABI/*/sysfs-driver-hid
   
   ROCKER DRIVER
   M:    Jiri Pirko <jiri@resnulli.us>
- -M:    Scott Feldman <sfeldma@gmail.com>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    drivers/net/ethernet/rocker/
@@@ -10039,9 -9897,7 +10040,9 @@@ S:    Maintaine
   F:    drivers/platform/x86/samsung-laptop.c
   
   SAMSUNG AUDIO (ASoC) DRIVERS
+ +M:    Krzysztof Kozlowski <k.kozlowski@samsung.com>
   M:    Sangbeom Kim <sbkim73@samsung.com>
+ +M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
   L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
   S:    Supported
   F:    sound/soc/samsung/
@@@ -10146,7 -10002,6 +10147,7 @@@ SERIAL DRIVER
   M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   L:    linux-serial@vger.kernel.org
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/serial/
   F:    drivers/tty/serial/
   
   SYNOPSYS DESIGNWARE DMAC DRIVER
@@@ -10283,7 -10138,6 +10284,7 @@@ M:   "Martin K. Petersen" <martin.peterse
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
   L:    linux-scsi@vger.kernel.org
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/scsi/
   F:    drivers/scsi/
   F:    include/scsi/
   
@@@ -10355,6 -10209,13 +10356,13 @@@ F: tools/testing/selftests/seccomp/
   K:    \bsecure_computing
   K:    \bTIF_SECCOMP\b
   
+ SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) Broadcom BRCMSTB DRIVER
+ M:    Al Cooper <alcooperx@gmail.com>
+ L:    linux-mmc@vger.kernel.org
+ L:    bcm-kernel-feedback-list@broadcom.com
+ S:    Maintained
+ F:    drivers/mmc/host/sdhci-brcmstb*
+ 
   SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
   M:    Ben Dooks <ben-linux@fluff.org>
   M:    Jaehoon Chung <jh80.chung@samsung.com>
@@@ -10428,9 -10289,10 +10436,9 @@@ W:  http://www.avagotech.co
   S:    Supported
   F:    drivers/scsi/be2iscsi/
   
- -Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER
+ +Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER (be2net)
   M:    Sathya Perla <sathya.perla@broadcom.com>
   M:    Ajit Khaparde <ajit.khaparde@broadcom.com>
- -M:    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
@@@ -10696,7 -10558,7 +10704,7 @@@ SMACK SECURITY MODUL
   M:    Casey Schaufler <casey@schaufler-ca.com>
   L:    linux-security-module@vger.kernel.org
   W:    http://schaufler-ca.com
- -T:    git git://git.gitorious.org/smack-next/kernel.git
+ +T:    git git://github.com/cschaufler/smack-next
   S:    Maintained
   F:    Documentation/security/Smack.txt
   F:    security/smack/
@@@ -10870,7 -10732,6 +10878,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
   L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
   W:    http://alsa-project.org/main/index.php/ASoC
   S:    Supported
+ +F:    Documentation/devicetree/bindings/sound/
   F:    Documentation/sound/alsa/soc/
   F:    sound/soc/
   F:    include/sound/soc*
@@@ -10946,7 -10807,6 +10954,7 @@@ L:   linux-spi@vger.kernel.or
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
   Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/spi/
   F:    Documentation/spi/
   F:    drivers/spi/
   F:    include/linux/spi/
@@@ -11009,7 -10869,6 +11017,7 @@@ STAGING - INDUSTRIAL I
   M:    Jonathan Cameron <jic23@kernel.org>
   L:    linux-iio@vger.kernel.org
   S:    Odd Fixes
+ +F:    Documentation/devicetree/bindings/staging/iio/
   F:    drivers/staging/iio/
   
   STAGING - LIRC (LINUX INFRARED REMOTE CONTROL) DRIVERS
@@@ -11464,6 -11323,11 +11472,6 @@@ F:  Documentation/thermal/cpu-cooling-ap
   F:    drivers/thermal/cpu_cooling.c
   F:    include/linux/cpu_cooling.h
   
- -THINGM BLINK(1) USB RGB LED DRIVER
- -M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
- -S:    Maintained
- -F:    drivers/hid/hid-thingm.c
- -
   THINKPAD ACPI EXTRAS DRIVER
   M:    Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
   L:    ibm-acpi-devel@lists.sourceforge.net
@@@ -11914,12 -11778,6 +11922,12 @@@ S: Supporte
   F:    Documentation/scsi/ufs.txt
   F:    drivers/scsi/ufs/
   
+ +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
+ +M:    Joao Pinto <Joao.Pinto@synopsys.com>
+ +L:    linux-scsi@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/scsi/ufs/*dwc*
+ +
   UNSORTED BLOCK IMAGES (UBI)
   M:    Artem Bityutskiy <dedekind1@gmail.com>
   M:    Richard Weinberger <richard@nod.at>
@@@ -11945,7 -11803,8 +11953,7 @@@ S:   Maintaine
   F:    drivers/net/wireless/ath/ar5523/
   
   USB ATTACHED SCSI
- -M:    Hans de Goede <hdegoede@redhat.com>
- -M:    Gerd Hoffmann <kraxel@redhat.com>
+ +M:    Oliver Neukum <oneukum@suse.com>
   L:    linux-usb@vger.kernel.org
   L:    linux-scsi@vger.kernel.org
   S:    Maintained
@@@ -12444,7 -12303,7 +12452,7 @@@ S:   Maintaine
   F:    drivers/net/vmxnet3/
   
   VMware PVSCSI driver
- -M:    Arvind Kumar <arvindkumar@vmware.com>
+ +M:    Jim Gill <jgill@vmware.com>
   M:    VMware PV-Drivers <pv-drivers@vmware.com>
   L:    linux-scsi@vger.kernel.org
   S:    Maintained
diff --combined drivers/mmc/card/block.c

index 10b5537,d180588..48a5dd7
--- 1/drivers/mmc/card/block.c
--- 2/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@@ -93,7 -93,6 +93,7 @@@ static DEFINE_SPINLOCK(mmc_blk_lock)
    */
   struct mmc_blk_data {
         spinlock_t      lock;
+ +      struct device   *parent;
         struct gendisk  *disk;
         struct mmc_queue queue;
         struct list_head part;
@@@ -1725,8 -1724,8 +1725,8 @@@ static u8 mmc_blk_prep_packed_list(stru
                     !IS_ALIGNED(blk_rq_sectors(next), 8))
                         break;
   
- -              if (next->cmd_flags & REQ_DISCARD ||
- -                  next->cmd_flags & REQ_FLUSH)
+ +              if (req_op(next) == REQ_OP_DISCARD ||
+ +                  req_op(next) == REQ_OP_FLUSH)
                         break;
   
                 if (rq_data_dir(cur) != rq_data_dir(next))
@@@ -1801,8 -1800,7 +1801,7 @@@ static void mmc_blk_packed_hdr_wrq_prep
                 do_data_tag = (card->ext_csd.data_tag_unit_size) &&
                         (prq->cmd_flags & REQ_META) &&
                         (rq_data_dir(prq) == WRITE) &&
-                       ((brq->data.blocks * brq->data.blksz) >=
-                        card->ext_csd.data_tag_unit_size);
+                       blk_rq_bytes(prq) >= card->ext_csd.data_tag_unit_size;
                 /* Argument of CMD23 */
                 packed_cmd_hdr[(i * 2)] = cpu_to_le32(
                         (do_rel_wr ? MMC_CMD23_ARG_REL_WR : 0) |
@@@ -1977,8 -1975,8 +1976,8 @@@ static int mmc_blk_issue_rw_rq(struct m
                          * When 4KB native sector is enabled, only 8 blocks
                          * multiple read or write is allowed
                          */
-                       if ((brq->data.blocks & 0x07) &&
-                           (card->ext_csd.data_sector_size == 4096)) {
+                       if (mmc_large_sector(card) &&
+                               !IS_ALIGNED(blk_rq_sectors(rqc), 8)) {
                                 pr_err("%s: Transfer size is not 4KB sector size aligned\n",
                                         req->rq_disk->disk_name);
                                 mq_rq = mq->mqrq_cur;
@@@ -2151,6 -2149,7 +2150,6 @@@ static int mmc_blk_issue_rq(struct mmc_
         struct mmc_card *card = md->queue.card;
         struct mmc_host *host = card->host;
         unsigned long flags;
- -      unsigned int cmd_flags = req ? req->cmd_flags : 0;
   
         if (req && !mq->mqrq_prev->req)
                 /* claim host only for the first request */
@@@ -2166,17 -2165,15 +2165,17 @@@
         }
   
         mq->flags &= ~MMC_QUEUE_NEW_REQUEST;
- -      if (cmd_flags & REQ_DISCARD) {
+ +      if (req && req_op(req) == REQ_OP_DISCARD) {
                 /* complete ongoing async transfer before issuing discard */
                 if (card->host->areq)
                         mmc_blk_issue_rw_rq(mq, NULL);
- -              if (req->cmd_flags & REQ_SECURE)
- -                      ret = mmc_blk_issue_secdiscard_rq(mq, req);
- -              else
- -                      ret = mmc_blk_issue_discard_rq(mq, req);
- -      } else if (cmd_flags & REQ_FLUSH) {
+ +              ret = mmc_blk_issue_discard_rq(mq, req);
+ +      } else if (req && req_op(req) == REQ_OP_SECURE_ERASE) {
+ +              /* complete ongoing async transfer before issuing secure erase*/
+ +              if (card->host->areq)
+ +                      mmc_blk_issue_rw_rq(mq, NULL);
+ +              ret = mmc_blk_issue_secdiscard_rq(mq, req);
+ +      } else if (req && req_op(req) == REQ_OP_FLUSH) {
                 /* complete ongoing async transfer before issuing flush */
                 if (card->host->areq)
                         mmc_blk_issue_rw_rq(mq, NULL);
@@@ -2192,7 -2189,7 +2191,7 @@@
   
   out:
         if ((!req && !(mq->flags & MMC_QUEUE_NEW_REQUEST)) ||
- -           (cmd_flags & MMC_REQ_SPECIAL_MASK))
+ +          mmc_req_is_special(req))
                 /*
                  * Release host when there are no more requests
                  * and after special request(discard, flush) is done.
@@@ -2273,7 -2270,7 +2272,7 @@@ again
         md->disk->fops = &mmc_bdops;
         md->disk->private_data = md;
         md->disk->queue = md->queue.queue;
- -      md->disk->driverfs_dev = parent;
+ +      md->parent = parent;
         set_disk_ro(md->disk, md->read_only || default_ro);
         md->disk->flags = GENHD_FL_EXT_DEVT;
         if (area_type & (MMC_BLK_DATA_AREA_RPMB | MMC_BLK_DATA_AREA_BOOT))
@@@ -2461,7 -2458,7 +2460,7 @@@ static int mmc_add_disk(struct mmc_blk_
         int ret;
         struct mmc_card *card = md->queue.card;
   
- -      add_disk(md->disk);
+ +      device_add_disk(md->parent, md->disk);
         md->force_ro.show = force_ro_show;
         md->force_ro.store = force_ro_store;
         sysfs_attr_init(&md->force_ro.attr);
@@@ -2501,12 -2498,6 +2500,6 @@@ force_ro_fail
         return ret;
   }
   
- #define CID_MANFID_SANDISK    0x2
- #define CID_MANFID_TOSHIBA    0x11
- #define CID_MANFID_MICRON     0x13
- #define CID_MANFID_SAMSUNG    0x15
- #define CID_MANFID_KINGSTON   0x70
- 
   static const struct mmc_fixup blk_fixups[] =
   {
         MMC_FIXUP("SEM02G", CID_MANFID_SANDISK, 0x100, add_quirk,
diff --combined drivers/mmc/host/sdhci-acpi.c

index 008709c,5bf4bcf..8fe0756
--- 1/drivers/mmc/host/sdhci-acpi.c
--- 2/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@@ -43,7 -43,6 +43,7 @@@
   
   #ifdef CONFIG_X86
   #include <asm/cpu_device_id.h>
+ +#include <asm/intel-family.h>
   #include <asm/iosf_mbi.h>
   #endif
   
@@@ -127,7 -126,7 +127,7 @@@ static const struct sdhci_acpi_chip sdh
   static bool sdhci_acpi_byt(void)
   {
         static const struct x86_cpu_id byt[] = {
- -              { X86_VENDOR_INTEL, 6, 0x37 },
+ +              { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT1 },
                 {}
         };
   
@@@ -532,11 -531,6 +532,6 @@@ static int sdhci_acpi_resume(struct dev
         return sdhci_resume_host(c->host);
   }
   
- #else
- 
- #define sdhci_acpi_suspend    NULL
- #define sdhci_acpi_resume     NULL
- 
   #endif
   
   #ifdef CONFIG_PM
@@@ -560,8 -554,7 +555,7 @@@ static int sdhci_acpi_runtime_resume(st
   #endif
   
   static const struct dev_pm_ops sdhci_acpi_pm_ops = {
-       .suspend                = sdhci_acpi_suspend,
-       .resume                 = sdhci_acpi_resume,
+       SET_SYSTEM_SLEEP_PM_OPS(sdhci_acpi_suspend, sdhci_acpi_resume)
         SET_RUNTIME_PM_OPS(sdhci_acpi_runtime_suspend,
                         sdhci_acpi_runtime_resume, NULL)
   };
author	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 1 Aug 2016 01:36:58 +0000 (21:36 -0400)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 1 Aug 2016 01:36:58 +0000 (21:36 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-acpi.c	patch \|	diff1 \|	diff2 \|	blob \| history