qede: Fix out-of-bound fastpath memory access
[cascardo/linux.git] / MAINTAINERS
index 2556558..af299a7 100644 (file)
@@ -866,6 +866,13 @@ 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
 
+APPLIED MICRO (APM) X-GENE SOC PMU
+M:     Tai Nguyen <ttnguyen@apm.com>
+S:     Supported
+F:     drivers/perf/xgene_pmu.c
+F:     Documentation/perf/xgene-pmu.txt
+F:     Documentation/devicetree/bindings/perf/apm-xgene-pmu.txt
+
 APTINA CAMERA SENSOR PLL
 M:     Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
@@ -1003,6 +1010,7 @@ M:        Chen-Yu Tsai <wens@csie.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 N:     sun[x456789]i
+F:     arch/arm/boot/dts/ntc-gr8*
 
 ARM/Allwinner SoC Clock Support
 M:     Emilio López <emilio@elopez.com.ar>
@@ -1459,6 +1467,7 @@ F:        arch/arm/mach-orion5x/ts78xx-*
 ARM/OXNAS platform support
 M:     Neil Armstrong <narmstrong@baylibre.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-oxnas/
 F:     arch/arm/boot/dts/oxnas*
@@ -1693,14 +1702,6 @@ S:       Maintained
 F:     arch/arm/plat-samsung/s5p-dev-mfc.c
 F:     drivers/media/platform/s5p-mfc/
 
-ARM/SAMSUNG S5P SERIES TV SUBSYSTEM SUPPORT
-M:     Kyungmin Park <kyungmin.park@samsung.com>
-M:     Tomasz Stanislawski <t.stanislaws@samsung.com>
-L:     linux-arm-kernel@lists.infradead.org
-L:     linux-media@vger.kernel.org
-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
@@ -1859,6 +1860,7 @@ F:        drivers/bus/uniphier-system-bus.c
 F:     drivers/clk/uniphier/
 F:     drivers/i2c/busses/i2c-uniphier*
 F:     drivers/pinctrl/uniphier/
+F:     drivers/reset/reset-uniphier.c
 F:     drivers/tty/serial/8250/8250_uniphier.c
 N:     uniphier
 
@@ -2242,9 +2244,9 @@ S:        Maintained
 F:     drivers/net/wireless/atmel/atmel*
 
 ATMEL MAXTOUCH DRIVER
-M:     Nick Dyer <nick.dyer@itdev.co.uk>
-T:     git git://github.com/atmel-maxtouch/linux.git
-S:     Supported
+M:     Nick Dyer <nick@shmanahar.org>
+T:     git git://github.com/ndyer/linux.git
+S:     Maintained
 F:     Documentation/devicetree/bindings/input/atmel,maxtouch.txt
 F:     drivers/input/touchscreen/atmel_mxt_ts.c
 F:     include/linux/platform_data/atmel_mxt_ts.h
@@ -2472,6 +2474,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 S:     Maintained
 F:     block/
 F:     kernel/trace/blktrace.c
+F:     lib/sbitmap.c
 
 BLOCK2MTD DRIVER
 M:     Joern Engel <joern@lazybastard.org>
@@ -2540,15 +2543,18 @@ S:      Supported
 F:     drivers/net/ethernet/broadcom/genet/
 
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
-M:     Sony Chacko <sony.chacko@qlogic.com>
-M:     Dept-HSGLinuxNICDev@qlogic.com
+M:     Rasesh Mody <rasesh.mody@cavium.com>
+M:     Harish Patil <harish.patil@cavium.com>
+M:     Dept-GELinuxNICDev@cavium.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2.*
 F:     drivers/net/ethernet/broadcom/bnx2_*
 
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
-M:     Ariel Elior <ariel.elior@qlogic.com>
+M:     Yuval Mintz <Yuval.Mintz@cavium.com>
+M:     Ariel Elior <ariel.elior@cavium.com>
+M:     everest-linux-l2@cavium.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2x/
@@ -2595,6 +2601,13 @@ F:       arch/arm/mach-bcm/bcm_5301x.c
 F:     arch/arm/boot/dts/bcm5301x*.dtsi
 F:     arch/arm/boot/dts/bcm470*
 
