Merge tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

Pull media updates from Mauro Carvalho Chehab:

 - new IR driver: hix5hd2-ir

 - the virtual test driver (vivi) was replaced by vivid, with has an
   almost complete set of features to emulate most v4l2 devices and
   properly test all sorts of userspace apps

 - the as102 driver had several bugs fixed and was properly split into a
   frontend and a core driver.  With that, it got promoted from staging
   into mainstream

 - one new CI driver got added for CIMaX SP2/SP2HF (sp2 driver)

 - one new frontend driver for Toshiba ISDB-T/ISDB-S demod (tc90522)

 - one new PCI driver for ISDB-T/ISDB-S (pt3 driver)

 - saa7134 driver got support for go7007-based devices

 - added a new PCI driver for Techwell 68xx chipsets (tw68)

 - a new platform driver was added (coda)

 - new tuner drivers: mxl301rf and qm1d1c0042

 - a new DVB USB driver was added for DVBSky S860 & similar devices

 - added a new SDR driver (hackrf)

 - usbtv got audio support

 - several platform drivers are now compiled with COMPILE_TEST

 - a series of compiler fixup patches, making sparse/spatch happier with
   the media stuff and removing several warnings, especially on those
   platform drivers that didn't use to compile on x86

 - Support for several new modern devices got added

 - lots of other fixes, improvements and cleanups

* tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (544 commits)
  [media] ir-hix5hd2: fix build on c6x arch
  [media] pt3: fix DTV FE I2C driver load error paths
  Revert "[media] media: em28xx - remove reset_resume interface"
  [media] exynos4-is: fix some warnings when compiling on arm64
  [media] usb drivers: use %zu instead of %zd
  [media] pci drivers: use %zu instead of %zd
  [media] dvb-frontends: use %zu instead of %zd
  [media] s5p-mfc: Fix several printk warnings
  [media] s5p_mfc_opr: Fix warnings
  [media] ti-vpe: Fix typecast
  [media] s3c-camif: fix dma_addr_t printks
  [media] s5p_mfc_opr_v6: get rid of warnings when compiled with 64 bits
  [media] s5p_mfc_opr_v5: Fix lots of warnings on x86_64
  [media] em28xx: Fix identation
  [media] drxd: remove a dead code
  [media] saa7146: remove return after BUG()
  [media] cx88: remove return after BUG()
  [media] cx88: fix cards table CodingStyle
  [media] radio-sf16fmr2: declare some structs as static
  [media] radio-sf16fmi: declare pnp_attached as static
  ...

diff --combined MAINTAINERS
index 8b0902106cc0809454adb9e788902119933cd28b,e95e8be7376a8753070087788d9bca6c97bee4c8..2cddff1dd43942b9d0c58b0c8418b9f7d1dcc4ee
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -152,9 -152,8 +152,9 @@@ F: drivers/scsi/53c700
  
  6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
  M:    Alexander Aring <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +M:    Jukka Rissanen <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    net/6lowpan/
  F:    include/net/6lowpan.h
