Merge tag 'media/v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Dec 2016 17:39:16 +0000 (09:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Dec 2016 17:39:16 +0000 (09:39 -0800)
Pull media updates from Mauro Carvalho Chehab:

 - new Mediatek drivers: mtk-mdp and mtk-vcodec

 - some additions at the media documentation

 - the CEC core and drivers were promoted from staging to mainstream

 - some cleanups at the DVB core

 - the LIRC serial driver got promoted from staging to mainstream

 - added a driver for Renesas R-Car FDP1 driver

 - add DVBv5 statistics support to mn88473 driver

 - several fixes related to printk continuation lines

 - add support for HSV encoding formats

 - lots of other cleanups, fixups and driver improvements.

* tag 'media/v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (496 commits)
  [media] v4l: tvp5150: Add missing break in set control handler
  [media] v4l: tvp5150: Don't inline the tvp5150_selmux() function
  [media] v4l: tvp5150: Compile tvp5150_link_setup out if !CONFIG_MEDIA_CONTROLLER
  [media] em28xx: don't store usb_device at struct em28xx
  [media] em28xx: use usb_interface for dev_foo() calls
  [media] em28xx: don't change the device's name
  [media] mn88472: fix chip id check on probe
  [media] mn88473: fix chip id check on probe
  [media] lirc: fix error paths in lirc_cdev_add()
  [media] s5p-mfc: Add support for MFC v8 available in Exynos 5433 SoCs
  [media] s5p-mfc: Rework clock handling
  [media] s5p-mfc: Don't keep clock prepared all the time
  [media] s5p-mfc: Kill all IS_ERR_OR_NULL in clocks management code
  [media] s5p-mfc: Remove dead conditional code
  [media] s5p-mfc: Ensure that clock is disabled before turning power off
  [media] s5p-mfc: Remove special clock rate management
  [media] s5p-mfc: Use printk_ratelimited for reporting ioctl errors
  [media] s5p-mfc: Set DMA_ATTR_ALLOC_SINGLE_PAGES
  [media] vivid: Set color_enc on HSV formats
  [media] v4l2-tpg: Init hv_enc field with a valid value
  ...

1  2 
MAINTAINERS
arch/arm64/boot/dts/mediatek/mt8173.dtsi
drivers/staging/media/bcm2048/radio-bcm2048.c
drivers/staging/media/lirc/lirc_sasem.c
include/uapi/linux/Kbuild

diff --combined MAINTAINERS
@@@ -260,12 -260,6 +260,12 @@@ L:       linux-gpio@vger.kernel.or
  S:    Maintained
  F:    drivers/gpio/gpio-104-idio-16.c
  
 +ACCES 104-QUAD-8 IIO DRIVER
 +M:    William Breathitt Gray <vilhelm.gray@gmail.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/iio/counter/104-quad-8.c
 +
  ACENIC DRIVER
  M:    Jes Sorensen <jes@trained-monkey.org>
  L:    linux-acenic@sunsite.dk
@@@ -540,7 -534,6 +540,7 @@@ S: Supporte
  F:    fs/afs/
  F:    include/net/af_rxrpc.h
  F:    net/rxrpc/af_rxrpc.c
 +W:    https://www.infradead.org/~dhowells/kafs/
  
  AGPGART DRIVER
  M:    David Airlie <airlied@linux.ie>
@@@ -810,7 -803,7 +810,7 @@@ S: Supporte
  F:    drivers/iio/*/ad*
  X:    drivers/iio/*/adjd*
  F:    drivers/staging/iio/*/ad*
 -F:    staging/iio/trigger/iio-trig-bfin-timer.c
 +F:    drivers/staging/iio/trigger/iio-trig-bfin-timer.c
  
  ANALOG DEVICES INC DMA DRIVERS
  M:    Lars-Peter Clausen <lars@metafoo.de>
@@@ -1042,7 -1035,6 +1042,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  N:    sun[x456789]i
  F:    arch/arm/boot/dts/ntc-gr8*
 +F:    arch/arm64/boot/dts/allwinner/
  
  ARM/Allwinner SoC Clock Support
  M:    Emilio López <emilio@elopez.com.ar>
@@@ -1060,7 -1052,6 +1060,7 @@@ F:      arch/arm/mach-meson
  F:    arch/arm/boot/dts/meson*
  F:    arch/arm64/boot/dts/amlogic/
  F:    drivers/pinctrl/meson/
 +F:    drivers/mmc/host/meson*
  N:    meson
  
  ARM/Annapurna Labs ALPINE ARCHITECTURE
@@@ -1504,9 -1495,8 +1504,9 @@@ L:      linux-arm-kernel@lists.infradead.or
  L:    linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-oxnas/
 -F:    arch/arm/boot/dts/oxnas*
 +F:    arch/arm/boot/dts/ox8*.dtsi
  F:    arch/arm/boot/dts/wd-mbwe.dts
 +F:    arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
  N:    oxnas
  
  ARM/Mediatek RTC DRIVER
@@@ -1627,7 -1617,6 +1627,7 @@@ F:      arch/arm/mach-qcom
  F:    arch/arm64/boot/dts/qcom/*
  F:    drivers/i2c/busses/i2c-qup.c
  F:    drivers/clk/qcom/
 +F:    drivers/pinctrl/qcom/
  F:    drivers/soc/qcom/
  F:    drivers/spi/spi-qup.c
  F:    drivers/tty/serial/msm_serial.h
@@@ -1802,16 -1791,16 +1802,16 @@@ F:   drivers/char/hw_random/st-rng.
  F:    drivers/clocksource/arm_global_timer.c
  F:    drivers/clocksource/clksrc_st_lpc.c
  F:    drivers/cpufreq/sti-cpufreq.c
 +F:    drivers/dma/st_fdma*
  F:    drivers/i2c/busses/i2c-st.c
  F:    drivers/media/rc/st_rc.c
  F:    drivers/media/platform/sti/c8sectpfe/
  F:    drivers/mmc/host/sdhci-st.c
  F:    drivers/phy/phy-miphy28lp.c
 -F:    drivers/phy/phy-miphy365x.c
  F:    drivers/phy/phy-stih407-usb.c
 -F:    drivers/phy/phy-stih41x-usb.c
  F:    drivers/pinctrl/pinctrl-st.c
  F:    drivers/remoteproc/st_remoteproc.c
 +F:    drivers/remoteproc/st_slim_rproc.c
  F:    drivers/reset/sti/
  F:    drivers/rtc/rtc-st-lpc.c
  F:    drivers/tty/serial/st-asc.c
@@@ -1820,7 -1809,6 +1820,7 @@@ F:      drivers/usb/host/ehci-st.
  F:    drivers/usb/host/ohci-st.c
  F:    drivers/watchdog/st_lpc_wdt.c
  F:    drivers/ata/ahci_st.c
 +F:    include/linux/remoteproc/st_slim_rproc.h
  
  ARM/STM32 ARCHITECTURE
  M:    Maxime Coquelin <mcoquelin.stm32@gmail.com>
@@@ -2346,13 -2334,6 +2346,13 @@@ F:    include/uapi/linux/ax25.
  F:    include/net/ax25.h
  F:    net/ax25/
  
 +AXENTIA ASOC DRIVERS
 +M:    Peter Rosin <peda@axentia.se>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/axentia,*
 +F:    sound/soc/atmel/tse850-pcm5142.c
 +
  AZ6007 DVB DRIVER
  M:    Mauro Carvalho Chehab <mchehab@s-opensource.com>
  M:    Mauro Carvalho Chehab <mchehab@kernel.org>
@@@ -2627,7 -2608,6 +2627,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
  S:    Maintained
  N:    bcm2835
 +F:    drivers/staging/vc04_services
  
  BROADCOM BCM47XX MIPS ARCHITECTURE
  M:    Hauke Mehrtens <hauke@hauke-m.de>
@@@ -2780,14 -2760,6 +2780,14 @@@ L:    bcm-kernel-feedback-list@broadcom.co
  S:    Maintained
  F:    drivers/mtd/nand/brcmnand/
  
 +BROADCOM STB AVS CPUFREQ DRIVER
 +M:    Markus Mayer <mmayer@broadcom.com>
 +M:    bcm-kernel-feedback-list@broadcom.com
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
 +F:    drivers/cpufreq/brcmstb*
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <zajec5@gmail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -2802,7 -2774,7 +2802,7 @@@ S:      Supporte
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
  
  BROADCOM VULCAN ARM64 SOC
 -M:    Jayachandran C. <jchandra@broadcom.com>
 +M:    Jayachandran C. <c.jayachandran@gmail.com>
  M:    bcm-kernel-feedback-list@broadcom.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -3010,15 -2982,15 +3010,15 @@@ L:   linux-media@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  W:    http://linuxtv.org
  S:    Supported
- F:    Documentation/cec.txt
+ F:    Documentation/media/kapi/cec-core.rst
  F:    Documentation/media/uapi/cec
- F:    drivers/staging/media/cec/
+ F:    drivers/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
+ F:    include/uapi/linux/cec.h
+ F:    include/uapi/linux/cec-funcs.h
  
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <arnd@arndb.de>
@@@ -3076,12 -3048,6 +3076,12 @@@ F:    drivers/usb/host/whci
  F:    drivers/usb/wusbcore/
  F:    include/linux/usb/wusb*
  
 +HT16K33 LED CONTROLLER DRIVER
 +M:    Robin van der Gracht <robin@protonic.nl>
 +S:    Maintained
 +F:    drivers/auxdisplay/ht16k33.c
 +F:    Documentation/devicetree/bindings/display/ht16k33.txt
 +
  CFAG12864B LCD DRIVER
  M:    Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
  W:    http://miguelojeda.es/auxdisplay.htm
@@@ -3201,15 -3167,15 +3201,15 @@@ S:   Supporte
  F:    drivers/clocksource
  
  CISCO FCOE HBA DRIVER
 -M:    Hiral Patel <hiralpat@cisco.com>
 -M:    Suma Ramars <sramars@cisco.com>
 -M:    Brian Uchino <buchino@cisco.com>
 +M:    Satish Kharat <satishkh@cisco.com>
 +M:    Sesidhar Baddela <sebaddel@cisco.com>
 +M:    Karan Tilak Kumar <kartilak@cisco.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    drivers/scsi/fnic/
  
  CISCO SCSI HBA DRIVER
 -M:    Narsimhulu Musini <nmusini@cisco.com>
 +M:    Karan Tilak Kumar <kartilak@cisco.com>
  M:    Sesidhar Baddela <sebaddel@cisco.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
@@@ -3386,7 -3352,6 +3386,7 @@@ L:      linux-pm@vger.kernel.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  T:    git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
 +B:    https://bugzilla.kernel.org
  F:    Documentation/cpu-freq/
  F:    drivers/cpufreq/
  F:    include/linux/cpufreq.h
@@@ -3426,7 -3391,6 +3426,7 @@@ M:      Daniel Lezcano <daniel.lezcano@linar
  L:    linux-pm@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 +B:    https://bugzilla.kernel.org
  F:    drivers/cpuidle/*
  F:    include/linux/cpuidle.h
  
@@@ -3472,7 -3436,6 +3472,7 @@@ F:      arch/*/crypto
  F:    crypto/
  F:    drivers/crypto/
  F:    include/crypto/
 +F:    include/linux/crypto*
  
  CRYPTOGRAPHIC RANDOM NUMBER GENERATOR
  M:    Neil Horman <nhorman@tuxdriver.com>