+BROADCOM BCM53573 ARM ARCHITECTURE
+M:     Rafał Miłecki <rafal@milecki.pl>
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     arch/arm/boot/dts/bcm53573*
+F:     arch/arm/boot/dts/bcm47189*
+
 BROADCOM BCM63XX ARM ARCHITECTURE
 M:     Florian Fainelli <f.fainelli@gmail.com>
 M:     bcm-kernel-feedback-list@broadcom.com
@@ -2748,7 +2761,9 @@ S:        Supported
 F:     drivers/scsi/bfa/
 
 BROCADE BNA 10 GIGABIT ETHERNET DRIVER
-M:     Rasesh Mody <rasesh.mody@qlogic.com>
+M:     Rasesh Mody <rasesh.mody@cavium.com>
+M:     Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
+M:     Dept-GELinuxNICDev@cavium.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/brocade/bna/
@@ -2794,7 +2809,7 @@ L:        linux-media@vger.kernel.org
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Odd fixes
-F:     Documentation/video4linux/bttv/
+F:     Documentation/media/v4l-drivers/bttv*
 F:     drivers/media/pci/bt8xx/bttv*
 
 BUSLOGIC SCSI DRIVER
@@ -2839,7 +2854,7 @@ M:        Jonathan Corbet <corbet@lwn.net>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
-F:     Documentation/video4linux/cafe_ccic
+F:     Documentation/media/v4l-drivers/cafe_ccic*
 F:     drivers/media/platform/marvell-ccic/
 
 CAIF NETWORK LAYER
@@ -2941,7 +2956,7 @@ 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:     Documentation/media/uapi/cec
 F:     drivers/staging/media/cec/
 F:     drivers/media/cec-edid.c
 F:     drivers/media/rc/keymaps/rc-cec.c
@@ -3429,7 +3444,7 @@ T:        git git://linuxtv.org/media_tree.git
 W:     https://linuxtv.org
 W:     http://www.ivtvdriver.org/index.php/Cx18
 S:     Maintained
-F:     Documentation/video4linux/cx18.txt
+F:     Documentation/media/v4l-drivers/cx18*
 F:     drivers/media/pci/cx18/
 F:     include/uapi/linux/ivtv*
 
@@ -3458,7 +3473,7 @@ L:        linux-media@vger.kernel.org
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Odd fixes
-F:     Documentation/video4linux/cx88/
+F:     Documentation/media/v4l-drivers/cx88*
 F:     drivers/media/pci/cx88/
 
 CXD2820R MEDIA DRIVER
@@ -3491,6 +3506,7 @@ L:        linux-rdma@vger.kernel.org
 W:     http://www.openfabrics.org
 S:     Supported
 F:     drivers/infiniband/hw/cxgb3/
+F:     include/uapi/rdma/cxgb3-abi.h
 
 CXGB4 ETHERNET DRIVER (CXGB4)
 M:     Hariprasad S <hariprasad@chelsio.com>
@@ -3512,6 +3528,7 @@ L:        linux-rdma@vger.kernel.org
 W:     http://www.openfabrics.org
 S:     Supported
 F:     drivers/infiniband/hw/cxgb4/
+F:     include/uapi/rdma/cxgb4-abi.h
 
 CXGB4VF ETHERNET DRIVER (CXGB4VF)
 M:     Casey Leedom <leedom@chelsio.com>
@@ -3522,14 +3539,14 @@ F:      drivers/net/ethernet/chelsio/cxgb4vf/
 
 CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
 M:     Ian Munsie <imunsie@au1.ibm.com>