@@@ -686,17 -685,6 +686,17 @@@ L:       [email protected] (moderat
  W:    http://blackfin.uclinux.org/
  S:    Supported
  F:    sound/soc/blackfin/*
 + 
 +ANALOG DEVICES INC IIO DRIVERS
 +M:    Lars-Peter Clausen <[email protected]>
 +M:    Michael Hennerich <[email protected]>
 +W:    http://wiki.analog.com/
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/*/ad*
 +X:    drivers/iio/*/adjd*
 +F:    drivers/staging/iio/*/ad*
 +F:    staging/iio/trigger/iio-trig-bfin-timer.c
  
  AOA (Apple Onboard Audio) ALSA DRIVER
  M:    Johannes Berg <[email protected]>
@@@ -847,12 -835,6 +847,12 @@@ M:       Emilio López <[email protected]
  S:    Maintained
  F:    drivers/clk/sunxi/
  
 +ARM/Amlogic MesonX SoC support
 +M:    Carlo Caione <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +N:    meson[x68]
 +
  ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
  M:    Andrew Victor <[email protected]>
  M:    Nicolas Ferre <[email protected]>
@@@ -879,9 -861,10 +879,9 @@@ S:        Maintaine
  F:    arch/arm/mach-highbank/
  
  ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
 -M:    Anton Vorontsov <[email protected]>
 +M:    Krzysztof Halasa <[email protected]>
  S:    Maintained
  F:    arch/arm/mach-cns3xxx/
 -T:    git git://git.infradead.org/users/cbou/linux-cns3xxx.git
  
  ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
  M:    Alexander Shiyan <[email protected]>
@@@ -981,7 -964,7 +981,7 @@@ F: arch/arm/include/asm/hardware/dec212
  F:    arch/arm/mach-footbridge/
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 -M:    Shawn Guo <shawn.guo@freescale.com>
 +M:    Shawn Guo <shawn.guo@linaro.org>
  M:    Sascha Hauer <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1042,20 -1025,24 +1042,20 @@@ F:   arch/arm/mach-pxa/colibri-pxa270-inc
  
  ARM/INTEL IOP32X ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IOP33X ARM ARCHITECTURE
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 +S:    Orphan
  
  ARM/INTEL IOP13XX ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
@@@ -1066,7 -1053,7 +1066,7 @@@ S:      Maintaine
  
  ARM/INTEL IXP4XX ARM ARCHITECTURE
  M:    Imre Kaloz <[email protected]>
 -M:    Krzysztof Halasa <kh[email protected].pl>
 +M:    Krzysztof Halasa <khalasa@piap.pl>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-ixp4xx/
@@@ -1080,6 -1067,7 +1080,6 @@@ F:      drivers/pcmcia/pxa2xx_stargate2.
  
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
@@@ -1162,16 -1150,6 +1162,16 @@@ W:    http://www.digriz.org.uk/ts78xx/kern
  S:    Maintained
  F:    arch/arm/mach-orion5x/ts78xx-*
  
 +ARM/Mediatek SoC support
 +M:    Matthias Brugger <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/boot/dts/mt6*
 +F:    arch/arm/boot/dts/mt8*
 +F:    arch/arm/mach-mediatek/
 +N:    mtk
 +K:    mediatek
 +
  ARM/MICREL KS8695 ARCHITECTURE
  M:    Greg Ungerer <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1383,6 -1361,7 +1383,6 @@@ F:      arch/arm/boot/dts/sh
  F:    arch/arm/configs/ape6evm_defconfig
  F:    arch/arm/configs/armadillo800eva_defconfig
  F:    arch/arm/configs/bockw_defconfig
 -F:    arch/arm/configs/genmai_defconfig
  F:    arch/arm/configs/koelsch_defconfig
  F:    arch/arm/configs/kzm9g_defconfig
  F:    arch/arm/configs/lager_defconfig
@@@ -1393,23 -1372,15 +1393,23 @@@ F:   arch/arm/mach-shmobile
  F:    drivers/sh/
  
  ARM/SOCFPGA ARCHITECTURE
 -M:    Dinh Nguyen <[email protected]>
 +M:    Dinh Nguyen <dinguyen@opensource.altera.com>
  S:    Maintained
  F:    arch/arm/mach-socfpga/
 +W:    http://www.rocketboards.org
 +T:    git://git.rocketboards.org/linux-socfpga.git
 +T:    git://git.rocketboards.org/linux-socfpga-next.git
  
  ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT
 -M:    Dinh Nguyen <[email protected]>
 +M:    Dinh Nguyen <dinguyen@opensource.altera.com>
  S:    Maintained
  F:    drivers/clk/socfpga/
  
 +ARM/SOCFPGA EDAC SUPPORT
 +M:    Thor Thayer <[email protected]>
 +S:    Maintained
 +F:    drivers/edac/altera_edac.
 +
  ARM/STI ARCHITECTURE
  M:    Srinivas Kandagatla <[email protected]>
  M:    Maxime Coquelin <[email protected]>
@@@ -1421,17 -1392,12 +1421,17 @@@ S:   Maintaine
  F:    arch/arm/mach-sti/
  F:    arch/arm/boot/dts/sti*
  F:    drivers/clocksource/arm_global_timer.c
 -F:    drivers/reset/sti/
 -F:    drivers/pinctrl/pinctrl-st.c
 -F:    drivers/media/rc/st_rc.c
  F:    drivers/i2c/busses/i2c-st.c
 -F:    drivers/tty/serial/st-asc.c
 +F:    drivers/media/rc/st_rc.c
  F:    drivers/mmc/host/sdhci-st.c
 +F:    drivers/phy/phy-stih407-usb.c
 +F:    drivers/phy/phy-stih41x-usb.c
 +F:    drivers/pinctrl/pinctrl-st.c
 +F:    drivers/reset/sti/
 +F:    drivers/tty/serial/st-asc.c
 +F:    drivers/usb/dwc3/dwc3-st.c
 +F:    drivers/usb/host/ehci-st.c
 +F:    drivers/usb/host/ohci-st.c
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
@@@ -1596,9 -1562,9 +1596,9 @@@ F:      drivers/platform/x86/asus*.
  F:    drivers/platform/x86/eeepc*.c
  
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
 -M:    Dan Williams <[email protected]>
 +R:    Dan Williams <[email protected]>
  W:    http://sourceforge.net/projects/xscaleiop
 -S:    Maintained
 +S:    Odd fixes
  F:    Documentation/crypto/async-tx-api.txt
  F:    crypto/async_tx/
  F:    drivers/dma/
@@@ -1650,7 -1616,6 +1650,7 @@@ L:      [email protected]
  S:    Supported
  W:    http://wireless.kernel.org/en/users/Drivers/wil6210
  F:    drivers/net/wireless/ath/wil6210/
 +F:    include/uapi/linux/wil6210_uapi.h
  
  CARL9170 LINUX COMMUNITY WIRELESS DRIVER
  M:    Christian Lamparter <[email protected]>
@@@ -2045,7 -2010,6 +2045,7 @@@ F:      drivers/net/ethernet/broadcom/bnx2x
  BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
  M:    Christian Daudt <[email protected]>
  M:    Matt Porter <[email protected]>
 +M:    Florian Fainelli <[email protected]>
  L:    [email protected]
  T:    git git://github.com/broadcom/mach-bcm
  S:    Maintained
@@@ -2075,14 -2039,6 +2075,14 @@@ F:    arch/arm/mach-bcm/bcm_5301x.
  F:    arch/arm/boot/dts/bcm5301x.dtsi
  F:    arch/arm/boot/dts/bcm470*
  
 +BROADCOM BCM63XX ARM ARCHITECTURE
 +M:    Florian Fainelli <[email protected]>
 +L:    [email protected]
 +T:    git git://git.github.com/brcm/linux.git
 +S:    Maintained
 +F:    arch/arm/mach-bcm/bcm63xx.c
 +F:    arch/arm/include/debug/bcm63xx.S
 +
  BROADCOM BCM7XXX ARM ARCHITECTURE
  M:    Marc Carino <[email protected]>
  M:    Brian Norris <[email protected]>
@@@ -2898,7 -2854,6 +2898,7 @@@ F:      drivers/platform/x86/dell-wmi.
  DESIGNWARE USB2 DRD IP DRIVER
  M:    Paul Zimmerman <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/dwc2/
  
@@@ -2910,13 -2865,6 +2910,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/usb/dwc3/
  
 +DEVICE COREDUMP (DEV_COREDUMP)
 +M:    Johannes Berg <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/base/devcoredump.c
 +F:    include/linux/devcoredump.h
 +
  DEVICE FREQUENCY (DEVFREQ)
  M:    MyungJoo Ham <[email protected]>
  M:    Kyungmin Park <[email protected]>
@@@ -3047,11 -2995,13 +3047,11 @@@ T:   git git://git.linaro.org/people/sumi
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
 -S:    Supported
 +S:    Maintained
  F:    drivers/dma/
  F:    include/linux/dma*
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git
  T:    git git://git.infradead.org/users/vkoul/slave-dma.git (slave-dma)
  
  DME1737 HARDWARE MONITOR DRIVER
@@@ -3075,7 -3025,6 +3075,7 @@@ F:      Documentation
  X:    Documentation/ABI/
  X:    Documentation/devicetree/
  X:    Documentation/[a-z][a-z]_[A-Z][A-Z]/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc.git
  
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <[email protected]>
@@@ -3607,11 -3556,6 +3607,11 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    drivers/video/fbdev/s1d13xxxfb.c
  F:    include/video/s1d13xxxfb.h
  
 +ET131X NETWORK DRIVER
 +M:    Mark Einon <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/net/ethernet/agere/
 +
  ETHERNET BRIDGE
  M:    Stephen Hemminger <[email protected]>
  L:    [email protected]
@@@ -4233,6 -4177,16 +4233,16 @@@ L:    [email protected]
  S:    Odd Fixes
  F:    drivers/tty/hvc/
  
+ HACKRF MEDIA DRIVER
+ M:    Antti Palosaari <[email protected]>
+ L:    [email protected]
+ W:    http://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/media/usb/hackrf/
+ 
  HARDWARE MONITORING
  M:    Jean Delvare <[email protected]>
  M:    Guenter Roeck <[email protected]>
@@@ -4657,14 -4611,13 +4667,14 @@@ F:   drivers/idle/i7300_idle.
  
  IEEE 802.15.4 SUBSYSTEM
  M:    Alexander Aring <[email protected]>
 -L:    linux-[email protected] (moderated for non-subscribers)
 -W:    http://apps.sourceforge.net/trac/linux-zigbee
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
 +L:    linux-[email protected]
 +W:    https://github.com/linux-wpan
 +T:    git git://github.com/linux-wpan/linux-wpan-next.git
  S:    Maintained
  F:    net/ieee802154/
  F:    net/mac802154/
  F:    drivers/net/ieee802154/
 +F:    Documentation/networking/ieee802154.txt
  
  IGUANAWORKS USB IR TRANSCEIVER
  M:    Sean Young <[email protected]>
@@@ -4674,9 -4627,6 +4684,9 @@@ F:      drivers/media/rc/iguanair.
  
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <[email protected]>
 +R:    Hartmut Knaack <[email protected]>
 +R:    Lars-Peter Clausen <[email protected]>
 +R:    Peter Meerwald <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/iio/
@@@ -4814,8 -4764,8 +4824,8 @@@ F:      arch/x86/kernel/cpu/microcode/core
  F:    arch/x86/kernel/cpu/microcode/intel*
  
  INTEL I/OAT DMA DRIVER
 -M:    Dan Williams <[email protected]>
  M:    Dave Jiang <[email protected]>
 +R:    Dan Williams <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  S:    Supported
@@@ -4830,12 -4780,12 +4840,12 @@@ F:   drivers/iommu/intel-iommu.
  F:    include/linux/intel-iommu.h
  
  INTEL IOP-ADMA DMA DRIVER
 -M:    Dan Williams <[email protected]>
 +R:    Dan Williams <[email protected]>
  S:    Odd fixes
  F:    drivers/dma/iop-adma.c
  
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 -M:    Krzysztof Halasa <kh[email protected].pl>
 +M:    Krzysztof Halasa <khalasa@piap.pl>
  S:    Maintained
  F:    arch/arm/mach-ixp4xx/include/mach/qmgr.h
  F:    arch/arm/mach-ixp4xx/include/mach/npe.h
@@@ -4849,14 -4799,14 +4859,14 @@@ M:   Deepak Saxena <[email protected]
  S:    Maintained
  F:    drivers/char/hw_random/ixp4xx-rng.c
  
 -INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)
 +INTEL ETHERNET DRIVERS (e100/e1000/e1000e/fm10k/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)
  M:    Jeff Kirsher <[email protected]>
  M:    Jesse Brandeburg <[email protected]>
  M:    Bruce Allan <[email protected]>
  M:    Carolyn Wyborny <[email protected]>
  M:    Don Skidmore <[email protected]>
  M:    Greg Rose <[email protected]>
 -M:    Alex Duyck <alexander.h.duy[email protected]>
 +M:    Matthew Vick <matthew.vi[email protected]>
  M:    John Ronciak <[email protected]>
  M:    Mitch Williams <[email protected]>
  M:    Linux NICS <[email protected]>