@@@ -3966,7 -3929,7 +3966,7 @@@ F:      include/linux/dma-buf
  F:    include/linux/reservation.h
  F:    include/linux/*fence.h
  F:    Documentation/dma-buf-sharing.txt
 -T:    git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  SYNC FILE FRAMEWORK
  M:    Sumit Semwal <sumit.semwal@linaro.org>
@@@ -3974,12 -3937,10 +3974,12 @@@ R:   Gustavo Padovan <gustavo@padovan.org
  S:    Maintained
  L:    linux-media@vger.kernel.org
  L:    dri-devel@lists.freedesktop.org
 -F:    drivers/dma-buf/sync_file.c
 +F:    drivers/dma-buf/sync_*
 +F:    drivers/dma-buf/sw_sync.c
  F:    include/linux/sync_file.h
 +F:    include/uapi/linux/sync_file.h
  F:    Documentation/sync_file.txt
 -T:    git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <vinod.koul@intel.com>
@@@ -4079,30 -4040,11 +4079,30 @@@ F:   Documentation/gpu
  F:    include/drm/
  F:    include/uapi/drm/
  
 +DRM DRIVERS AND MISC GPU PATCHES
 +M:    Daniel Vetter <daniel.vetter@intel.com>
 +M:    Jani Nikula <jani.nikula@linux.intel.com>
 +M:    Sean Paul <seanpaul@chromium.org>
 +W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/gpu/
 +F:    drivers/gpu/vga/
 +F:    drivers/gpu/drm/*
 +F:    include/drm/drm*
 +F:    include/uapi/drm/drm*
 +
  DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
  M:    Dave Airlie <airlied@redhat.com>
  S:    Odd Fixes
  F:    drivers/gpu/drm/ast/
  
 +DRM DRIVERS FOR BRIDGE CHIPS
 +M:    Archit Taneja <architt@codeaurora.org>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/bridge/
 +
  DRM DRIVER FOR BOCHS VIRTUAL GPU
  M:    Gerd Hoffmann <kraxel@redhat.com>
  S:    Odd Fixes
@@@ -4138,6 -4080,7 +4138,6 @@@ INTEL DRM DRIVERS (excluding Poulsbo, M
  M:    Daniel Vetter <daniel.vetter@intel.com>
  M:    Jani Nikula <jani.nikula@linux.intel.com>
  L:    intel-gfx@lists.freedesktop.org
 -L:    dri-devel@lists.freedesktop.org
  W:    https://01.org/linuxgraphics/
  B:    https://01.org/linuxgraphics/documentation/how-report-bugs
  C:    irc://chat.freenode.net/intel-gfx
@@@ -4149,16 -4092,6 +4149,16 @@@ F:    include/drm/i915
  F:    include/uapi/drm/i915_drm.h
  F:    Documentation/gpu/i915.rst
  
 +INTEL GVT-g DRIVERS (Intel GPU Virtualization)
 +M:      Zhenyu Wang <zhenyuw@linux.intel.com>
 +M:      Zhi Wang <zhi.a.wang@intel.com>
 +L:      igvt-g-dev@lists.01.org
 +L:      intel-gfx@lists.freedesktop.org
 +W:      https://01.org/igvt-g
 +T:      git https://github.com/01org/gvt-linux.git
 +S:      Supported
 +F:      drivers/gpu/drm/i915/gvt/
 +
  DRM DRIVERS FOR ATMEL HLCDC
  M:    Boris Brezillon <boris.brezillon@free-electrons.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -4173,15 -4106,6 +4173,15 @@@ S:    Supporte
  F:    drivers/gpu/drm/sun4i/
  F:    Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
  
 +DRM DRIVERS FOR AMLOGIC SOCS
 +M:    Neil Armstrong <narmstrong@baylibre.com>
 +L:    dri-devel@lists.freedesktop.org
 +L:    linux-amlogic@lists.infradead.org
 +W:    http://linux-meson.com/
 +S:    Supported
 +F:    drivers/gpu/drm/meson/
 +F:    Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
 +
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <inki.dae@samsung.com>
  M:    Joonyoung Shim <jy0922.shim@samsung.com>
@@@ -4221,7 -4145,6 +4221,7 @@@ F:      drivers/gpu/drm/gma500
  
  DRM DRIVERS FOR HISILICON
  M:    Xinliang Liu <z.liuxinliang@hisilicon.com>
 +M:    Rongrong Zou <zourongrong@gmail.com>
  R:    Xinwei Kong <kong.kongxinwei@hisilicon.com>
  R:    Chen Feng <puck.chen@hisilicon.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -4346,7 -4269,6 +4346,7 @@@ DRM DRIVERS FOR VIVANTE GPU I
  M:    Lucas Stach <l.stach@pengutronix.de>
  R:    Russell King <linux+etnaviv@armlinux.org.uk>
  R:    Christian Gmeiner <christian.gmeiner@gmail.com>
 +L:    etnaviv@lists.freedesktop.org
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  F:    drivers/gpu/drm/etnaviv/
@@@ -4387,13 -4309,6 +4387,13 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tilcdc/
  F:    Documentation/devicetree/bindings/display/tilcdc/
  
 +DRM DRIVERS FOR ZTE ZX
 +M:    Shawn Guo <shawnguo@kernel.org>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Maintained
 +F:    drivers/gpu/drm/zte/
 +F:    Documentation/devicetree/bindings/display/zte,vou.txt
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <klimov.linux@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -4588,8 -4503,7 +4588,8 @@@ L:      linux-edac@vger.kernel.or
  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:    Documentation/admin-guide/ras.rst
 +F:    Documentation/driver-api/edac.rst
  F:    drivers/edac/
  F:    include/linux/edac.h
  
@@@ -4798,11 -4712,11 +4798,11 @@@ M:   David Woodhouse <dwmw2@infradead.org
  L:    linux-embedded@vger.kernel.org
  S:    Maintained
  
 -EMULEX/AVAGO LPFC FC/FCOE SCSI DRIVER
 -M:    James Smart <james.smart@avagotech.com>
 -M:    Dick Kennedy <dick.kennedy@avagotech.com>
 +EMULEX/BROADCOM LPFC FC/FCOE SCSI DRIVER
 +M:    James Smart <james.smart@broadcom.com>
 +M:    Dick Kennedy <dick.kennedy@broadcom.com>
  L:    linux-scsi@vger.kernel.org
 -W:    http://www.avagotech.com
 +W:    http://www.broadcom.com
  S:    Supported
  F:    drivers/scsi/lpfc/
  
@@@ -5060,9 -4974,7 +5060,9 @@@ K:      fmc_d.*registe
  FPGA MANAGER FRAMEWORK
  M:    Alan Tull <atull@opensource.altera.com>
  R:    Moritz Fischer <moritz.fischer@ettus.com>
 +L:    linux-fpga@vger.kernel.org
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
  F:    drivers/fpga/
  F:    include/linux/fpga/fpga-mgr.h
  W:    http://www.rocketboards.org
@@@ -5080,9 -4992,10 +5080,9 @@@ F:     drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 -M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
  L:    linux-fbdev@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/fb/
  F:    drivers/video/
  F:    include/video/
@@@ -5090,14 -5003,6 +5090,14 @@@ F:    include/linux/fb.
  F:    include/uapi/video/
  F:    include/uapi/linux/fb.h
  
 +FREESCALE CAAM (Cryptographic Acceleration and Assurance Module) DRIVER
 +M:    Horia Geantă <horia.geanta@nxp.com>
 +M:    Dan Douglass <dan.douglass@nxp.com>
 +L:    linux-crypto@vger.kernel.org
 +S:    Maintained
 +F:    drivers/crypto/caam/
 +F:    Documentation/devicetree/bindings/crypto/fsl-sec4.txt
 +
  FREESCALE DIU FRAMEBUFFER DRIVER
  M:    Timur Tabi <timur@tabi.org>
  L:    linux-fbdev@vger.kernel.org
@@@ -5163,18 -5068,9 +5163,18 @@@ S:    Maintaine
  F:    drivers/net/ethernet/freescale/fman
  F:    Documentation/devicetree/bindings/powerpc/fsl/fman.txt
  
 +FREESCALE SOC DRIVERS
 +M:    Scott Wood <oss@buserror.net>
 +L:    linuxppc-dev@lists.ozlabs.org
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    drivers/soc/fsl/
 +F:    include/linux/fsl/
 +
  FREESCALE QUICC ENGINE LIBRARY
 +M:    Qiang Zhao <qiang.zhao@nxp.com>
  L:    linuxppc-dev@lists.ozlabs.org
 -S:    Orphan
 +S:    Maintained
  F:    drivers/soc/fsl/qe/
  F:    include/soc/fsl/*qe*.h
  F:    include/soc/fsl/*ucc*.h
@@@ -5226,6 -5122,13 +5226,6 @@@ F:     sound/soc/fsl/fsl
  F:    sound/soc/fsl/imx*
  F:    sound/soc/fsl/mpc8610_hpcd.c
  
 -FREESCALE QORIQ MANAGEMENT COMPLEX DRIVER
 -M:    "J. German Rivera" <German.Rivera@freescale.com>
 -M:    Stuart Yoder <stuart.yoder@nxp.com>
 -L:    linux-kernel@vger.kernel.org
 -S:    Maintained
 -F:    drivers/staging/fsl-mc/
 -
  FREEVXFS FILESYSTEM
  M:    Christoph Hellwig <hch@infradead.org>
  W:    ftp://ftp.openlinux.org/pub/people/hch/vxfs
@@@ -5259,7 -5162,6 +5259,7 @@@ F:      include/linux/fscache*.
  FS-CRYPTO: FILE SYSTEM LEVEL ENCRYPTION SUPPORT
  M:    Theodore Y. Ts'o <tytso@mit.edu>
  M:    Jaegeuk Kim <jaegeuk@kernel.org>
 +L:    linux-fsdevel@vger.kernel.org
  S:    Supported
  F:    fs/crypto/
  F:    include/linux/fscrypto.h
@@@ -5324,7 -5226,6 +5324,7 @@@ L:      kernel-hardening@lists.openwall.co
  S:    Maintained
  F:    scripts/gcc-plugins/
  F:    scripts/gcc-plugin.sh
 +F:    scripts/Makefile.gcc-plugins
  F:    Documentation/gcc-plugins.txt
  
  GCOV BASED KERNEL PROFILING
@@@ -5736,6 -5637,7 +5736,6 @@@ F:      drivers/watchdog/hpwdt.
  
  HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
  M:    Don Brace <don.brace@microsemi.com>
 -L:    iss_storagedev@hp.com
  L:    esc.storagedev@microsemi.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
@@@ -5746,6 -5648,7 +5746,6 @@@ F:      include/uapi/linux/cciss*.
  
  HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
  M:    Don Brace <don.brace@microsemi.com>
 -L:    iss_storagedev@hp.com
  L:    esc.storagedev@microsemi.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
@@@ -5966,7 -5869,6 +5966,7 @@@ F:      drivers/input/serio/hyperv-keyboard.
  F:    drivers/pci/host/pci-hyperv.c
  F:    drivers/net/hyperv/
  F:    drivers/scsi/storvsc_drv.c
 +F:    drivers/uio/uio_hv_generic.c
  F:    drivers/video/fbdev/hyperv_fb.c
  F:    include/linux/hyperv.h
  F:    tools/hv/
@@@ -6242,22 -6144,6 +6242,22 @@@ L:    linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/rc/iguanair.c
  
 +IIO DIGITAL POTENTIOMETER DAC
 +M:    Peter Rosin <peda@axentia.se>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac
 +F:    Documentation/devicetree/bindings/iio/dac/dpot-dac.txt
 +F:    drivers/iio/dac/dpot-dac.c
 +
 +IIO ENVELOPE DETECTOR
 +M:    Peter Rosin <peda@axentia.se>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector
 +F:    Documentation/devicetree/bindings/iio/adc/envelope-detector.txt
 +F:    drivers/iio/adc/envelope-detector.c
 +
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <jic23@kernel.org>
  R:    Hartmut Knaack <knaack.h@gmx.de>
@@@ -6415,11 -6301,9 +6415,11 @@@ S:    Maintaine
  F:    drivers/platform/x86/intel-vbtn.c
  
  INTEL IDLE DRIVER
 +M:    Jacob Pan <jacob.jun.pan@linux.intel.com>
  M:    Len Brown <lenb@kernel.org>
  L:    linux-pm@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
 +B:    https://bugzilla.kernel.org
  S:    Supported
  F:    drivers/idle/intel_idle.c
  
@@@ -6517,7 -6401,10 +6517,7 @@@ F:     drivers/net/ethernet/intel/*
  
  INTEL RDMA RNIC DRIVER
  M:     Faisal Latif <faisal.latif@intel.com>
 -R:     Chien Tin Tung <chien.tin.tung@intel.com>
 -R:     Mustafa Ismail <mustafa.ismail@intel.com>
 -R:     Shiraz Saleem <shiraz.saleem@intel.com>
 -R:     Tatyana Nikolova <tatyana.e.nikolova@intel.com>
 +M:     Shiraz Saleem <shiraz.saleem@intel.com>
  L:     linux-rdma@vger.kernel.org
  S:     Supported
  F:     drivers/infiniband/hw/i40iw/
@@@ -6636,13 -6523,6 +6636,13 @@@ S:    Maintaine
  F:    arch/x86/include/asm/pmc_core.h
  F:    drivers/platform/x86/intel_pmc_core*
  
 +INVENSENSE MPU-3050 GYROSCOPE DRIVER
 +M:    Linus Walleij <linus.walleij@linaro.org>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/iio/gyro/mpu3050*
 +F:    Documentation/devicetree/bindings/iio/gyroscope/inv,mpu3050.txt
 +
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <ralf@linux-mips.org>
  L:    linux-mips@linux-mips.org
@@@ -7850,7 -7730,6 +7850,7 @@@ MCP4531 MICROCHIP DIGITAL POTENTIOMETE
  M:    Peter Rosin <peda@axentia.se>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531
  F:    drivers/iio/potentiometer/mcp4531.c
  
  MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
@@@ -7869,6 -7748,15 +7869,15 @@@ F:    Documentation/devicetree/bindings/me
  F:    drivers/media/platform/rcar-fcp.c
  F:    include/media/rcar-fcp.h
  
+ MEDIA DRIVERS FOR RENESAS - FDP1
+ M:    Kieran Bingham <kieran@bingham.xyz>
+ 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,fdp1.txt
+ F:    drivers/media/platform/rcar_fdp1.c
  MEDIA DRIVERS FOR RENESAS - VIN
  M:    Niklas Söderlund <niklas.soderlund@ragnatech.se>
  L:    linux-media@vger.kernel.org
@@@ -7975,6 -7863,24 +7984,24 @@@ L:    netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/mediatek/
  
+ MEDIATEK MEDIA DRIVER
+ M:    Tiffany Lin <tiffany.lin@mediatek.com>
+ M:    Andrew-CT Chen <andrew-ct.chen@mediatek.com>
+ S:    Supported
+ F:    drivers/media/platform/mtk-vcodec/
+ F:    drivers/media/platform/mtk-vpu/
+ F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
+ F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
+ MEDIATEK MDP DRIVER
+ M:    Minghsiu Tsai <minghsiu.tsai@mediatek.com>
+ M:    Houlong Wei <houlong.wei@mediatek.com>
+ M:    Andrew-CT Chen <andrew-ct.chen@mediatek.com>
+ S:    Supported
+ F:    drivers/media/platform/mtk-mdp/
+ F:    drivers/media/platform/mtk-vpu/
+ F:    Documentation/devicetree/bindings/media/mediatek-mdp.txt
  MEDIATEK MT7601U WIRELESS LAN DRIVER
  M:    Jakub Kicinski <kubakici@wp.pl>
  L:    linux-wireless@vger.kernel.org
@@@ -7982,12 -7888,12 +8009,12 @@@ S:   Maintaine
  F:    drivers/net/wireless/mediatek/mt7601u/
  
  MEGARAID SCSI/SAS DRIVERS
 -M:    Kashyap Desai <kashyap.desai@avagotech.com>
 -M:    Sumit Saxena <sumit.saxena@avagotech.com>
 -M:    Uday Lingala <uday.lingala@avagotech.com>
 -L:    megaraidlinux.pdl@avagotech.com
 +M:    Kashyap Desai <kashyap.desai@broadcom.com>
 +M:    Sumit Saxena <sumit.saxena@broadcom.com>
 +M:    Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
 +L:    megaraidlinux.pdl@broadcom.com
  L:    linux-scsi@vger.kernel.org
 -W:    http://www.lsi.com
 +W:    http://www.avagotech.com/support/
  S:    Maintained
  F:    Documentation/scsi/megaraid.txt
  F:    drivers/scsi/megaraid.*
@@@ -8025,15 -7931,6 +8052,15 @@@ W:    http://www.mellanox.co
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlxsw/
  
 +MELLANOX MLXCPLD I2C AND MUX DRIVER
 +M:    Vadim Pasternak <vadimp@mellanox.com>
 +M:    Michael Shych <michaelsh@mellanox.com>
 +L:    linux-i2c@vger.kernel.org
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-mlxcpld.c
 +F:    drivers/i2c/muxes/i2c-mux-mlxcpld.c
 +F:    Documentation/i2c/busses/i2c-mlxcpld
 +
  MELLANOX MLXCPLD LED DRIVER
  M:    Vadim Pasternak <vadimp@mellanox.com>
  L:    linux-leds@vger.kernel.org
@@@ -8047,13 -7944,6 +8074,13 @@@ L:      platform-driver-x86@vger.kernel
  S:      Supported
  F:      arch/x86/platform/mellanox/mlx-platform.c
  
 +MELLANOX MLX CPLD HOTPLUG DRIVER
 +M:    Vadim Pasternak <vadimp@mellanox.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Supported
 +F:    drivers/platform/x86/mlxcpld-hotplug.c
 +F:    include/linux/platform_data/mlxcpld-hotplug.h
 +
  SOFT-ROCE DRIVER (rxe)
  M:    Moni Shoua <monis@mellanox.com>
  L:    linux-rdma@vger.kernel.org
@@@ -8431,12 -8321,6 +8458,12 @@@ T:    git git://linuxtv.org/mkrufky/tuners
  S:    Maintained
  F:    drivers/media/tuners/mxl5007t.*
  
 +MXSFB DRM DRIVER
 +M:    Marek Vasut <marex@denx.de>
 +S:    Supported
 +F:    drivers/gpu/drm/mxsfb/
 +F:    Documentation/devicetree/bindings/display/mxsfb-drm.txt
 +
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
  M:    Hyong-Youb Kim <hykim@myri.com>
  L:    netdev@vger.kernel.org
@@@ -8483,6 -8367,7 +8510,6 @@@ F:      drivers/scsi/arm/oak.
  F:    drivers/scsi/atari_scsi.*
  F:    drivers/scsi/dmx3191d.c
  F:    drivers/scsi/g_NCR5380.*
 -F:    drivers/scsi/g_NCR5380_mmio.c
  F:    drivers/scsi/mac_scsi.*
  F:    drivers/scsi/sun3_scsi.*
  F:    drivers/scsi/sun3_scsi_vme.c
@@@ -8841,16 -8726,6 +8868,16 @@@ L:    linux-nvme@lists.infradead.or
  S:    Supported
  F:    drivers/nvme/target/
  
 +NVM EXPRESS FC TRANSPORT DRIVERS
 +M:    James Smart <james.smart@broadcom.com>
 +L:    linux-nvme@lists.infradead.org
 +S:    Supported
 +F:    include/linux/nvme-fc.h
 +F:    include/linux/nvme-fc-driver.h
 +F:    drivers/nvme/host/fc.c
 +F:    drivers/nvme/target/fc.c
 +F:    drivers/nvme/target/fcloop.c
 +
  NVMEM FRAMEWORK
  M:    Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
  M:    Maxime Ripard <maxime.ripard@free-electrons.com>
@@@ -8913,7 -8788,6 +8940,7 @@@ F:      drivers/regulator/tps65217-regulator
  F:    drivers/regulator/tps65218-regulator.c
  F:    drivers/regulator/tps65910-regulator.c
  F:    drivers/regulator/twl-regulator.c
 +F:    drivers/regulator/twl6030-regulator.c
  F:    include/linux/i2c-omap.h
  
  OMAP DEVICE TREE SUPPORT
@@@ -9270,7 -9144,7 +9297,7 @@@ F:      drivers/misc/panel.
  
  PARALLEL PORT SUBSYSTEM
  M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
 -M:    Sudip Mukherjee <sudip@vectorindia.org>
 +M:    Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
  L:    linux-parport@lists.infradead.org (subscribers-only)
  S:    Maintained
  F:    drivers/parport/
@@@ -9741,8 -9615,8 +9768,8 @@@ F:      arch/mips/boot/dts/pistachio
  F:      arch/mips/configs/pistachio*_defconfig
  
  PKTCDVD DRIVER
 -M:    Jiri Kosina <jikos@kernel.org>
 -S:    Maintained
 +S:    Orphan
 +M:    linux-block@vger.kernel.org
  F:    drivers/block/pktcdvd.c
  F:    include/linux/pktcdvd.h
  F:    include/uapi/linux/pktcdvd.h
@@@ -9956,7 -9830,7 +9983,7 @@@ 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
+ F:    drivers/media/usb/pulse8-cec/*
  
  PVRUSB2 VIDEO4LINUX DRIVER
  M:    Mike Isely <isely@pobox.com>
@@@ -9977,7 -9851,7 +10004,7 @@@ F:     drivers/media/usb/pwc/
  
  PWM FAN DRIVER
  M:    Kamil Debski <kamil@wypas.org>
 -M:    Lukasz Majewski <l.majewski@samsung.com>
 +M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/hwmon/pwm-fan.txt
@@@ -10119,12 -9993,6 +10146,12 @@@ F:  fs/qnx4
  F:    include/uapi/linux/qnx4_fs.h
  F:    include/uapi/linux/qnxtypes.h
  
 +QORIQ DPAA2 FSL-MC BUS DRIVER
 +M:    Stuart Yoder <stuart.yoder@nxp.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/fsl-mc/
 +
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -10587,7 -10455,7 +10614,7 @@@ F:   arch/s390/pci
  F:    drivers/pci/hotplug/s390_pci_hpc.c
  
  S390 ZCRYPT DRIVER
 -M:    Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
 +M:    Harald Freudenberger <freude@de.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -10754,7 -10622,7 +10781,7 @@@ L:   netdev@vger.kernel.or
  F:    drivers/net/ethernet/samsung/sxgbe/
  
  SAMSUNG THERMAL DRIVER
 -M:    Lukasz Majewski <l.majewski@samsung.com>
 +M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    linux-pm@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Supported
@@@ -10782,6 -10650,12 +10809,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/serial/
  F:    drivers/tty/serial/
  
+ SERIAL IR RECEIVER
+ M:    Sean Young <sean@mess.org>
+ L:    linux-media@vger.kernel.org
+ S:    Maintained
+ F:    drivers/media/rc/serial_ir.c
  STI CEC DRIVER
  M:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
  L:    kernel@stlinux.com
@@@ -10880,11 -10754,6 +10913,11 @@@ W: http://www.sunplus.co
  S:    Supported
  F:    arch/score/
  
 +SCR24X CHIP CARD INTERFACE DRIVER
 +M:    Lubomir Rintel <lkundrak@v3.sk>
 +S:    Supported
 +F:    drivers/char/pcmcia/scr24x_cs.c
 +
  SYSTEM CONTROL & POWER INTERFACE (SCPI) Message Protocol drivers
  M:    Sudeep Holla <sudeep.holla@arm.com>
  L:    linux-arm-kernel@lists.infradead.org
@@@ -11093,6 -10962,7 +11126,6 @@@ F:   drivers/net/ethernet/emulex/benet
  EMULEX ONECONNECT ROCE DRIVER
  M:    Selvin Xavier <selvin.xavier@avagotech.com>
  M:    Devesh Sharma <devesh.sharma@avagotech.com>
 -M:    Mitesh Ahuja <mitesh.ahuja@avagotech.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.emulex.com
  S:    Supported
@@@ -11287,7 -11157,7 +11320,7 @@@ F:   include/media/i2c/ov2659.
  SILICON MOTION SM712 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
  M:    Teddy Wang <teddy.wang@siliconmotion.com>
 -M:    Sudip Mukherjee <sudip@vectorindia.org>
 +M:    Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
  L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/fbdev/sm712*
@@@ -11715,11 -11585,17 +11748,11 @@@ F:        drivers/staging/rtl8712
  STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
  M:    Teddy Wang <teddy.wang@siliconmotion.com>
 -M:    Sudip Mukherjee <sudip@vectorindia.org>
 +M:    Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
  L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/staging/sm750fb/
  
 -STAGING - SLICOSS
 -M:    Lior Dotan <liodot@gmail.com>
 -M:    Christopher Harrer <charrer@alacritech.com>
 -S:    Odd Fixes
 -F:    drivers/staging/slicoss/
 -
  STAGING - SPEAKUP CONSOLE SPEECH DRIVER
  M:    William Hubbs <w.d.hubbs@gmail.com>
  M:    Chris Brannon <chris@the-brannons.com>
@@@ -11829,7 -11705,6 +11862,7 @@@ S:   Supporte
  F:    arch/arc/
  F:    Documentation/devicetree/bindings/arc/*
  F:    Documentation/devicetree/bindings/interrupt-controller/snps,arc*
 +F:    drivers/clocksource/arc_timer.c
  F:    drivers/tty/serial/arc_uart.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
  
@@@ -12090,16 -11965,6 +12123,16 @@@ S: Maintaine
  F:    arch/xtensa/
  F:    drivers/irqchip/irq-xtensa-*
  
 +Texas Instruments' System Control Interface (TISCI) Protocol Driver
 +M:    Nishanth Menon <nm@ti.com>
 +M:    Tero Kristo <t-kristo@ti.com>
 +M:    Santosh Shilimkar <ssantosh@kernel.org>
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
 +F:    drivers/firmware/ti_sci*
 +F:    include/linux/soc/ti/ti_sci_protocol.h
 +
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -12530,12 -12395,6 +12563,12 @@@ S: Maintaine
  F:    Documentation/filesystems/udf.txt
  F:    fs/udf/
  
 +UDRAW TABLET
 +M:    Bastien Nocera <hadess@hadess.net>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hid/hid-udraw.c
 +
  UFS FILESYSTEM
  M:    Evgeniy Dushistov <dushistov@mail.ru>
  S:    Maintained
@@@ -12592,8 -12451,7 +12625,8 @@@ F:   Documentation/scsi/ufs.tx
  F:    drivers/scsi/ufs/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
 -M:    Joao Pinto <Joao.Pinto@synopsys.com>
 +M:    Manjunath M Bettegowda <manjumb@synopsys.com>
 +M:    Prabu Thangamuthu <prabut@synopsys.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    drivers/scsi/ufs/*dwc*
@@@ -12951,15 -12809,6 +12984,15 @@@ F: drivers/vfio
  F:    include/linux/vfio.h
  F:    include/uapi/linux/vfio.h
  
 +VFIO MEDIATED DEVICE DRIVERS
 +M:    Kirti Wankhede <kwankhede@nvidia.com>
 +L:    kvm@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/vfio-mediated-device.txt
 +F:    drivers/vfio/mdev/
 +F:    include/linux/mdev.h
 +F:    samples/vfio-mdev/
 +
  VFIO PLATFORM DRIVER
  M:    Baptiste Reynal <b.reynal@virtualopensystems.com>
  L:    kvm@vger.kernel.org
@@@ -13014,7 -12863,6 +13047,7 @@@ F:   drivers/net/virtio_net.
  F:    drivers/block/virtio_blk.c
  F:    include/linux/virtio_*.h
  F:    include/uapi/linux/virtio_*.h
 +F:    drivers/crypto/virtio/
  
  VIRTIO DRIVERS FOR S390
  M:    Christian Borntraeger <borntraeger@de.ibm.com>
@@@ -13051,14 -12899,6 +13084,14 @@@ S: Maintaine
  F:    drivers/virtio/virtio_input.c
  F:    include/uapi/linux/virtio_input.h
  
 +VIRTIO CRYPTO DRIVER
 +M:  Gonglei <arei.gonglei@huawei.com>
 +L:  virtualization@lists.linux-foundation.org
 +L:  linux-crypto@vger.kernel.org
 +S:  Maintained
 +F:  drivers/crypto/virtio/
 +F:  include/uapi/linux/virtio_crypto.h
 +
  VIA RHINE NETWORK DRIVER
  S:    Orphan
  F:    drivers/net/ethernet/via/via-rhine.c
@@@ -13163,13 -13003,6 +13196,13 @@@ S: Maintaine
  F:    drivers/scsi/vmw_pvscsi.c
  F:    drivers/scsi/vmw_pvscsi.h
  
 +VMWARE PVRDMA DRIVER
 +M:    Adit Ranadive <aditr@vmware.com>
 +M:    VMware PV-Drivers <pv-drivers@vmware.com>
 +L:    linux-rdma@vger.kernel.org
 +S:    Maintained
 +F:    drivers/infiniband/hw/vmw_pvrdma/
 +
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <lgirdwood@gmail.com>
  M:    Mark Brown <broonie@kernel.org>
@@@ -13417,6 -13250,7 +13450,6 @@@ F:   drivers/media/tuners/tuner-xc2028.
  
  XEN HYPERVISOR INTERFACE
  M:    Boris Ostrovsky <boris.ostrovsky@oracle.com>
 -M:    David Vrabel <david.vrabel@citrix.com>
  M:    Juergen Gross <jgross@suse.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
                dpi0 = &dpi0;
                dsi0 = &dsi0;
                dsi1 = &dsi1;
+               mdp_rdma0 = &mdp_rdma0;
+               mdp_rdma1 = &mdp_rdma1;
+               mdp_rsz0 = &mdp_rsz0;
+               mdp_rsz1 = &mdp_rsz1;
+               mdp_rsz2 = &mdp_rsz2;
+               mdp_wdma0 = &mdp_wdma0;
+               mdp_wrot0 = &mdp_wrot0;
+               mdp_wrot1 = &mdp_wrot1;
        };
  
        cpus {
                auxadc: auxadc@11001000 {
                        compatible = "mediatek,mt8173-auxadc";
                        reg = <0 0x11001000 0 0x1000>;
 +                      clocks = <&pericfg CLK_PERI_AUXADC>;
 +                      clock-names = "main";
 +                      #io-channel-cells = <1>;
                };
  
                uart0: serial@11002000 {
                        status = "disabled";
                };
  
 -              usb30: usb@11270000 {
 -                      compatible = "mediatek,mt8173-xhci";
 -                      reg = <0 0x11270000 0 0x1000>,
 +              ssusb: usb@11271000 {
 +                      compatible = "mediatek,mt8173-mtu3";
 +                      reg = <0 0x11271000 0 0x3000>,
                              <0 0x11280700 0 0x0100>;
 -                      interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_LOW>;
 +                      reg-names = "mac", "ippc";
 +                      interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_LOW>;
 +                      phys = <&phy_port0 PHY_TYPE_USB3>,
 +                             <&phy_port1 PHY_TYPE_USB2>;
                        power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>;
                        clocks = <&topckgen CLK_TOP_USB30_SEL>,
                                 <&pericfg CLK_PERI_USB0>,
                        clock-names = "sys_ck",
                                      "wakeup_deb_p0",
                                      "wakeup_deb_p1";
 -                      phys = <&phy_port0 PHY_TYPE_USB3>,
 -                             <&phy_port1 PHY_TYPE_USB2>;
                        mediatek,syscon-wakeup = <&pericfg>;
 -                      status = "okay";
 +                      #address-cells = <2>;
 +                      #size-cells = <2>;
 +                      ranges;
 +                      status = "disabled";
 +
 +                      usb_host: xhci@11270000 {
 +                              compatible = "mediatek,mt8173-xhci";
 +                              reg = <0 0x11270000 0 0x1000>;
 +                              reg-names = "mac";
 +                              interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_LOW>;
 +                              power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>;
 +                              clocks = <&topckgen CLK_TOP_USB30_SEL>;
 +                              clock-names = "sys_ck";
 +                              status = "disabled";
 +                      };
                };
  
                u3phy: usb-phy@11290000 {
                        #clock-cells = <1>;
                };
  
+               mdp {
+                       compatible = "mediatek,mt8173-mdp";
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+                       mediatek,vpu = <&vpu>;
+                       mdp_rdma0: rdma@14001000 {
+                               compatible = "mediatek,mt8173-mdp-rdma";
+                               reg = <0 0x14001000 0 0x1000>;
+                               clocks = <&mmsys CLK_MM_MDP_RDMA0>,
+                                        <&mmsys CLK_MM_MUTEX_32K>;
+                               power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+                               iommus = <&iommu M4U_PORT_MDP_RDMA0>;
+                               mediatek,larb = <&larb0>;
+                       };
+                       mdp_rdma1: rdma@14002000 {
+                               compatible = "mediatek,mt8173-mdp-rdma";
+                               reg = <0 0x14002000 0 0x1000>;
+                               clocks = <&mmsys CLK_MM_MDP_RDMA1>,
+                                        <&mmsys CLK_MM_MUTEX_32K>;
+                               power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+                               iommus = <&iommu M4U_PORT_MDP_RDMA1>;
+                               mediatek,larb = <&larb4>;
+                       };
+                       mdp_rsz0: rsz@14003000 {
+                               compatible = "mediatek,mt8173-mdp-rsz";
+                               reg = <0 0x14003000 0 0x1000>;
+                               clocks = <&mmsys CLK_MM_MDP_RSZ0>;
+                               power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+                       };
+                       mdp_rsz1: rsz@14004000 {
+                               compatible = "mediatek,mt8173-mdp-rsz";
+                               reg = <0 0x14004000 0 0x1000>;
+                               clocks = <&mmsys CLK_MM_MDP_RSZ1>;
+                               power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+                       };
+                       mdp_rsz2: rsz@14005000 {
+                               compatible = "mediatek,mt8173-mdp-rsz";
+                               reg = <0 0x14005000 0 0x1000>;
+                               clocks = <&mmsys CLK_MM_MDP_RSZ2>;
+                               power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+                       };
+                       mdp_wdma0: wdma@14006000 {
+                               compatible = "mediatek,mt8173-mdp-wdma";
+                               reg = <0 0x14006000 0 0x1000>;
+                               clocks = <&mmsys CLK_MM_MDP_WDMA>;
+                               power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+                               iommus = <&iommu M4U_PORT_MDP_WDMA>;
+                               mediatek,larb = <&larb0>;
+                       };
+                       mdp_wrot0: wrot@14007000 {
+                               compatible = "mediatek,mt8173-mdp-wrot";
+                               reg = <0 0x14007000 0 0x1000>;
+                               clocks = <&mmsys CLK_MM_MDP_WROT0>;
+                               power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+                               iommus = <&iommu M4U_PORT_MDP_WROT0>;
+                               mediatek,larb = <&larb0>;
+                       };
+                       mdp_wrot1: wrot@14008000 {
+                               compatible = "mediatek,mt8173-mdp-wrot";
+                               reg = <0 0x14008000 0 0x1000>;
+                               clocks = <&mmsys CLK_MM_MDP_WROT1>;
+                               power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
+                               iommus = <&iommu M4U_PORT_MDP_WROT1>;
+                               mediatek,larb = <&larb4>;
+                       };
+               };
                ovl0: ovl@1400c000 {
                        compatible = "mediatek,mt8173-disp-ovl";
                        reg = <0 0x1400c000 0 0x1000>;
                        #clock-cells = <1>;
                };
  
+               vcodec_dec: vcodec@16000000 {
+                       compatible = "mediatek,mt8173-vcodec-dec";
+                       reg = <0 0x16000000 0 0x100>,   /* VDEC_SYS */
+                             <0 0x16020000 0 0x1000>,  /* VDEC_MISC */
+                             <0 0x16021000 0 0x800>,   /* VDEC_LD */
+                             <0 0x16021800 0 0x800>,   /* VDEC_TOP */
+                             <0 0x16022000 0 0x1000>,  /* VDEC_CM */
+                             <0 0x16023000 0 0x1000>,  /* VDEC_AD */
+                             <0 0x16024000 0 0x1000>,  /* VDEC_AV */
+                             <0 0x16025000 0 0x1000>,  /* VDEC_PP */
+                             <0 0x16026800 0 0x800>,   /* VDEC_HWD */
+                             <0 0x16027000 0 0x800>,   /* VDEC_HWQ */
+                             <0 0x16027800 0 0x800>,   /* VDEC_HWB */
+                             <0 0x16028400 0 0x400>;   /* VDEC_HWG */
+                       interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_LOW>;
+                       mediatek,larb = <&larb1>;
+                       iommus = <&iommu M4U_PORT_HW_VDEC_MC_EXT>,
+                                <&iommu M4U_PORT_HW_VDEC_PP_EXT>,
+                                <&iommu M4U_PORT_HW_VDEC_AVC_MV_EXT>,
+                                <&iommu M4U_PORT_HW_VDEC_PRED_RD_EXT>,
+                                <&iommu M4U_PORT_HW_VDEC_PRED_WR_EXT>,
+                                <&iommu M4U_PORT_HW_VDEC_UFO_EXT>,
+                                <&iommu M4U_PORT_HW_VDEC_VLD_EXT>,
+                                <&iommu M4U_PORT_HW_VDEC_VLD2_EXT>;
+                       mediatek,vpu = <&vpu>;
+                       power-domains = <&scpsys MT8173_POWER_DOMAIN_VDEC>;
+                       clocks = <&apmixedsys CLK_APMIXED_VCODECPLL>,
+                                <&topckgen CLK_TOP_UNIVPLL_D2>,
+                                <&topckgen CLK_TOP_CCI400_SEL>,
+                                <&topckgen CLK_TOP_VDEC_SEL>,
+                                <&topckgen CLK_TOP_VCODECPLL>,
+                                <&apmixedsys CLK_APMIXED_VENCPLL>,
+                                <&topckgen CLK_TOP_VENC_LT_SEL>,
+                                <&topckgen CLK_TOP_VCODECPLL_370P5>;
+                       clock-names = "vcodecpll",
+                                     "univpll_d2",
+                                     "clk_cci400_sel",
+                                     "vdec_sel",
+                                     "vdecpll",
+                                     "vencpll",
+                                     "venc_lt_sel",
+                                     "vdec_bus_clk_src";
+               };
                larb1: larb@16010000 {
                        compatible = "mediatek,mt8173-smi-larb";
                        reg = <0 0x16010000 0 0x1000>;
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * General Public License for more details.
   *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA
   */
  
  /*
@@@ -999,7 -995,7 +995,7 @@@ static int bcm2048_set_fm_search_tune_m
                timeout = BCM2048_AUTO_SEARCH_TIMEOUT;
  
        if (!wait_for_completion_timeout(&bdev->compl,
-               msecs_to_jiffies(timeout)))
+                                        msecs_to_jiffies(timeout)))
                dev_err(&bdev->client->dev, "IRQ timeout.\n");
  
        if (value)
@@@ -2059,67 -2055,67 +2055,67 @@@ property_signed_read(fm_rssi, int, "%d"
  DEFINE_SYSFS_PROPERTY(region, unsigned, int, "%u", 0)
  
  static struct device_attribute attrs[] = {
-       __ATTR(power_state, S_IRUGO | S_IWUSR, bcm2048_power_state_read,
+       __ATTR(power_state, 0644, bcm2048_power_state_read,
               bcm2048_power_state_write),
-       __ATTR(mute, S_IRUGO | S_IWUSR, bcm2048_mute_read,
+       __ATTR(mute, 0644, bcm2048_mute_read,
               bcm2048_mute_write),
-       __ATTR(audio_route, S_IRUGO | S_IWUSR, bcm2048_audio_route_read,
+       __ATTR(audio_route, 0644, bcm2048_audio_route_read,
               bcm2048_audio_route_write),
-       __ATTR(dac_output, S_IRUGO | S_IWUSR, bcm2048_dac_output_read,
+       __ATTR(dac_output, 0644, bcm2048_dac_output_read,
               bcm2048_dac_output_write),
-       __ATTR(fm_hi_lo_injection, S_IRUGO | S_IWUSR,
+       __ATTR(fm_hi_lo_injection, 0644,
               bcm2048_fm_hi_lo_injection_read,
               bcm2048_fm_hi_lo_injection_write),
-       __ATTR(fm_frequency, S_IRUGO | S_IWUSR, bcm2048_fm_frequency_read,
+       __ATTR(fm_frequency, 0644, bcm2048_fm_frequency_read,
               bcm2048_fm_frequency_write),
-       __ATTR(fm_af_frequency, S_IRUGO | S_IWUSR,
+       __ATTR(fm_af_frequency, 0644,
               bcm2048_fm_af_frequency_read,
               bcm2048_fm_af_frequency_write),
-       __ATTR(fm_deemphasis, S_IRUGO | S_IWUSR, bcm2048_fm_deemphasis_read,
+       __ATTR(fm_deemphasis, 0644, bcm2048_fm_deemphasis_read,
               bcm2048_fm_deemphasis_write),
-       __ATTR(fm_rds_mask, S_IRUGO | S_IWUSR, bcm2048_fm_rds_mask_read,
+       __ATTR(fm_rds_mask, 0644, bcm2048_fm_rds_mask_read,
               bcm2048_fm_rds_mask_write),
-       __ATTR(fm_best_tune_mode, S_IRUGO | S_IWUSR,
+       __ATTR(fm_best_tune_mode, 0644,
               bcm2048_fm_best_tune_mode_read,
               bcm2048_fm_best_tune_mode_write),
-       __ATTR(fm_search_rssi_threshold, S_IRUGO | S_IWUSR,
+       __ATTR(fm_search_rssi_threshold, 0644,
               bcm2048_fm_search_rssi_threshold_read,
               bcm2048_fm_search_rssi_threshold_write),
-       __ATTR(fm_search_mode_direction, S_IRUGO | S_IWUSR,
+       __ATTR(fm_search_mode_direction, 0644,
               bcm2048_fm_search_mode_direction_read,
               bcm2048_fm_search_mode_direction_write),
-       __ATTR(fm_search_tune_mode, S_IRUGO | S_IWUSR,
+       __ATTR(fm_search_tune_mode, 0644,
               bcm2048_fm_search_tune_mode_read,
               bcm2048_fm_search_tune_mode_write),
-       __ATTR(rds, S_IRUGO | S_IWUSR, bcm2048_rds_read,
+       __ATTR(rds, 0644, bcm2048_rds_read,
               bcm2048_rds_write),
-       __ATTR(rds_b_block_mask, S_IRUGO | S_IWUSR,
+       __ATTR(rds_b_block_mask, 0644,
               bcm2048_rds_b_block_mask_read,
               bcm2048_rds_b_block_mask_write),
-       __ATTR(rds_b_block_match, S_IRUGO | S_IWUSR,
+       __ATTR(rds_b_block_match, 0644,
               bcm2048_rds_b_block_match_read,
               bcm2048_rds_b_block_match_write),
-       __ATTR(rds_pi_mask, S_IRUGO | S_IWUSR, bcm2048_rds_pi_mask_read,
+       __ATTR(rds_pi_mask, 0644, bcm2048_rds_pi_mask_read,
               bcm2048_rds_pi_mask_write),
-       __ATTR(rds_pi_match, S_IRUGO | S_IWUSR, bcm2048_rds_pi_match_read,
+       __ATTR(rds_pi_match, 0644, bcm2048_rds_pi_match_read,
               bcm2048_rds_pi_match_write),
-       __ATTR(rds_wline, S_IRUGO | S_IWUSR, bcm2048_rds_wline_read,
+       __ATTR(rds_wline, 0644, bcm2048_rds_wline_read,
               bcm2048_rds_wline_write),
-       __ATTR(rds_pi, S_IRUGO, bcm2048_rds_pi_read, NULL),
-       __ATTR(rds_rt, S_IRUGO, bcm2048_rds_rt_read, NULL),
-       __ATTR(rds_ps, S_IRUGO, bcm2048_rds_ps_read, NULL),
-       __ATTR(fm_rds_flags, S_IRUGO, bcm2048_fm_rds_flags_read, NULL),
-       __ATTR(region_bottom_frequency, S_IRUGO,
+       __ATTR(rds_pi, 0444, bcm2048_rds_pi_read, NULL),
+       __ATTR(rds_rt, 0444, bcm2048_rds_rt_read, NULL),
+       __ATTR(rds_ps, 0444, bcm2048_rds_ps_read, NULL),
+       __ATTR(fm_rds_flags, 0444, bcm2048_fm_rds_flags_read, NULL),
+       __ATTR(region_bottom_frequency, 0444,
               bcm2048_region_bottom_frequency_read, NULL),
-       __ATTR(region_top_frequency, S_IRUGO,
+       __ATTR(region_top_frequency, 0444,
               bcm2048_region_top_frequency_read, NULL),
-       __ATTR(fm_carrier_error, S_IRUGO,
+       __ATTR(fm_carrier_error, 0444,
               bcm2048_fm_carrier_error_read, NULL),
-       __ATTR(fm_rssi, S_IRUGO,
+       __ATTR(fm_rssi, 0444,
               bcm2048_fm_rssi_read, NULL),
-       __ATTR(region, S_IRUGO | S_IWUSR, bcm2048_region_read,
+       __ATTR(region, 0644, bcm2048_region_read,
               bcm2048_region_write),
-       __ATTR(rds_data, S_IRUGO, bcm2048_rds_data_read, NULL),
+       __ATTR(rds_data, 0444, bcm2048_rds_data_read, NULL),
  };
  
  static int bcm2048_sysfs_unregister_properties(struct bcm2048_device *bdev,
@@@ -2204,7 -2200,7 +2200,7 @@@ static ssize_t bcm2048_fops_read(struc
                }
                /* interruptible_sleep_on(&bdev->read_queue); */
                if (wait_event_interruptible(bdev->read_queue,
-                   bdev->rds_data_available) < 0) {
+                                            bdev->rds_data_available) < 0) {
                        retval = -EINTR;
                        goto done;
                }