-M:     Michael Neuling <mikey@neuling.org>
+M:     Frederic Barrat <fbarrat@linux.vnet.ibm.com>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
+F:     arch/powerpc/platforms/powernv/pci-cxl.c
 F:     drivers/misc/cxl/
 F:     include/misc/cxl*
 F:     include/uapi/misc/cxl.h
 F:     Documentation/powerpc/cxl.txt
-F:     Documentation/powerpc/cxl.txt
 F:     Documentation/ABI/testing/sysfs-class-cxl
 
 CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
@@ -3937,7 +3954,7 @@ X:        Documentation/devicetree/
 X:     Documentation/acpi
 X:     Documentation/power
 X:     Documentation/spi
-X:     Documentation/DocBook/media
+X:     Documentation/media
 T:     git git://git.lwn.net/linux.git docs-next
 
 DOUBLETALK DRIVER
@@ -4110,6 +4127,14 @@ S:       Orphan / Obsolete
 F:     drivers/gpu/drm/i810/
 F:     include/uapi/drm/i810_drm.h
 
+DRM DRIVERS FOR MEDIATEK
+M:     CK Hu <ck.hu@mediatek.com>
+M:     Philipp Zabel <p.zabel@pengutronix.de>
+L:     dri-devel@lists.freedesktop.org
+S:     Supported
+F:     drivers/gpu/drm/mediatek/
+F:     Documentation/devicetree/bindings/display/mediatek/
+
 DRM DRIVER FOR MSM ADRENO GPU
 M:     Rob Clark <robdclark@gmail.com>
 L:     linux-arm-msm@vger.kernel.org
@@ -4644,6 +4669,7 @@ W:        https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/usb/em28xx/
+F:     Documentation/media/v4l-drivers/em28xx*
 
 EMBEDDED LINUX
 M:     Paul Gortmaker <paul.gortmaker@windriver.com>
@@ -4754,15 +4780,6 @@ L:       iommu@lists.linux-foundation.org
 S:     Maintained
 F:     drivers/iommu/exynos-iommu.c
 
-EXYNOS MIPI DISPLAY DRIVERS
-M:     Inki Dae <inki.dae@samsung.com>
-M:     Donghwa Lee <dh09.lee@samsung.com>
-M:     Kyungmin Park <kyungmin.park@samsung.com>
-L:     linux-fbdev@vger.kernel.org
-S:     Maintained
-F:     drivers/video/fbdev/exynos/exynos_mipi*
-F:     include/video/exynos_mipi*
-
 EZchip NPS platform support
 M:     Noam Camus <noamc@ezchip.com>
 S:     Supported
@@ -4941,12 +4958,9 @@ F:       drivers/net/wan/dlci.c
 F:     drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
-M:     Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
 M:     Tomi Valkeinen <tomi.valkeinen@ti.com>
 L:     linux-fbdev@vger.kernel.org
-W:     http://linux-fbdev.sourceforge.net/
 Q:     http://patchwork.kernel.org/project/linux-fbdev/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git
 S:     Maintained
 F:     Documentation/fb/
 F:     drivers/video/
@@ -5013,6 +5027,13 @@ F:       drivers/net/ethernet/freescale/fec_ptp.c
 F:     drivers/net/ethernet/freescale/fec.h
 F:     Documentation/devicetree/bindings/net/fsl-fec.txt
 
+FREESCALE QORIQ DPAA FMAN DRIVER
+M:     Madalin Bucur <madalin.bucur@nxp.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/freescale/fman
+F:     Documentation/devicetree/bindings/powerpc/fsl/fman.txt
+
 FREESCALE QUICC ENGINE LIBRARY
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Orphan
@@ -5403,6 +5424,13 @@ F:       drivers/staging/greybus/arche-platform.c
 F:     drivers/staging/greybus/arche-apb-ctrl.c
 F:     drivers/staging/greybus/arche_platform.h
 