@@@ -5045,7 -4995,6 +5055,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  T:    git git://git.infradead.org/users/jcooper/linux.git irqchip/core
 +F:    Documentation/devicetree/bindings/interrupt-controller/
  F:    drivers/irqchip/
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
@@@ -5131,7 -5080,7 +5141,7 @@@ 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/media/tuners/tuner_it913x*
+ F:    drivers/media/tuners/it913x*
  
  IVTV VIDEO4LINUX DRIVER
  M:    Andy Walls <[email protected]>
@@@ -6438,7 -6387,7 +6448,7 @@@ M:      Lauro Ramos Venancio <lauro.venancio
  M:    Aloisio Almeida Jr <[email protected]>
  M:    Samuel Ortiz <[email protected]>
  L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (subscribers-only)
  S:    Supported
  F:    net/nfc/
  F:    include/net/nfc/
@@@ -6939,14 -6888,6 +6949,14 @@@ F:    include/linux/pci
  F:    arch/x86/pci/
  F:    arch/x86/kernel/quirks.c
  
 +PCI DRIVER FOR APPLIEDMICRO XGENE
 +M:    Tanmay Inamdar <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/xgene-pci.txt
 +F:    drivers/pci/host/pci-xgene.c
 +
  PCI DRIVER FOR IMX6
  M:    Richard Zhu <[email protected]>
  M:    Lucas Stach <[email protected]>