@@@ -2542,7 -2538,7 +2538,7 @@@ static int bcm2048_vidioc_s_hw_freq_see
        return err;
  }
  
 -static struct v4l2_ioctl_ops bcm2048_ioctl_ops = {
 +static const struct v4l2_ioctl_ops bcm2048_ioctl_ops = {
        .vidioc_querycap        = bcm2048_vidioc_querycap,
        .vidioc_g_input         = bcm2048_vidioc_g_input,
        .vidioc_s_input         = bcm2048_vidioc_s_input,
@@@ -103,8 -103,7 +103,8 @@@ struct sasem_context 
  
        struct tx_t {
                unsigned char data_buf[SASEM_DATA_BUF_SZ]; /* user data
 -                                                          * buffer */
 +                                                          * buffer
 +                                                          */
                struct completion finished;  /* wait for write to finish  */
                atomic_t busy;               /* write in progress */
                int status;                  /* status of tx completion */
@@@ -296,8 -295,7 +296,8 @@@ static int vfd_close(struct inode *inod
                if (!context->dev_present && !context->ir_isopen) {
                        /* Device disconnected before close and IR port is
                         * not open. If IR port is open, context will be
 -                       * deleted by ir_close. */
 +                       * deleted by ir_close.
 +                       */
                        mutex_unlock(&context->ctx_lock);
                        delete_context(context);
                        return retval;
@@@ -386,9 -384,8 +386,8 @@@ static ssize_t vfd_write(struct file *f
  
        data_buf = memdup_user(buf, n_bytes);
        if (IS_ERR(data_buf)) {
-               retval = PTR_ERR(data_buf);
-               data_buf = NULL;
-               goto exit;
+               mutex_unlock(&context->ctx_lock);
+               return PTR_ERR(data_buf);
        }
  
        memcpy(context->tx.data_buf, data_buf, n_bytes);
  
        /* Nine 8 byte packets to be sent */
        /* NOTE: "\x07\x01\0\0\0\0\0\0" or "\x0c\0\0\0\0\0\0\0"
 -       *       will clear the VFD */
 +       *       will clear the VFD
 +       */
        for (i = 0; i < 9; i++) {
                switch (i) {
                case 0:
@@@ -70,7 -70,6 +70,7 @@@ header-y += bfs_fs.
  header-y += binfmts.h
  header-y += blkpg.h
  header-y += blktrace_api.h
 +header-y += blkzoned.h
  header-y += bpf_common.h
  header-y += bpf_perf_event.h
  header-y += bpf.h
@@@ -84,6 -83,8 +84,8 @@@ header-y += capi.
  header-y += cciss_defs.h
  header-y += cciss_ioctl.h
  header-y += cdrom.h
+ header-y += cec.h
+ header-y += cec-funcs.h
  header-y += cgroupstats.h
  header-y += chio.h
  header-y += cm4000_cs.h
@@@ -427,7 -428,6 +429,7 @@@ header-y += udp.
  header-y += uhid.h
  header-y += uinput.h
  header-y += uio.h
 +header-y += uleds.h
  header-y += ultrasound.h
  header-y += un.h
  header-y += unistd.h
@@@ -462,7 -462,6 +464,7 @@@ header-y += virtio_rng.
  header-y += virtio_scsi.h
  header-y += virtio_types.h
  header-y += virtio_vsock.h
 +header-y += virtio_crypto.h
  header-y += vm_sockets.h
  header-y += vt.h
  header-y += vtpm_proxy.h