+GS1662 VIDEO SERIALIZER
+M:     Charles-Antoine Couret <charles-antoine.couret@nexvision.fr>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/spi/gs1662.c
+
 GSPCA FINEPIX SUBDRIVER
 M:     Frank Zago <frank@zago.net>
 L:     linux-media@vger.kernel.org
@@ -5694,6 +5722,14 @@ S:       Maintained
 F:     drivers/net/ethernet/hisilicon/
 F:     Documentation/devicetree/bindings/net/hisilicon*.txt
 
+HISILICON ROCE DRIVER
+M:     Lijun Ou <oulijun@huawei.com>
+M:     Wei Hu(Xavier) <xavier.huwei@huawei.com>
+L:     linux-rdma@vger.kernel.org
+S:     Maintained
+F:     drivers/infiniband/hw/hns/
+F:     Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt
+
 HISILICON SAS Controller
 M:     John Garry <john.garry@huawei.com>
 W:     http://www.hisilicon.com
@@ -5770,6 +5806,14 @@ M:       Nadia Yvette Chambers <nyc@holomorphy.com>
 S:     Maintained
 F:     fs/hugetlbfs/
 
+HVA ST MEDIA DRIVER
+M:     Jean-Christophe Trotin <jean-christophe.trotin@st.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+W:     https://linuxtv.org
+S:     Supported
+F:     drivers/media/platform/sti/hva
+
 Hyper-V CORE AND DRIVERS
 M:     "K. Y. Srinivasan" <kys@microsoft.com>
 M:     Haiyang Zhang <haiyangz@microsoft.com>
@@ -6114,6 +6158,12 @@ M:       Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
 S:     Maintained
 F:     drivers/dma/dma-jz4780.c
 
+INGENIC JZ4780 NAND DRIVER
+M:     Harvey Hunt <harveyhuntnexus@gmail.com>
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+F:     drivers/mtd/nand/jz4780_*
+
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
 M:     Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
@@ -6648,7 +6698,7 @@ L:        linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     http://www.ivtvdriver.org
 S:     Maintained