@@@ -6955,13 -6896,6 +6965,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/pci/host/*imx6*
  
 +PCI DRIVER FOR TI KEYSTONE
 +M:    Murali Karicheri <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/pci/host/*keystone*
 +
  PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
  M:    Thomas Petazzoni <[email protected]>
  M:    Jason Cooper <[email protected]>
@@@ -7364,14 -7298,6 +7374,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/pwc/*
  
 +PWM FAN DRIVER
 +M:    Kamil Debski <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/hwmon/pwm-fan.txt
 +F:    Documentation/hwmon/pwm-fan
 +F:    drivers/hwmon/pwm-fan.c
 +
  PWM SUBSYSTEM
  M:    Thierry Reding <[email protected]>
  L:    [email protected]
@@@ -7385,12 -7311,12 +7395,12 @@@ F:   drivers/video/backlight/pwm_bl.
  F:    include/linux/pwm_backlight.h
  
  PXA2xx/PXA3xx SUPPORT
 -M:    Eric Miao <[email protected]>
 -M:    Russell King <[email protected]>
 +M:    Daniel Mack <[email protected]>
  M:    Haojian Zhuang <[email protected]>
 +M:    Robert Jarzmik <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://github.com/hzhuang1/linux.git
 -T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
 +T:    git git://github.com/rjarzmik/linux.git
  S:    Maintained
  F:    arch/arm/mach-pxa/
  F:    drivers/pcmcia/pxa2xx*
@@@ -7467,15 -7393,15 +7477,15 @@@ F:   drivers/net/ethernet/qlogic/qla3xxx.
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
  M:    Shahed Shaikh <[email protected]>
 -M:    Dept-HSG[email protected]
 +M:    Dept-GE[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlcnic/
  
  QLOGIC QLGE 10Gb ETHERNET DRIVER
 -M:    Shahed Shaikh <shahed.shaikh@qlogic.com>
 -M:    Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
 -M:    Ron Mercer <[email protected]>
 +M:    Harish Patil <harish.patil@qlogic.com>
 +M:    Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
 +M:    [email protected]
  M:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -7578,12 -7504,13 +7588,12 @@@ F:   drivers/video/fbdev/aty/aty128fb.
  
  RALINK RT2X00 WIRELESS LAN DRIVER
  P:    rt2x00 project
 -M:    Ivo van Doorn <IvDoorn@gmail.com>
 +M:    Stanislaw Gruszka <sgruszka@redhat.com>
  M:    Helmut Schaa <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://rt2x00.serialmonkey.com/
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git
  F:    drivers/net/wireless/rt2x00/
  
  RAMDISK RAM BLOCK DEVICE DRIVER
@@@ -7685,7 -7612,6 +7695,7 @@@ F:      fs/reiserfs
  
  REGISTER MAP ABSTRACTION
  M:    Mark Brown <[email protected]>
 +L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
  S:    Supported
  F:    drivers/base/regmap/
@@@ -8498,11 -8424,11 +8508,11 @@@ S:   Maintaine
  F:    Documentation/security/Smack.txt
  F:    security/smack/
  
 -SMARTREFLEX DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
 +DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
  M:    Kevin Hilman <[email protected]>
  M:    Nishanth Menon <[email protected]>
  S:    Maintained
 -F:    drivers/power/avs/smartreflex.c
 +F:    drivers/power/avs/
  F:    include/linux/power/smartreflex.h
  L:    [email protected]
  
@@@ -8672,6 -8598,14 +8682,14 @@@ F:    include/sound/dmaengine_pcm.
  F:    sound/core/pcm_dmaengine.c
  F:    sound/soc/soc-generic-dmaengine-pcm.c
  
+ SP2 MEDIA DRIVER
+ M:    Olli Salonen <[email protected]>
+ L:    [email protected]
+ W:    http://linuxtv.org/
+ Q:    http://patchwork.linuxtv.org/project/linux-media/list/
+ S:    Maintained
+ F:    drivers/media/dvb-frontends/sp2*
+ 
  SPARC + UltraSPARC (sparc/sparc64)
  M:    "David S. Miller" <[email protected]>
  L:    [email protected]
@@@ -8783,6 -8717,11 +8801,6 @@@ M:     H Hartley Sweeten <hsweeten@visionen
  S:    Odd Fixes
  F:    drivers/staging/comedi/
  
 -STAGING - ET131X NETWORK DRIVER
 -M:    Mark Einon <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/et131x/
 -
  STAGING - FLARION FT1000 DRIVERS
  M:    Marek Belisko <[email protected]>
  S:    Odd Fixes
@@@ -8800,14 -8739,6 +8818,14 @@@ W:    http://www.lirc.org
  S:    Odd Fixes
  F:    drivers/staging/media/lirc/
  
 +STAGING - LUSTRE PARALLEL FILESYSTEM
 +M:    Oleg Drokin <[email protected]>
 +M:    Andreas Dilger <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +W:    http://lustre.opensfs.org/
 +S:    Maintained
 +F:    drivers/staging/lustre
 +
  STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
  M:    Julian Andres Klode <[email protected]>
  M:    Marc Dietrich <[email protected]>
@@@ -9101,13 -9032,17 +9119,13 @@@ F:   drivers/media/rc/ttusbir.
  TEGRA ARCHITECTURE SUPPORT
  M:    Stephen Warren <[email protected]>
  M:    Thierry Reding <[email protected]>
 +M:    Alexandre Courbot <[email protected]>
  L:    [email protected]
  Q:    http://patchwork.ozlabs.org/project/linux-tegra/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
  S:    Supported
  N:    [^a-z]tegra
  
 -TEGRA ASOC DRIVER
 -M:    Stephen Warren <[email protected]>
 -S:    Supported
 -F:    sound/soc/tegra/
 -
  TEGRA CLOCK DRIVER
  M:    Peter De Schrijver <[email protected]>
  M:    Prashant Gaikwad <[email protected]>
@@@ -9119,6 -9054,11 +9137,6 @@@ M:     Laxman Dewangan <[email protected]
  S:    Supported
  F:    drivers/dma/tegra20-apb-dma.c
  
 -TEGRA GPIO DRIVER
 -M:    Stephen Warren <[email protected]>
 -S:    Supported
 -F:    drivers/gpio/gpio-tegra.c
 -
  TEGRA I2C DRIVER
  M:    Laxman Dewangan <[email protected]>
  S:    Supported
@@@ -9135,6 -9075,11 +9153,6 @@@ M:     Laxman Dewangan <[email protected]
  S:    Supported
  F:    drivers/input/keyboard/tegra-kbc.c
  
 -TEGRA PINCTRL DRIVER
 -M:    Stephen Warren <[email protected]>
 -S:    Supported
 -F:    drivers/pinctrl/pinctrl-tegra*
 -
  TEGRA PWM DRIVER
  M:    Thierry Reding <[email protected]>
  S:    Supported
@@@ -9225,15 -9170,6 +9243,15 @@@ F:    drivers/misc/tifm
  F:    drivers/mmc/host/tifm_sd.c
  F:    include/linux/tifm.h
  
 +TI KEYSTONE MULTICORE NAVIGATOR DRIVERS
 +M:    Santosh Shilimkar <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/soc/ti/*
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
 +
 +
  TI LM49xxx FAMILY ASoC CODEC DRIVERS
  M:    M R Swami Reddy <[email protected]>
  M:    Vishwas A Deshpande <[email protected]>
@@@ -9375,6 -9311,14 +9393,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Odd fixes
  F:    drivers/media/usb/tm6000/
  
+ TW68 VIDEO4LINUX DRIVER
+ M:    Hans Verkuil <[email protected]>
+ L:    [email protected]
+ T:    git git://linuxtv.org/media_tree.git
+ W:    http://linuxtv.org
+ S:    Odd Fixes
+ F:    drivers/media/pci/tw68/
+ 
  TPM DEVICE DRIVER
  M:    Peter Huewe <[email protected]>
  M:    Ashley Lai <[email protected]>
@@@ -9769,7 -9713,7 +9795,7 @@@ USB WEBCAM GADGE
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/usb/gadget/function/*uvc*.c
 +F:    drivers/usb/gadget/function/*uvc*
  F:    drivers/usb/gadget/legacy/webcam.c
  
  USB WIRELESS RNDIS DRIVER (rndis_wlan)
@@@ -9983,7 -9927,6 +10009,7 @@@ F:     drivers/scsi/vmw_pvscsi.
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <[email protected]>
  M:    Mark Brown <[email protected]>
 +L:    [email protected]
  W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
@@@ -10277,12 -10220,6 +10303,12 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/tty/serial/uartlite.c
  
 +XILLYBUS DRIVER
 +M:    Eli Billauer <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/char/xillybus/
 +
  XTENSA XTFPGA PLATFORM SUPPORT
  M:    Max Filippov <[email protected]>
  L:    [email protected]

diff --combined drivers/media/dvb-frontends/cxd2820r_core.c
index 51ef893126151071c511cd7f9e77242507f6065b,cd2af3edbd043fb273ee076b37f204e60f33ebd4..422e84bbb008ffe685fb149f529c27ce4957cc70
--- 1/drivers/media/dvb-frontends/cxd2820r_core.c
--- 2/drivers/media/dvb-frontends/cxd2820r_core.c
+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
@@@ -564,10 -564,10 +564,10 @@@ static enum dvbfe_search cxd2820r_searc
  
        /* check if we have a valid signal */
        if (status & FE_HAS_LOCK) {
-               priv->last_tune_failed = 0;
+               priv->last_tune_failed = false;
                return DVBFE_ALGO_SEARCH_SUCCESS;
        } else {
-               priv->last_tune_failed = 1;
+               priv->last_tune_failed = true;
                return DVBFE_ALGO_SEARCH_AGAIN;
        }
  
@@@ -584,14 -584,18 +584,14 @@@ static int cxd2820r_get_frontend_algo(s
  static void cxd2820r_release(struct dvb_frontend *fe)
  {
        struct cxd2820r_priv *priv = fe->demodulator_priv;
 -      int uninitialized_var(ret); /* silence compiler warning */
  
        dev_dbg(&priv->i2c->dev, "%s\n", __func__);
  
  #ifdef CONFIG_GPIOLIB
        /* remove GPIOs */
 -      if (priv->gpio_chip.label) {
 -              ret = gpiochip_remove(&priv->gpio_chip);
 -              if (ret)
 -                      dev_err(&priv->i2c->dev, "%s: gpiochip_remove() " \
 -                                      "failed=%d\n", KBUILD_MODNAME, ret);
 -      }
 +      if (priv->gpio_chip.label)
 +              gpiochip_remove(&priv->gpio_chip);
 +
  #endif
        kfree(priv);
        return;

diff --combined drivers/staging/media/lirc/lirc_imon.c
index 726cc3a31856673952525e0343fa0be95d7f41ec,5441f40cf5a1b7246ead3e2af7f1aef693a0fabd..7aca44f28c5ad54087b9a6fdd2dbe0fc6ff1bb20
--- 1/drivers/staging/media/lirc/lirc_imon.c
--- 2/drivers/staging/media/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
@@@ -414,6 -414,7 +414,7 @@@ 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;
        }
  
@@@ -489,6 -490,7 +490,6 @@@ static void usb_tx_callback(struct urb 
   */
  static int ir_open(void *data)
  {
 -      int retval = 0;
        struct imon_context *context;
  
        /* prevent races with disconnect */
@@@ -505,7 -507,7 +506,7 @@@
        dev_info(context->driver->dev, "IR port opened\n");
  
        mutex_unlock(&driver_lock);
 -      return retval;
 +      return 0;
  }
  
  /**
@@@ -614,8 -616,8 +615,8 @@@ static void imon_incoming_packet(struc
                return;
  
        if (len != 8) {
 -              dev_warn(dev, "imon %s: invalid incoming packet "
 -                       "size (len = %d, intf%d)\n", __func__, len, intf);
 +              dev_warn(dev, "imon %s: invalid incoming packet size (len = %d, intf%d)\n",
 +                      __func__, len, intf);
                return;
        }
  
@@@ -924,8 -926,9 +925,8 @@@ static int imon_probe(struct usb_interf
                }
        }
  
 -      dev_info(dev, "iMON device (%04x:%04x, intf%d) on "
 -               "usb<%d:%d> initialized\n", vendor, product, ifnum,
 -               usbdev->bus->busnum, usbdev->devnum);
 +      dev_info(dev, "iMON device (%04x:%04x, intf%d) on usb<%d:%d> initialized\n",
 +              vendor, product, ifnum, usbdev->bus->busnum, usbdev->devnum);
  
  unlock:
        mutex_unlock(&context->ctx_lock);
@@@ -1019,6 -1022,7 +1020,6 @@@ static int imon_suspend(struct usb_inte
  
  static int imon_resume(struct usb_interface *intf)
  {
 -      int rc = 0;
        struct imon_context *context = usb_get_intfdata(intf);
  
        usb_fill_int_urb(context->rx_urb, context->usbdev,
@@@ -1028,7 -1032,9 +1029,7 @@@
                usb_rx_callback, context,
                context->rx_endpoint->bInterval);
  
 -      rc = usb_submit_urb(context->rx_urb, GFP_ATOMIC);
 -
 -      return rc;
 +      return usb_submit_urb(context->rx_urb, GFP_ATOMIC);
  }
  
  module_usb_driver(imon_driver);

diff --combined drivers/staging/media/lirc/lirc_sasem.c
index 86ad811fda24c1723e91ad816e97d4ca761c3f32,c32e2965da875ad9fa3e4b88dd8054892359d12e..c20ef56202bf05ab9c8c72860c01f08ef813beeb
--- 1/drivers/staging/media/lirc/lirc_sasem.c
--- 2/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@@ -392,6 -392,7 +392,7 @@@ static ssize_t vfd_write(struct file *f
        data_buf = memdup_user((void const __user *)buf, n_bytes);
        if (IS_ERR(data_buf)) {
                retval = PTR_ERR(data_buf);
+               data_buf = NULL;
                goto exit;
        }
  
@@@ -474,6 -475,8 +475,6 @@@ static void usb_tx_callback(struct urb 
        /* notify waiters that write has finished */
        atomic_set(&context->tx.busy, 0);
        complete(&context->tx.finished);
 -
 -      return;
  }
  
  /**
@@@ -560,6 -563,7 +561,6 @@@ static void ir_close(void *data
        }
  
        mutex_unlock(&context->ctx_lock);
 -      return;
  }
  
  /**
@@@ -661,6 -665,7 +662,6 @@@ static void usb_rx_callback(struct urb 
        }
  
        usb_submit_urb(context->rx_urb, GFP_ATOMIC);
 -      return;
  }
  
  
@@@ -709,7 -714,6 +710,7 @@@ static int sasem_probe(struct usb_inter
                struct usb_endpoint_descriptor *ep;
                int ep_dir;
                int ep_type;
 +
                ep = &iface_desc->endpoint [i].desc;
                ep_dir = ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK;
                ep_type = ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;

diff --combined include/uapi/linux/Kbuild
index 70e150ebc6c9392f4d49aa3744925a82af2561c5,0234cdfad02351ef20bcd66cac0d0a8752019297..3cc8e1c2b99602fdfbaf24d34612613fcc073149
--- 1/include/uapi/linux/Kbuild
--- 2/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@@ -67,7 -67,6 +67,7 @@@ header-y += bfs_fs.
  header-y += binfmts.h
  header-y += blkpg.h
  header-y += blktrace_api.h
 +header-y += bpf.h
  header-y += bpqether.h
  header-y += bsg.h
  header-y += btrfs.h
@@@ -355,6 -354,7 +355,7 @@@ header-y += serio.
  header-y += shm.h
  header-y += signal.h
  header-y += signalfd.h
+ header-y += smiapp.h
  header-y += snmp.h
  header-y += sock_diag.h
  header-y += socket.h