-F:     Documentation/video4linux/*.ivtv
+F:     Documentation/media/v4l-drivers/ivtv*
 F:     drivers/media/pci/ivtv/
 F:     include/uapi/linux/ivtv*
 
@@ -7658,6 +7708,15 @@ 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 - VIN
+M:     Niklas Söderlund <niklas.soderlund@ragnatech.se>
+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/rcar_vin.txt
+F:     drivers/media/platform/rcar-vin/
+
 MEDIA DRIVERS FOR RENESAS - VSP1
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
@@ -7735,9 +7794,7 @@ W:        https://linuxtv.org
 Q:     http://patchwork.kernel.org/project/linux-media/list/
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
-F:     Documentation/dvb/
-F:     Documentation/video4linux/
-F:     Documentation/DocBook/media/
+F:     Documentation/media/
 F:     drivers/media/
 F:     drivers/staging/media/
 F:     include/linux/platform_data/media/
@@ -7904,6 +7961,14 @@ S:       Maintained
 F:     drivers/tty/serial/atmel_serial.c
 F:     include/linux/atmel_serial.h
 
+MICROCHIP / ATMEL ISC DRIVER
+M:     Songjun Wu <songjun.wu@microchip.com>
+L:     linux-media@vger.kernel.org
+S:     Supported
+F:     drivers/media/platform/atmel/atmel-isc.c
+F:     drivers/media/platform/atmel/atmel-isc-regs.h
+F:     devicetree/bindings/media/atmel-isc.txt
+
 MICROSOFT SURFACE PRO 3 BUTTON DRIVER
 M:     Chen Yu <yu.c.chen@intel.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -7952,6 +8017,7 @@ Q:        http://patchwork.ozlabs.org/project/netdev/list/
 S:     Supported
 F:     drivers/net/ethernet/mellanox/mlx4/
 F:     include/linux/mlx4/
+F:     include/uapi/rdma/mlx4-abi.h
 
 MELLANOX MLX4 IB driver
 M:     Yishai Hadas <yishaih@mellanox.com>
@@ -7972,6 +8038,7 @@ Q:        http://patchwork.ozlabs.org/project/netdev/list/
 S:     Supported
 F:     drivers/net/ethernet/mellanox/mlx5/core/
 F:     include/linux/mlx5/
+F:     include/uapi/rdma/mlx5-abi.h
 
 MELLANOX MLX5 IB driver
 M:     Matan Barak <matanb@mellanox.com>
@@ -8029,7 +8096,7 @@ F:        kernel/module.c
 MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
 W:     http://popies.net/meye/
 S:     Orphan
-F:     Documentation/video4linux/meye.txt
+F:     Documentation/media/v4l-drivers/meye*
 F:     drivers/media/pci/meye/
 F:     include/uapi/linux/meye.h
 
@@ -8244,6 +8311,7 @@ L:        linux-rdma@vger.kernel.org
 W:     http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm
 S:     Supported
 F:     drivers/infiniband/hw/nes/
+F:     include/uapi/rdma/nes-abi.h
 
 NETEM NETWORK EMULATOR
 M:     Stephen Hemminger <stephen@networkplumber.org>
@@ -8429,11 +8497,10 @@ F:      Documentation/devicetree/bindings/net/wireless/
 F:     drivers/net/wireless/
 
 NETXEN (1/10) GbE SUPPORT
-M:     Manish Chopra <manish.chopra@qlogic.com>
-M:     Sony Chacko <sony.chacko@qlogic.com>
-M:     Rajesh Borundia <rajesh.borundia@qlogic.com>
+M:     Manish Chopra <manish.chopra@cavium.com>
+M:     Rahul Verma <rahul.verma@cavium.com>
+M:     Dept-GELinuxNICDev@cavium.com
 L:     netdev@vger.kernel.org
-W:     http://www.qlogic.com
 S:     Supported
 F:     drivers/net/ethernet/qlogic/netxen/
 
@@ -9126,6 +9193,14 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/pci/versatile.txt
 F:     drivers/pci/host/pci-versatile.c
 
+PCI DRIVER FOR ARMADA 8K
+M:     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+L:     linux-pci@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/pci-armada8k.txt
+F:     drivers/pci/host/pcie-armada8k.c
+
 PCI DRIVER FOR APPLIEDMICRO XGENE
 M:     Tanmay Inamdar <tinamdar@apm.com>
 L:     linux-pci@vger.kernel.org
@@ -9172,6 +9247,7 @@ M:        Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
+F:     Documentation/devicetree/bindings/pci/aardvark-pci.txt
 F:     drivers/pci/host/pci-aardvark.c
 
 PCI DRIVER FOR NVIDIA TEGRA
@@ -9435,6 +9511,8 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/pinctrl/samsung/
+F:     include/dt-bindings/pinctrl/samsung.h
+F:     Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
 
 PIN CONTROLLER - SINGLE
 M:     Tony Lindgren <tony@atomide.com>
@@ -9685,7 +9763,7 @@ L:        linux-media@vger.kernel.org
 W:     http://www.isely.net/pvrusb2/
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
-F:     Documentation/video4linux/README.pvrusb2
+F:     Documentation/media/v4l-drivers/pvrusb2*
 F:     drivers/media/usb/pvrusb2/
 
 PWC WEBCAM DRIVER
@@ -9799,33 +9877,32 @@ F:      Documentation/scsi/LICENSE.qla4xxx
 F:     drivers/scsi/qla4xxx/
 
 QLOGIC QLA3XXX NETWORK DRIVER
-M:     Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
-M:     Ron Mercer <ron.mercer@qlogic.com>
-M:     linux-driver@qlogic.com
+M:     Dept-GELinuxNICDev@cavium.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     Documentation/networking/LICENSE.qla3xxx
 F:     drivers/net/ethernet/qlogic/qla3xxx.*
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
-M:     Dept-GELinuxNICDev@qlogic.com
+M:     Harish Patil <harish.patil@cavium.com>
+M:     Manish Chopra <manish.chopra@cavium.com>
+M:     Dept-GELinuxNICDev@cavium.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/qlogic/qlcnic/
 
 QLOGIC QLGE 10Gb ETHERNET DRIVER
-M:     Harish Patil <harish.patil@qlogic.com>
-M:     Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
-M:     Dept-GELinuxNICDev@qlogic.com
-M:     linux-driver@qlogic.com
+M:     Harish Patil <harish.patil@cavium.com>
+M:     Manish Chopra <manish.chopra@cavium.com>
+M:     Dept-GELinuxNICDev@cavium.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/qlogic/qlge/
 
 QLOGIC QL4xxx ETHERNET DRIVER
-M:     Yuval Mintz <Yuval.Mintz@qlogic.com>
-M:     Ariel Elior <Ariel.Elior@qlogic.com>
-M:     everest-linux-l2@qlogic.com
+M:     Yuval Mintz <Yuval.Mintz@cavium.com>
+M:     Ariel Elior <Ariel.Elior@cavium.com>
+M:     everest-linux-l2@cavium.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/qlogic/qed/
@@ -10352,7 +10429,7 @@ L:      linux-media@vger.kernel.org
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Odd fixes
-F:     Documentation/video4linux/*.saa7134
+F:     Documentation/media/v4l-drivers/saa7134*
 F:     drivers/media/pci/saa7134/
 
 SAA7146 VIDEO4LINUX-2 DRIVER
@@ -10497,6 +10574,13 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/serial/
 F:     drivers/tty/serial/
 
+STI CEC DRIVER
+M:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
+L:     kernel@stlinux.com
+S:     Maintained
+F:     drivers/staging/media/st-cec/
+F:     Documentation/devicetree/bindings/media/stih-cec.txt
+
 SYNOPSYS DESIGNWARE DMAC DRIVER
 M:     Viresh Kumar <vireshk@kernel.org>
 M:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@ -10801,6 +10885,7 @@ L:      linux-rdma@vger.kernel.org
 W:     http://www.emulex.com
 S:     Supported
 F:     drivers/infiniband/hw/ocrdma/
+F:     include/uapi/rdma/ocrdma-abi.h
 
 SFC NETWORK DRIVER
 M:     Solarflare linux maintainers <linux-net-drivers@solarflare.com>
@@ -12060,6 +12145,15 @@ W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Odd fixes
 F:     drivers/media/usb/tm6000/
+F:     Documentation/media/v4l-drivers/tm6000*
+
+TW5864 VIDEO4LINUX DRIVER
+M:     Bluecherry Maintainers <maintainers@bluecherrydvr.com>
+M:     Andrey Utkin <andrey.utkin@corp.bluecherry.net>
+M:     Andrey Utkin <andrey_utkin@fastmail.com>
+L:     linux-media@vger.kernel.org
+S:     Supported
+F:     drivers/media/pci/tw5864/
 
 TW68 VIDEO4LINUX DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
@@ -12552,7 +12646,7 @@ L:      linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     http://royale.zerezo.com/zr364xx/
 S:     Maintained
-F:     Documentation/video4linux/zr364xx.txt
+F:     Documentation/media/v4l-drivers/zr364xx*
 F:     drivers/media/usb/zr364xx/
 
 ULPI BUS
@@ -13088,6 +13182,7 @@ F:      arch/arm64/include/asm/xen/
 
 XEN NETWORK BACKEND DRIVER
 M:     Wei Liu <wei.liu2@citrix.com>
+M:     Paul Durrant <paul.durrant@citrix.com>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 L:     netdev@vger.kernel.org
 S:     Supported