]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 99207b8 1d2f1e0)
Merge tag 'iio-for-4.4a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...
authorGreg Kroah-Hartman <[email protected]>
Wed, 30 Sep 2015 01:37:48 +0000 (03:37 +0200)
committerGreg Kroah-Hartman <[email protected]>
Wed, 30 Sep 2015 01:37:48 +0000 (03:37 +0200)
Jonathan writes:

First round of new driver, new functionality and cleanups for IIO in the 4.4 cycle

New device support
* APDS9960 ALS + proximity driver
* bmg160 SPI devices.
* HDC100x humidity sensors
* Holt HI-8435 threshold detector
* mma8453Q accelerometer added to the mma8452 driver
* mma86452FC and mma8653FC accelerometers added to the mma8452 driver
* mxc4005 accelerometer
* PulsedLight LIDAR
* SensorTech VZ89x volatile organic compound sensor
* UPISEMI uS5182d ALS and proximity sensors

New core functionality
* triggered events - use triggers to check for changes in threshold type
  detectors on devices with out interrupt support.  First user is the holt
  comparator.
* chemical concentration and resistance channel types.

New driver functionality
* vf610
  - buffer support.
  - followup coccinelle warning fix.

Core rework
* buffers
  - break out callback buffer to own module.
  - move buffer implementations to a new subdirectory
* percolate the error code form iio_event_getfd out to userspace
  rather than giving a missleading error later on.

Cleanups
* adddac drivers
  - use BIT macro where appropriate.
* meter drivers
  - use BIT macro where appropriate.

* ad7303
 - add an OF match table to line up with the binding docs.
* adc128s052
  - add an OF match table to line up with the binding docs.
* adf4350
  - add an OF match table to line up with the binding docs
* as3935
  - add an OF match table to line up with the binding docs.
* berlin2-adc
  - use GENMASK and BIT for masks
  - prevent attempting to sample multiple channels at once by moving a
    mutex scop
  - coding style cleanups
* bmg150_magn
  - kconfig sort order was wrong - fix it.
* bmg160
  - use i2c regmap and drop all uses of i2c_client
  - separate i2c and core driver
* cc10001_adc
  - kconfig sort order was wrong - fix it.
* evgen (dummy driver helper module)
  - move interrupt generation to irq_work to reduce differences between
    the dummy driver and real hardware drivers.
* hmc5843
  - set the name dynamically rather than to a fixed value for one of the
    suported parts.
  - export module alias information to allow autoprobing of module.
* lpc32xx
  - on failure to get resource or irq return -ENXIO as uppose to -EBUSY
* max1027
  - set .of_match_table to actually allow OF style matching.
* max5821
  - add MODULE_DEVICE_TABLE for OF table.
* mma8452
  - refactor to separate out chip specific data.
  - add freefall / motion interrupt source for devices that do their
    interrupts slightly differently.
  - update copywrite notice.
  - leave naming of events directory in sysfs to the core
* mcp320x
  - set .of_match_table so that it can be use for OF style matching.
* mlx90614
  - Implement filter configuration (note the datasheet changed as a result
    of the driver reviews to include the values we needed ;)
* opt3001
  - drop .owner field as assigned by platform driver core.
* si7020
  - replace a bitmask on the humidity values with a more correct range
    check.
* stk310
  - improved error handling.
  - use BIT macro where appropriate and use the resulting defines
    instead of magic numbers in the code.
  - fix indentation
* st-sensors
  - add debugfs register read hook
* tsl4531
  - fix error handling in check_id
* twl6030
  - fix module autoload for OF
* iio-trig-sysfs
  - document add and remove attribute
* trigger in staging
  - code alignment fixes.
  - braces on both branches of if statement if needed for one.
* xilinx-xadc
  - push interrupts into hardirq context as there isn't much in them
    any more and it avoids breaking PREEMPT_RT builds due to the use
    of a spinlock between the hardirq and the thread.

Tools
* event-monitor
  - report unsupported events.  We keep expanding what can come from drivers
    so give a helpful error if one turns up in an out of date userspace
    program.
* generic-buffer
  - helpful message about needing to enable a channel to start the buffer.

1  2 
Documentation/devicetree/bindings/i2c/trivial-devices.txt patch | diff1 | diff2 | blob | history
Documentation/devicetree/bindings/vendor-prefixes.txt patch | diff1 | diff2 | blob | history
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/iio/light/stk3310.c patch | diff1 | diff2 | blob | history

diff --combined Documentation/devicetree/bindings/i2c/trivial-devices.txt
index d77d412cbc685f5796d0ff6820a34970570cce95,ed7ef4684aa30cf395ea537275cdffc37abcc005..c50cf13c852e518cff4664370eb1a72947e9cca7
--- 1/Documentation/devicetree/bindings/i2c/trivial-devices.txt
--- 2/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@@ -54,7 -54,6 +54,6 @@@ epson,rx8581          I2C-BUS INTERFACE REAL TI
  fsl,mag3110           MAG3110: Xtrinsic High Accuracy, 3D Magnetometer
  fsl,mc13892           MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51
  fsl,mma8450           MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer
- fsl,mma8452           MMA8452Q: 3-axis 12-bit / 8-bit Digital Accelerometer
  fsl,mpr121            MPR121: Proximity Capacitive Touch Sensor Controller
  fsl,sgtl5000          SGTL5000: Ultra Low-Power Audio Codec
  gmt,g751              G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface
@@@ -80,6 -79,7 +79,7 @@@ oki,ml86v7667         OKI ML86V7667 video deco
  ovti,ov5642           OV5642: Color CMOS QSXGA (5-megapixel) Image Sensor with OmniBSI and Embedded TrueFocus
  pericom,pt7c4338      Real-time Clock Module
  plx,pex8648           48-Lane, 12-Port PCI Express Gen 2 (5.0 GT/s) Switch
+ pulsedlight,lidar-lite-v2     Pulsedlight LIDAR range-finding sensor
  ramtron,24c64         i2c serial eeprom  (24cxx)
  ricoh,r2025sd         I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
  ricoh,r2221tl         I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
@@@ -88,6 -88,7 +88,7 @@@ ricoh,rs5c372b                I2C bus SERIAL INTERFAC
  ricoh,rv5c386         I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
  ricoh,rv5c387a                I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
  samsung,24ad0xd1      S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)
+ sgx,vz89x             SGX Sensortech VZ89X Sensors
  sii,s35390a           2-wire CMOS real-time clock
  skyworks,sky81452     Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply
  st-micro,24c256               i2c serial eeprom  (24cxx)
@@@ -95,8 -96,6 +96,8 @@@ stm,m41t00            Serial Access TIMEKEEPE
  stm,m41t62            Serial real-time clock (RTC) with alarm
  stm,m41t80            M41T80 - SERIAL ACCESS RTC WITH ALARMS
  taos,tsl2550          Ambient Light Sensor with SMBUS/Two Wire Serial Interface
 +ti,ads7828            8-Channels, 12-bit ADC
 +ti,ads7830            8-Channels, 8-bit ADC
  ti,tsc2003            I2C Touch-Screen Controller
  ti,tmp102             Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface
  ti,tmp103             Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface
diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index 82d2ac97af74b2a8e5569576cf92f15f1236c036,f2b1d6fe0329541491650f3c9a8522fbbaa3d449..13e54a0e78b9b50878226a479693d3f37863ea16
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -46,7 -46,6 +46,7 @@@ chipone               ChipOn
  chipspark     ChipSPARK
  chrp  Common Hardware Reference Platform
  chunghwa      Chunghwa Picture Tubes Ltd.
 +ciaa  Computadora Industrial Abierta Argentina
  cirrus        Cirrus Logic, Inc.
  cloudengines  Cloud Engines, Inc.
  cnm   Chips&Media, Inc.
@@@ -55,7 -54,6 +55,7 @@@ cortina       Cortina Systems, Inc
  cosmic        Cosmic Circuits
  crystalfontz  Crystalfontz America, Inc.
  cubietech     Cubietech, Ltd.
 +cypress       Cypress Semiconductor Corporation
  dallas        Maxim Integrated Products (formerly Dallas Semiconductor)
  davicom       DAVICOM Semiconductor, Inc.
  delta Delta Electronics, Inc.
@@@ -101,6 -99,7 +101,7 @@@ himax       Himax Technologies, Inc
  hisilicon     Hisilicon Limited.
  hit   Hitachi Ltd.
  hitex Hitex Development Tools
+ holt  Holt Integrated Circuits, Inc.
  honeywell     Honeywell
  hp    Hewlett Packard
  i2se  I2SE GmbH
@@@ -112,10 -111,8 +113,10 @@@ ingenic  Ingenic Semiconducto
  innolux       Innolux Corporation
  intel Intel Corporation
  intercontrol  Inter Control Group
 +invensense    InvenSense Inc.
  isee  ISEE 2007 S.L.
  isil  Intersil
 +jedec JEDEC Solid State Technology Association
  karo  Ka-Ro electronics GmbH
  keymile       Keymile GmbH
  kinetic Kinetic Technologies
@@@ -139,27 -136,21 +140,27 @@@ mitsubishi      Mitsubishi Electric Corporat
  mosaixtech    Mosaix Technologies, Inc.
  moxa  Moxa
  mpl   MPL AG
 +msi   Micro-Star International Co. Ltd.
  mti   Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
  mundoreader   Mundo Reader S.L.
  murata        Murata Manufacturing Co., Ltd.
  mxicy Macronix International Co., Ltd.
  national      National Semiconductor
 +nec   NEC LCD Technologies, Ltd.
  neonode               Neonode Inc.
  netgear       NETGEAR
  netlogic      Broadcom Corporation (formerly NetLogic Microsystems)
 +netxeon               Shenzhen Netxeon Technology CO., LTD
  newhaven      Newhaven Display International
  nintendo      Nintendo
  nokia Nokia
 +nuvoton       Nuvoton Technology Corporation
  nvidia        NVIDIA
  nxp   NXP Semiconductors
 +okaya Okaya Electric America, Inc.
  onnn  ON Semiconductor Corp.
  opencores     OpenCores.org
 +option        Option NV
  ortustech     Ortus Technology Co., Ltd.
  ovti  OmniVision Technologies
  panasonic     Panasonic Corporation
@@@ -169,6 -160,7 +170,7 @@@ phytec     PHYTEC Messtechnik Gmb
  picochip      Picochip Ltd
  plathome      Plat'Home Co., Ltd.
  pixcir  PIXCIR MICROELECTRONICS Co., Ltd
+ pulsedlight   PulsedLight, Inc
  powervr       PowerVR (deprecated, use img)
  qca   Qualcomm Atheros, Inc.
  qcom  Qualcomm Technologies, Inc
@@@ -191,7 -183,7 +193,8 @@@ sbs        Smart Battery Syste
  schindler     Schindler
  seagate       Seagate Technology PLC
  semtech       Semtech Corporation
+ sgx   SGX Sensortech
 +sharp Sharp Corporation
  sil   Silicon Image
  silabs        Silicon Laboratories
  siliconmitus  Silicon Mitus, Inc.
@@@ -203,7 -195,6 +206,7 @@@ sitronix   Sitronix Technology Corporatio
  skyworks      Skyworks Solutions, Inc.
  smsc  Standard Microsystems Corporation
  snps  Synopsys, Inc.
 +socionext     Socionext Inc.
  solidrun      SolidRun
  solomon        Solomon Systech Limited
  sony  Sony Corporation
@@@ -223,6 -214,7 +226,7 @@@ toshiba    Toshiba Corporatio
  toumaz        Toumaz
  tplink        TP-LINK Technologies Co., Ltd.
  truly Truly Semiconductors Limited
+ upisemi       uPI Semiconductor Corp.
  usi   Universal Scientific Industrial Co., Ltd.
  v3    V3 Semiconductor
  variscite     Variscite Ltd.
diff --combined MAINTAINERS
index 7b181d561bb3ccd70c649d0547bef9e55e75e1c7,d8bf36d418dfb4bd8389bbb775ce584a5c02ebd2..6d7af82cb09ce586c380eb82fd4453dac9143274
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -158,7 -158,6 +158,7 @@@ L: [email protected]
  S:    Maintained
  F:    net/6lowpan/
  F:    include/net/6lowpan.h
 +F:    Documentation/networking/6lowpan.txt
  
  6PACK NETWORK DRIVER FOR AX.25
  M:    Andreas Koensgen <[email protected]>
@@@ -362,7 -361,7 +362,7 @@@ S: Supporte
  F:    drivers/input/touchscreen/ad7879.c
  
  ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR)
 -M:    Jiri Kosina <j[email protected]>
 +M:    Jiri Kosina <j[email protected]>
  S:    Maintained
  
  ADM1025 HARDWARE MONITOR DRIVER
@@@ -557,12 -556,6 +557,12 @@@ S:       Maintaine
  F:    Documentation/i2c/busses/i2c-ali1563
  F:    drivers/i2c/busses/i2c-ali1563.c
  
 +ALLWINNER SECURITY SYSTEM
 +M:    Corentin Labbe <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/crypto/sunxi-ss/
 +
  ALPHA PORT
  M:    Richard Henderson <[email protected]>
  M:    Ivan Kokshaysky <[email protected]>
@@@ -615,8 -608,9 +615,8 @@@ F: Documentation/hwmon/fam15h_powe
  F:    drivers/hwmon/fam15h_power.c
  
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 -M:    Thomas Dahlmann <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Orphan
  F:    drivers/usb/gadget/udc/amd5536udc.*
  
  AMD GEODE PROCESSOR/CHIPSET SUPPORT
@@@ -642,14 -636,9 +642,14 @@@ M:       Oded Gabbay <[email protected]
  L:    [email protected]
  T:    git git://people.freedesktop.org/~gabbayo/linux.git
  S:    Supported
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
  F:    drivers/gpu/drm/amd/amdkfd/
  F:    drivers/gpu/drm/amd/include/cik_structs.h
  F:    drivers/gpu/drm/amd/include/kgd_kfd_interface.h
 +F:    drivers/gpu/drm/amd/include/vi_structs.h
  F:    drivers/gpu/drm/radeon/radeon_kfd.c
  F:    drivers/gpu/drm/radeon/radeon_kfd.h
  F:    include/uapi/linux/kfd_ioctl.h
@@@ -739,12 -728,6 +739,12 @@@ X:       drivers/iio/*/adjd
  F:    drivers/staging/iio/*/ad*
  F:    staging/iio/trigger/iio-trig-bfin-timer.c
  
 +ANALOG DEVICES INC DMA DRIVERS
 +M:    Lars-Peter Clausen <[email protected]>
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/dma/dma-axi-dmac.c
 +
  ANDROID DRIVERS
  M:    Greg Kroah-Hartman <[email protected]>
  M:    Arve Hjønnevåg <[email protected]>
@@@ -763,7 -746,7 +763,7 @@@ S: Maintaine
  F:    sound/aoa/
  
  APM DRIVER
 -M:    Jiri Kosina <j[email protected]>
 +M:    Jiri Kosina <j[email protected]>
  S:    Odd fixes
  F:    arch/x86/kernel/apm_32.c
  F:    include/linux/apm_bios.h
@@@ -807,13 -790,6 +807,13 @@@ S:       Maintaine
  F:    drivers/video/fbdev/arcfb.c
  F:    drivers/video/fbdev/core/fb_defio.c
  
 +ARCNET NETWORK LAYER
 +M:    Michael Grzeschik <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/arcnet/
 +F:    include/uapi/linux/if_arcnet.h
 +
  ARM MFM AND FLOPPY DRIVERS
  M:    Ian Molton <[email protected]>
  S:    Maintained
@@@ -823,13 -799,11 +823,13 @@@ F:      arch/arm/include/asm/floppy.
  ARM PMU PROFILING AND DEBUGGING
  M:    Will Deacon <[email protected]>
  S:    Maintained
 -F:    arch/arm/kernel/perf_event*
 +F:    arch/arm/kernel/perf_*
  F:    arch/arm/oprofile/common.c
 -F:    arch/arm/include/asm/pmu.h
  F:    arch/arm/kernel/hw_breakpoint.c
  F:    arch/arm/include/asm/hw_breakpoint.h
 +F:    arch/arm/include/asm/perf_event.h
 +F:    drivers/perf/arm_pmu.c
 +F:    include/linux/perf/arm_pmu.h
  
  ARM PORT
  M:    Russell King <[email protected]>
@@@ -953,7 -927,7 +953,7 @@@ M: Sunil Goutham <[email protected]
  M:    Robert Richter <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 -F:    drivers/net/ethernet/cavium/
 +F:    drivers/net/ethernet/cavium/thunder/
  
  ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
  M:    Alexander Shiyan <[email protected]>
@@@ -1491,7 -1465,9 +1491,7 @@@ F:      arch/arm/boot/dts/emev2
  F:    arch/arm/boot/dts/r7s*
  F:    arch/arm/boot/dts/r8a*
  F:    arch/arm/boot/dts/sh*
 -F:    arch/arm/configs/armadillo800eva_defconfig
  F:    arch/arm/configs/bockw_defconfig
 -F:    arch/arm/configs/kzm9g_defconfig
  F:    arch/arm/configs/marzen_defconfig
  F:    arch/arm/configs/shmobile_defconfig
  F:    arch/arm/include/debug/renesas-scif.S
@@@ -1528,10 -1504,8 +1528,10 @@@ S:    Maintaine
  F:    arch/arm/mach-sti/
  F:    arch/arm/boot/dts/sti*
  F:    drivers/clocksource/arm_global_timer.c
 +F:    drivers/clocksource/clksrc_st_lpc.c
  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
@@@ -1605,10 -1579,7 +1605,10 @@@ ARM/UNIPHIER ARCHITECTUR
  M:    Masahiro Yamada <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    arch/arm/boot/dts/uniphier*
  F:    arch/arm/mach-uniphier/
 +F:    drivers/pinctrl/uniphier/
 +F:    drivers/tty/serial/8250/8250_uniphier.c
  N:    uniphier
  
  ARM/Ux500 ARM ARCHITECTURE
@@@ -1703,7 -1674,7 +1703,7 @@@ M:      Michal Simek <[email protected]
  R:    Sören Brinkmann <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://wiki.xilinx.com
 -T:    git git://git.xilinx.com/linux-xlnx.git
 +T:    git https://github.com/Xilinx/linux-xlnx.git
  S:    Supported
  F:    arch/arm/mach-zynq/
  F:    drivers/cpuidle/cpuidle-zynq.c
@@@ -1911,12 -1882,6 +1911,12 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/mtd/nand/atmel_nand*
  
 +ATMEL SDMMC DRIVER
 +M:    Ludovic Desroches <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/mmc/host/sdhci-of-at91.c
 +
  ATMEL SPI DRIVER
  M:    Nicolas Ferre <[email protected]>
  S:    Supported
@@@ -1950,14 -1915,6 +1950,14 @@@ W:    http://atmelwlandriver.sourceforge.n
  S:    Maintained
  F:    drivers/net/wireless/atmel*
  
 +ATMEL MAXTOUCH DRIVER
 +M:    Nick Dyer <[email protected]>
 +T:    git git://github.com/atmel-maxtouch/linux.git
 +S:    Supported
 +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
 +
  ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
  M:    Bradley Grove <[email protected]>
  L:    [email protected]
@@@ -2261,9 -2218,7 +2261,9 @@@ F:      drivers/clocksource/bcm_kona_timer.
  BROADCOM BCM2835 ARM ARCHITECTURE
  M:    Stephen Warren <[email protected]>
  M:    Lee Jones <[email protected]>
 +M:    Eric Anholt <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
  S:    Maintained
  N:    bcm2835
@@@ -2587,6 -2542,7 +2587,6 @@@ M:     Raghu Vatsavayi <raghu.vatsavayi
  L:     [email protected]
  W:     http://www.cavium.com
  S:     Supported
 -F:     drivers/net/ethernet/cavium/
  F:     drivers/net/ethernet/cavium/liquidio/
  
  CC2520 IEEE-802.15.4 RADIO DRIVER
@@@ -2633,15 -2589,6 +2633,15 @@@ S:    Supporte
  F:    Documentation/filesystems/ceph.txt
  F:    fs/ceph/
  
 +CERTIFICATE HANDLING:
 +M:    David Howells <[email protected]>
 +M:    David Woodhouse <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/module-signing.txt
 +F:    certs/
 +F:    scripts/extract-cert.c
 +
  CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
  L:    [email protected]
  S:    Orphan
@@@ -3400,6 -3347,7 +3400,6 @@@ F:      drivers/staging/dgnc
  
  DIGI EPCA PCI PRODUCTS
  M:    Lidza Louina <[email protected]>
 -M:    Mark Hounschell <[email protected]>
  M:    Daeseok Youn <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -3506,7 -3454,6 +3506,7 @@@ X:      Documentation/devicetree
  X:    Documentation/acpi
  X:    Documentation/power
  X:    Documentation/spi
 +X:    Documentation/DocBook/media
  T:    git git://git.lwn.net/linux-2.6.git docs-next
  
  DOUBLETALK DRIVER
@@@ -3603,15 -3550,6 +3603,15 @@@ F:    drivers/gpu/drm/exynos
  F:    include/drm/exynos*
  F:    include/uapi/drm/exynos*
  
 +DRM DRIVERS FOR FREESCALE DCU
 +M:    Jianwei Wang <[email protected]>
 +M:    Alison Wang <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/gpu/drm/fsl-dcu/
 +F:    Documentation/devicetree/bindings/video/fsl,dcu.txt
 +F:    Documentation/devicetree/bindings/panel/nec,nl4827hc19_05b.txt
 +
  DRM DRIVERS FOR FREESCALE IMX
  M:    Philipp Zabel <[email protected]>
  L:    [email protected]
@@@ -3649,15 -3587,6 +3649,15 @@@ S:    Maintaine
  F:    drivers/gpu/drm/rockchip/
  F:    Documentation/devicetree/bindings/video/rockchip*
  
 +DRM DRIVERS FOR STI
 +M:    Benjamin Gaignard <[email protected]>
 +M:    Vincent Abriou <[email protected]>
 +L:    [email protected]
 +T:    git http://git.linaro.org/people/benjamin.gaignard/kernel.git
 +S:    Maintained
 +F:    drivers/gpu/drm/sti
 +F:    Documentation/devicetree/bindings/gpu/st,stih4xx.txt
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <[email protected]>
  L:    [email protected]
@@@ -4130,6 -4059,15 +4130,6 @@@ F:     Documentation/filesystems/ext2.tx
  F:    fs/ext2/
  F:    include/linux/ext2*
  
 -EXT3 FILE SYSTEM
 -M:    Jan Kara <[email protected]>
 -M:    Andrew Morton <[email protected]>
 -M:    Andreas Dilger <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/filesystems/ext3.txt
 -F:    fs/ext3/
 -
  EXT4 FILE SYSTEM
  M:    "Theodore Ts'o" <[email protected]>
  M:    Andreas Dilger <[email protected]>
@@@ -4307,7 -4245,7 +4307,7 @@@ S:      Maintaine
  F:    drivers/block/rsxx/
  
  FLOPPY DRIVER
 -M:    Jiri Kosina <j[email protected]>
 +M:    Jiri Kosina <j[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
  S:    Odd fixes
  F:    drivers/block/floppy.c
@@@ -4468,7 -4406,6 +4468,7 @@@ F:      include/linux/fscache*.
  F2FS FILE SYSTEM
  M:    Jaegeuk Kim <[email protected]>
  M:    Changman Lee <[email protected]>
 +R:    Chao Yu <[email protected]>
  L:    [email protected]
  W:    http://en.wikipedia.org/wiki/F2FS
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
@@@ -4477,7 -4414,6 +4477,7 @@@ F:      Documentation/filesystems/f2fs.tx
  F:    Documentation/ABI/testing/sysfs-fs-f2fs
  F:    fs/f2fs/
  F:    include/linux/f2fs_fs.h
 +F:    include/trace/events/f2fs.h
  
  FUJITSU FR-V (FRV) PORT
  M:    David Howells <[email protected]>
@@@ -4880,7 -4816,7 +4880,7 @@@ F:      include/linux/pm.
  F:    arch/*/include/asm/suspend*.h
  
  HID CORE LAYER
 -M:    Jiri Kosina <j[email protected]>
 +M:    Jiri Kosina <j[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
@@@ -4889,7 -4825,7 +4889,7 @@@ F:      include/linux/hid
  F:    include/uapi/linux/hid*
  
  HID SENSOR HUB DRIVERS
 -M:    Jiri Kosina <j[email protected]>
 +M:    Jiri Kosina <j[email protected]>
  M:    Jonathan Cameron <[email protected]>
  M:    Srinivas Pandruvada <[email protected]>
  L:    [email protected]
@@@ -5021,7 -4957,6 +5021,7 @@@ F:      drivers/scsi/storvsc_drv.
  F:    drivers/video/fbdev/hyperv_fb.c
  F:    include/linux/hyperv.h
  F:    tools/hv/
 +F:    Documentation/ABI/stable/sysfs-bus-vmbus
  
  I2C OVER PARALLEL PORT
  M:    Jean Delvare <[email protected]>
@@@ -5132,21 -5067,9 +5132,21 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/ia64/
  
 +IBM Power VMX Cryptographic instructions
 +M:    Leonidas S. Barbosa <[email protected]>
 +M:    Paulo Flabiano Smorigo <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/crypto/vmx/Makefile
 +F:    drivers/crypto/vmx/Kconfig
 +F:    drivers/crypto/vmx/vmx.c
 +F:    drivers/crypto/vmx/aes*
 +F:    drivers/crypto/vmx/ghash*
 +F:    drivers/crypto/vmx/ppc-xlate.pl
 +
  IBM Power in-Nest Crypto Acceleration
 -M:    Marcelo Henrique Cerri <mhcerri@linux.vnet.ibm.com>
 -M:    Fionnuala Gunter <fin@linux.vnet.ibm.com>
 +M:    Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
 +M:    Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/crypto/nx/Makefile
@@@ -5158,7 -5081,7 +5158,7 @@@ F:      drivers/crypto/nx/nx_csbcpb.
  F:    drivers/crypto/nx/nx_debugfs.h
  
  IBM Power 842 compression accelerator
 -M:    Dan Streetman <ddstreet@us.ibm.com>
 +M:    Dan Streetman <ddstreet@ieee.org>
  S:    Supported
  F:    drivers/crypto/nx/Makefile
  F:    drivers/crypto/nx/Kconfig
@@@ -5346,7 -5269,6 +5346,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    Documentation/infiniband/
  F:    drivers/infiniband/
 +F:    drivers/staging/rdma/
  F:    include/uapi/linux/if_infiniband.h
  F:    include/uapi/rdma/
  F:    include/rdma/
@@@ -5604,7 -5526,7 +5604,7 @@@ IPATH DRIVE
  M:    Mike Marciniszyn <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/infiniband/hw/ipath/
 +F:    drivers/staging/rdma/ipath/
  
  IPMI SUBSYSTEM
  M:    Corey Minyard <[email protected]>
@@@ -5643,7 -5565,7 +5643,7 @@@ F:      include/uapi/linux/ip_vs.
  F:    net/netfilter/ipvs/
  
  IPWIRELESS DRIVER
 -M:    Jiri Kosina <j[email protected]>
 +M:    Jiri Kosina <j[email protected]>
  M:    David Sterba <[email protected]>
  S:    Odd Fixes
  F:    drivers/tty/ipwireless/
@@@ -5833,20 -5755,21 +5833,20 @@@ S:   Maintaine
  F:    fs/jffs2/
  F:    include/uapi/linux/jffs2.h
  
 -JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
 -M:    Andrew Morton <[email protected]>
 -M:    Jan Kara <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    fs/jbd/
 -F:    include/linux/jbd.h
 -
  JOURNALLING LAYER FOR BLOCK DEVICES (JBD2)
  M:    "Theodore Ts'o" <[email protected]>
 +M:    Jan Kara <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    fs/jbd2/
  F:    include/linux/jbd2.h
  
 +JPU V4L2 MEM2MEM DRIVER FOR RENESAS
 +M:    Mikhail Ulyanov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/platform/rcar_jpu.c
 +
  JSM Neo PCI based serial card
  M:    Thadeu Lima de Souza Cascardo <[email protected]>
  L:    [email protected]
@@@ -5917,7 -5840,6 +5917,7 @@@ S:      Odd Fixe
  
  KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
  M:    "J. Bruce Fields" <[email protected]>
 +M:    Jeff Layton <[email protected]>
  L:    [email protected]
  W:    http://nfs.sourceforge.net/
  S:    Supported
@@@ -5974,6 -5896,7 +5974,6 @@@ F:      arch/powerpc/kvm
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <[email protected]>
  M:    Cornelia Huck <[email protected]>
 -M:    [email protected]
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -6015,7 -5938,7 +6015,7 @@@ F:      kernel/kexec.
  
  KEYS/KEYRINGS:
  M:    David Howells <[email protected]>
 -L:    keyrings@linux-nfs.org
 +L:    keyrings@vger.kernel.org
  S:    Maintained
  F:    Documentation/security/keys.txt
  F:    include/linux/key.h
@@@ -6027,7 -5950,7 +6027,7 @@@ KEYS-TRUSTE
  M:    David Safford <[email protected]>
  M:    Mimi Zohar <[email protected]>
  L:    [email protected]
 -L:    keyrings@linux-nfs.org
 +L:    keyrings@vger.kernel.org
  S:    Supported
  F:    Documentation/security/keys-trusted-encrypted.txt
  F:    include/keys/trusted-type.h
@@@ -6038,7 -5961,7 +6038,7 @@@ KEYS-ENCRYPTE
  M:    Mimi Zohar <[email protected]>
  M:    David Safford <[email protected]>
  L:    [email protected]
 -L:    keyrings@linux-nfs.org
 +L:    keyrings@vger.kernel.org
  S:    Supported
  F:    Documentation/security/keys-trusted-encrypted.txt
  F:    include/keys/encrypted-type.h
@@@ -6108,10 -6031,11 +6108,10 @@@ F:   Documentation/scsi/53c700.tx
  F:    drivers/scsi/53c700*
  
  LED SUBSYSTEM
 -M:    Bryan Wu <[email protected]>
  M:    Richard Purdie <[email protected]>
  M:    Jacek Anaszewski <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
  S:    Maintained
  F:    drivers/leds/
  F:    include/linux/leds.h
@@@ -6241,7 -6165,6 +6241,7 @@@ Q:      https://patchwork.kernel.org/project
  S:    Supported
  F:    drivers/nvdimm/pmem.c
  F:    include/linux/pmem.h
 +F:    arch/*/include/asm/pmem.h
  
  LINUX FOR IBM pSERIES (RS/6000)
  M:    Paul Mackerras <[email protected]>
@@@ -6332,7 -6255,7 +6332,7 @@@ F:      drivers/platform/x86/hp_accel.
  LIVE PATCHING
  M:    Josh Poimboeuf <[email protected]>
  M:    Seth Jennings <[email protected]>
 -M:    Jiri Kosina <j[email protected]>
 +M:    Jiri Kosina <j[email protected]>
  M:    Vojtech Pavlik <[email protected]>
  S:    Maintained
  F:    kernel/livepatch/
@@@ -6457,11 -6380,11 +6457,11 @@@ F:   drivers/hwmon/ltc4261.
  LTP (Linux Test Project)
  M:    Mike Frysinger <[email protected]>
  M:    Cyril Hrubis <[email protected]>
 -M:    Wanlong Gao <[email protected].com>
 +M:    Wanlong Gao <wanlong.gao@gmail.com>
  M:    Jan Stancek <[email protected]>
  M:    Stanislav Kholmanskikh <[email protected]>
  M:    Alexey Kodanev <[email protected]>
 -L:    ltp[email protected]t (subscribers-only)
 +L:    ltp@lists.linux.it (subscribers-only)
  W:    http://linux-test-project.github.io/
  T:    git git://github.com/linux-test-project/ltp.git
  S:    Maintained
@@@ -6587,7 -6510,7 +6587,7 @@@ F:      drivers/net/ethernet/marvell/mvneta.
  
  MARVELL MWIFIEX WIRELESS DRIVER
  M:    Amitkumar Karwar <[email protected]>
 -M:    Avinash Patil <patila@marvell.com>
 +M:    Nishant Sarmukadam <nishants@marvell.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wireless/mwifiex/
@@@ -6616,13 -6539,6 +6616,13 @@@ S:    Maintaine
  F:    Documentation/hwmon/max16065
  F:    drivers/hwmon/max16065.c
  
 +MAX20751 HARDWARE MONITOR DRIVER
 +M:    Guenter Roeck <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/max20751
 +F:    drivers/hwmon/max20751.c
 +
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    "Hans J. Koch" <[email protected]>
  L:    [email protected]
@@@ -6646,14 -6562,6 +6646,14 @@@ S:    Supporte
  F:    drivers/power/max14577_charger.c
  F:    drivers/power/max77693_charger.c
  
 +MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS
 +M:    Javier Martinez Canillas <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/*/*max77802.c
 +F:    Documentation/devicetree/bindings/*/*max77802.txt
 +F:    include/dt-bindings/*/*max77802.h
 +
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
@@@ -6667,7 -6575,7 +6667,7 @@@ F:      drivers/extcon/extcon-max77693.
  F:    drivers/rtc/rtc-max77686.c
  F:    drivers/clk/clk-max77686.c
  F:    Documentation/devicetree/bindings/mfd/max14577.txt
 -F:    Documentation/devicetree/bindings/mfd/max77686.txt
 +F:    Documentation/devicetree/bindings/*/max77686.txt
  F:    Documentation/devicetree/bindings/mfd/max77693.txt
  F:    Documentation/devicetree/bindings/clock/maxim,max77686.txt
  F:    include/linux/mfd/max14577*.h
@@@ -6691,51 -6599,6 +6691,51 @@@ S:    Supporte
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
  F:    drivers/media/platform/vsp1/
  
 +MEDIA DRIVERS FOR ASCOT2E
 +M:    Sergey Kozlov <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org
 +W:    http://netup.tv/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/dvb-frontends/ascot2e*
 +
 +MEDIA DRIVERS FOR CXD2841ER
 +M:    Sergey Kozlov <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://netup.tv/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/dvb-frontends/cxd2841er*
 +
 +MEDIA DRIVERS FOR HORUS3A
 +M:    Sergey Kozlov <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://netup.tv/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/dvb-frontends/horus3a*
 +
 +MEDIA DRIVERS FOR LNBH25
 +M:    Sergey Kozlov <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://netup.tv/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/dvb-frontends/lnbh25*
 +
 +MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
 +M:    Sergey Kozlov <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://netup.tv/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/pci/netup_unidvb/*
 +
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <[email protected]>
  P:    LinuxTV.org Project
@@@ -6785,23 -6648,6 +6785,23 @@@ W:    http://www.mellanox.co
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlx4/en_*
  
 +MELLANOX ETHERNET SWITCH DRIVERS
 +M:    Jiri Pirko <[email protected]>
 +M:    Ido Schimmel <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +F:    drivers/net/ethernet/mellanox/mlxsw/
 +
 +MEMBARRIER SUPPORT
 +M:    Mathieu Desnoyers <[email protected]>
 +M:    "Paul E. McKenney" <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    kernel/membarrier.c
 +F:    include/uapi/linux/membarrier.h
 +
  MEMORY MANAGEMENT
  L:    [email protected]
  W:    http://www.linux-mm.org
@@@ -6837,7 -6683,6 +6837,7 @@@ M:      Johannes Thumshirn <morbidrsa@gmail.
  S:    Maintained
  F:    drivers/mcb/
  F:    include/linux/mcb.h
 +F:    Documentation/men-chameleon-bus.txt
  
  MEN F21BMC (Board Management Controller)
  M:    Andreas Werner <[email protected]>
@@@ -6867,12 -6712,6 +6867,12 @@@ T:    git git://git.monstr.eu/linux-2.6-mi
  S:    Supported
  F:    arch/microblaze/
  
 +MICROSOFT SURFACE PRO 3 BUTTON DRIVER
 +M:    Chen Yu <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/platform/x86/surfacepro3_button.c
 +
  MICROTEK X6 SCANNER
  M:    Oliver Neukum <[email protected]>
  S:    Maintained
@@@ -6918,6 -6757,13 +6918,13 @@@ S:    Supporte
  F:    include/linux/mlx5/
  F:    drivers/infiniband/hw/mlx5/
  
+ MELEXIS MLX90614 DRIVER
+ M:    Crt Mori <[email protected]>
+ L:    [email protected]
+ W:    http://www.melexis.com
+ S:    Supported
+ F:    drivers/iio/temperature/mlx90614.c
+ 
  MN88472 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -7390,7 -7236,7 +7397,7 @@@ F:      drivers/scsi/nsp32
  NIOS2 ARCHITECTURE
  M:    Ley Foon Tan <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -T:    git git://git.rocketboards.org/linux-socfpga-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
  S:    Maintained
  F:    arch/nios2/
  
@@@ -7409,7 -7255,6 +7416,7 @@@ NTB DRIVER COR
  M:    Jon Mason <[email protected]>
  M:    Dave Jiang <[email protected]>
  M:    Allen Hubbe <[email protected]>
 +L:    [email protected]
  S:    Supported
  W:    https://github.com/jonmason/ntb/wiki
  T:    git git://github.com/jonmason/ntb.git
@@@ -7421,7 -7266,6 +7428,7 @@@ F:      include/linux/ntb_transport.
  NTB INTEL DRIVER
  M:    Jon Mason <[email protected]>
  M:    Dave Jiang <[email protected]>
 +L:    [email protected]
  S:    Supported
  W:    https://github.com/jonmason/ntb/wiki
  T:    git git://github.com/jonmason/ntb.git
@@@ -7451,15 -7295,6 +7458,15 @@@ S:    Supporte
  F:    drivers/block/nvme*
  F:    include/linux/nvme.h
  
 +NVMEM FRAMEWORK
 +M:    Srinivas Kandagatla <[email protected]>
 +M:    Maxime Ripard <[email protected]>
 +S:    Maintained
 +F:    drivers/nvmem/
 +F:    Documentation/devicetree/bindings/nvmem/
 +F:    include/linux/nvmem-consumer.h
 +F:    include/linux/nvmem-provider.h
 +
  NXP-NCI NFC DRIVER
  M:    Clément Perrochaud <[email protected]>
  R:    Charles Gorand <[email protected]>
@@@ -7697,9 -7532,8 +7704,9 @@@ F:      Documentation/i2c/busses/i2c-ocore
  F:    drivers/i2c/busses/i2c-ocores.c
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
 -M:    Grant Likely <[email protected]>
  M:    Rob Herring <[email protected]>
 +M:    Frank Rowand <[email protected]>
 +M:    Grant Likely <[email protected]>
  L:    [email protected]
  W:    http://www.devicetree.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git
@@@ -8172,6 -8006,7 +8179,6 @@@ F:      drivers/pinctrl/sh-pfc
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
 -M:    Thomas Abraham <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -8186,7 -8021,7 +8193,7 @@@ S:      Maintaine
  F:    drivers/pinctrl/spear/
  
  PKTCDVD DRIVER
 -M:    Jiri Kosina <j[email protected]>
 +M:    Jiri Kosina <j[email protected]>
  S:    Maintained
  F:    drivers/block/pktcdvd.c
  F:    include/linux/pktcdvd.h
@@@ -8214,13 -8049,14 +8221,13 @@@ F:   drivers/hwmon/pmbus
  F:    include/linux/i2c/pmbus.h
  
  PMC SIERRA MaxRAID DRIVER
 -M:    Anil Ravindranath <[email protected]>
  L:    [email protected]
  W:    http://www.pmc-sierra.com/
 -S:    Supported
 +S:    Orphan
  F:    drivers/scsi/pmcraid.*
  
  PMC SIERRA PM8001 DRIVER
 -M:    [email protected]
 +M:    Jack Wang <[email protected]>
  M:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -8245,16 -8081,6 +8252,16 @@@ T:    git git://git.infradead.org/battery-
  S:    Maintained
  F:    include/linux/power_supply.h
  F:    drivers/power/
 +X:    drivers/power/avs/
 +
 +POWER STATE COORDINATION INTERFACE (PSCI)
 +M:    Mark Rutland <[email protected]>
 +M:    Lorenzo Pieralisi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/firmware/psci.c
 +F:    include/linux/psci.h
 +F:    include/uapi/linux/psci.h
  
  PNP SUPPORT
  M:    "Rafael J. Wysocki" <[email protected]>
@@@ -8505,6 -8331,7 +8512,6 @@@ F:      Documentation/networking/LICENSE.qla
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 -M:    Shahed Shaikh <[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -8652,7 -8479,7 +8659,7 @@@ M:      "Paul E. McKenney" <[email protected]
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
 -R:    Lai Jiangshan <[email protected].com>
 +R:    Lai Jiangshan <jiangshanlai@gmail.com>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
@@@ -8679,7 -8506,7 +8686,7 @@@ M:      "Paul E. McKenney" <[email protected]
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
 -R:    Lai Jiangshan <[email protected].com>
 +R:    Lai Jiangshan <jiangshanlai@gmail.com>
  L:    [email protected]
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
@@@ -8744,7 -8571,6 +8751,7 @@@ M:      Philipp Zabel <[email protected]
  S:    Maintained
  F:    drivers/reset/
  F:    Documentation/devicetree/bindings/reset/
 +F:    include/dt-bindings/reset/
  F:    include/linux/reset.h
  F:    include/linux/reset-controller.h
  
@@@ -8879,6 -8705,7 +8886,6 @@@ F:      drivers/video/fbdev/savage
  S390
  M:    Martin Schwidefsky <[email protected]>
  M:    Heiko Carstens <[email protected]>
 -M:    [email protected]
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -8906,6 -8733,7 +8913,6 @@@ F:      block/partitions/ibm.
  
  S390 NETWORK DRIVERS
  M:    Ursula Braun <[email protected]>
 -M:    [email protected]
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -8922,6 -8750,7 +8929,6 @@@ F:      drivers/pci/hotplug/s390_pci_hpc.
  
  S390 ZCRYPT DRIVER
  M:    Ingo Tuchscherer <[email protected]>
 -M:    [email protected]
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -8929,6 -8758,7 +8936,6 @@@ F:      drivers/s390/crypto
  
  S390 ZFCP DRIVER
  M:    Steffen Maier <[email protected]>
 -M:    [email protected]
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -8936,6 -8766,7 +8943,6 @@@ F:      drivers/s390/scsi/zfcp_
  
  S390 IUCV NETWORK LAYER
  M:    Ursula Braun <[email protected]>
 -M:    [email protected]
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -9038,12 -8869,6 +9045,12 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/media/i2c/s5k5baf.c
  
 +SAMSUNG S3FWRN5 NFC DRIVER
 +M:    Robert Baldyga <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/nfc/s3fwrn5
 +
  SAMSUNG SOC CLOCK DRIVERS
  M:    Sylwester Nawrocki <[email protected]>
  M:    Tomasz Figa <[email protected]>
@@@ -9094,13 -8919,6 +9101,13 @@@ F:    include/linux/dma/dw.
  F:    include/linux/platform_data/dma-dw.h
  F:    drivers/dma/dw/
  
 +SYNOPSYS DESIGNWARE ETHERNET QOS 4.10a driver
 +M: Lars Persson <[email protected]>
 +L: [email protected]
 +S: Supported
 +F: Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt
 +F: drivers/net/ethernet/synopsys/dwc_eth_qos.c
 +
  SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
  M:    Seungwon Jeon <[email protected]>
  M:    Jaehoon Chung <[email protected]>
@@@ -9300,12 -9118,6 +9307,12 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    security/apparmor/
  
 +YAMA SECURITY MODULE
 +M:    Kees Cook <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git yama/tip
 +S:    Supported
 +F:    security/yama/
 +
  SENSABLE PHANTOM
  M:    Jiri Slaby <[email protected]>
  S:    Maintained
@@@ -9571,7 -9383,7 +9578,7 @@@ F:      include/linux/sl?b*.
  F:    mm/sl?b*
  
  SLEEPABLE READ-COPY UPDATE (SRCU)
 -M:    Lai Jiangshan <[email protected].com>
 +M:    Lai Jiangshan <jiangshanlai@gmail.com>
  M:    "Paul E. McKenney" <[email protected]>
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
@@@ -9908,8 -9720,8 +9915,8 @@@ F:      drivers/staging/media/lirc
  STAGING - LUSTRE PARALLEL FILESYSTEM
  M:    Oleg Drokin <[email protected]>
  M:    Andreas Dilger <[email protected]>
 -L:    [email protected].org (moderated for non-subscribers)
 -W:    http://lustre.opensfs.org/
 +L:    [email protected].org (moderated for non-subscribers)
 +W:    http://wiki.lustre.org/
  S:    Maintained
  F:    drivers/staging/lustre
  
@@@ -9979,10 -9791,8 +9986,10 @@@ F:    drivers/staging/vt665?
  STAGING - WILC1000 WIFI DRIVER
  M:    Johnny Kim <[email protected]>
  M:    Rachel Kim <[email protected]>
 -M:    Dean Lee <[email protected]>
  M:    Chris Park <[email protected]>
 +M:    Tony Cho <[email protected]>
 +M:    Glen Lee <[email protected]>
 +M:    Leo Kim <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/staging/wilc1000/
@@@ -9992,12 -9802,6 +9999,12 @@@ M:    Arnaud Patard <arnaud.patard@rtp-net
  S:    Odd Fixes
  F:    drivers/staging/xgifb/
  
 +HFI1 DRIVER
 +M:    Mike Marciniszyn <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/staging/rdma/hfi1
 +
  STARFIRE/DURALAN NETWORK DRIVER
  M:    Ion Badulescu <[email protected]>
  S:    Odd Fixes
@@@ -10073,9 -9877,8 +10080,9 @@@ SYNOPSYS ARC ARCHITECTUR
  M:    Vineet Gupta <[email protected]>
  S:    Supported
  F:    arch/arc/
 -F:    Documentation/devicetree/bindings/arc/
 +F:    Documentation/devicetree/bindings/arc/*
  F:    drivers/tty/serial/arc_uart.c
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
  
  SYNOPSYS ARC SDP platform support
  M:    Alexey Brodkin <[email protected]>
@@@ -10344,16 -10147,6 +10351,16 @@@ F: include/uapi/linux/thermal.
  F:    include/linux/cpu_cooling.h
  F:    Documentation/devicetree/bindings/thermal/
  
 +THERMAL/CPU_COOLING
 +M:    Amit Daniel Kachhap <[email protected]>
 +M:    Viresh Kumar <[email protected]>
 +M:    Javi Merino <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/thermal/cpu-cooling-api.txt
 +F:    drivers/thermal/cpu_cooling.c
 +F:    include/linux/cpu_cooling.h
 +
  THINGM BLINK(1) USB RGB LED DRIVER
  M:    Vivien Didelot <[email protected]>
  S:    Maintained
@@@ -10533,19 -10326,13 +10540,19 @@@ F:        drivers/platform/x86/toshiba_haps.
  
  TOSHIBA SMM DRIVER
  M:    Jonathan Buzzard <[email protected]>
 -L:    [email protected]
  W:    http://www.buzzard.org.uk/toshiba/
  S:    Maintained
  F:    drivers/char/toshiba.c
  F:    include/linux/toshiba.h
  F:    include/uapi/linux/toshiba.h
  
 +TOSHIBA TC358743 DRIVER
 +M:    Mats Randgaard <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/tc358743*
 +F:    include/media/tc358743.h
 +
  TMIO MMC DRIVER
  M:    Ian Molton <[email protected]>
  L:    [email protected]
@@@ -10842,7 -10629,7 +10849,7 @@@ F:   drivers/usb/gadget
  F:    include/linux/usb/gadget*
  
  USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
 -M:    Jiri Kosina <j[email protected]>
 +M:    Jiri Kosina <j[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
@@@ -11203,7 -10990,7 +11210,7 @@@ F:   drivers/vlynq/vlynq.
  F:    include/linux/vlynq.h
  
  VME SUBSYSTEM
 -M:    Martyn Welch <martyn[email protected]>
 +M:    Martyn Welch <martyn@welchs.me.uk>
  M:    Manohar Vanga <[email protected]>
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -11237,7 -11024,7 +11244,7 @@@ F:   drivers/input/mouse/vmmouse.
  F:    drivers/input/mouse/vmmouse.h
  
  VMWARE VMXNET3 ETHERNET DRIVER
 -M:    Shreyas Bhatewara <sbhatewara@vmware.com>
 +M:    Shrikrishna Khare <skhare@vmware.com>
  M:    "VMware, Inc." <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -11255,21 -11042,13 +11262,21 @@@ VOLTAGE AND CURRENT REGULATOR FRAMEWOR
  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
  S:    Supported
  F:    drivers/regulator/
  F:    include/linux/regulator/
  
 +VRF
 +M:    David Ahern <[email protected]>
 +M:    Shrijeet Mukherjee <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/vrf.c
 +F:    include/net/vrf.h
 +F:    Documentation/networking/vrf.txt
 +
  VT1211 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <[email protected]>
  L:    [email protected]
@@@ -11384,15 -11163,17 +11391,15 @@@ WM97XX TOUCHSCREEN DRIVER
  M:    Mark Brown <[email protected]>
  M:    Liam Girdwood <[email protected]>
  L:    [email protected]
 -T:    git git://opensource.wolfsonmicro.com/linux-2.6-touch
 -W:    http://opensource.wolfsonmicro.com/node/7
 +W:    https://github.com/CirrusLogic/linux-drivers/wiki
  S:    Supported
  F:    drivers/input/touchscreen/*wm97*
  F:    include/linux/wm97xx.h
  
  WOLFSON MICROELECTRONICS DRIVERS
  L:    [email protected]
 -T:    git git://opensource.wolfsonmicro.com/linux-2.6-asoc
 -T:    git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 -W:    http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
 +T:    git https://github.com/CirrusLogic/linux-drivers.git
 +W:    https://github.com/CirrusLogic/linux-drivers/wiki
  S:    Supported
  F:    Documentation/hwmon/wm83??
  F:    arch/arm/mach-s3c64xx/mach-crag6410*
@@@ -11423,7 -11204,6 +11430,7 @@@ F:   sound/soc/codecs/wm
  
  WORKQUEUE
  M:    Tejun Heo <[email protected]>
 +R:    Lai Jiangshan <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
  S:    Maintained
  F:    include/linux/workqueue.h
diff --combined drivers/iio/light/stk3310.c
index 993eb201148e081f1e9092c780fc17ed61c11f0b,25c6a715545a8a109e79c4a8b55d552a2a4e125c..013b21779db993eb45da6119489bdcd729433d6b
--- 1/drivers/iio/light/stk3310.c
--- 2/drivers/iio/light/stk3310.c
+++ b/drivers/iio/light/stk3310.c
@@@ -35,8 -35,8 +35,8 @@@
  #define STK3310_REG_ID                                0x3E
  #define STK3310_MAX_REG                               0x80
  
- #define STK3310_STATE_EN_PS                   0x01
- #define STK3310_STATE_EN_ALS                  0x02
+ #define STK3310_STATE_EN_PS                   BIT(0)
+ #define STK3310_STATE_EN_ALS                  BIT(1)
  #define STK3310_STATE_STANDBY                 0x00
  
  #define STK3310_CHIP_ID_VAL                   0x13
@@@ -241,8 -241,11 +241,11 @@@ static int stk3310_write_event(struct i
        struct stk3310_data *data = iio_priv(indio_dev);
        struct i2c_client *client = data->client;
  
-       regmap_field_read(data->reg_ps_gain, &index);
-       if (val > stk3310_ps_max[index])
+       ret = regmap_field_read(data->reg_ps_gain, &index);
+       if (ret < 0)
+               return ret;
+ 
+       if (val < 0 || val > stk3310_ps_max[index])
                return -EINVAL;
  
        if (dir == IIO_EV_DIR_RISING)
@@@ -266,9 -269,12 +269,12 @@@ static int stk3310_read_event_config(st
                                     enum iio_event_direction dir)
  {
        unsigned int event_val;
+       int ret;
        struct stk3310_data *data = iio_priv(indio_dev);
  
-       regmap_field_read(data->reg_int_ps, &event_val);
+       ret = regmap_field_read(data->reg_int_ps, &event_val);
+       if (ret < 0)
+               return ret;
  
        return event_val;
  }
@@@ -307,14 -313,16 +313,16 @@@ static int stk3310_read_raw(struct iio_
        struct stk3310_data *data = iio_priv(indio_dev);
        struct i2c_client *client = data->client;
  
+       if (chan->type != IIO_LIGHT && chan->type != IIO_PROXIMITY)
+               return -EINVAL;
+ 
        switch (mask) {
        case IIO_CHAN_INFO_RAW:
                if (chan->type == IIO_LIGHT)
                        reg = STK3310_REG_ALS_DATA_MSB;
-               else if (chan->type == IIO_PROXIMITY)
-                       reg = STK3310_REG_PS_DATA_MSB;
                else
-                       return -EINVAL;
+                       reg = STK3310_REG_PS_DATA_MSB;
+ 
                mutex_lock(&data->lock);
                ret = regmap_bulk_read(data->regmap, reg, &buf, 2);
                if (ret < 0) {
@@@ -327,17 -335,23 +335,23 @@@
                return IIO_VAL_INT;
        case IIO_CHAN_INFO_INT_TIME:
                if (chan->type == IIO_LIGHT)
-                       regmap_field_read(data->reg_als_it, &index);
+                       ret = regmap_field_read(data->reg_als_it, &index);
                else
-                       regmap_field_read(data->reg_ps_it, &index);
+                       ret = regmap_field_read(data->reg_ps_it, &index);
+               if (ret < 0)
+                       return ret;
+ 
                *val = stk3310_it_table[index][0];
                *val2 = stk3310_it_table[index][1];
                return IIO_VAL_INT_PLUS_MICRO;
        case IIO_CHAN_INFO_SCALE:
                if (chan->type == IIO_LIGHT)
-                       regmap_field_read(data->reg_als_gain, &index);
+                       ret = regmap_field_read(data->reg_als_gain, &index);
                else
-                       regmap_field_read(data->reg_ps_gain, &index);
+                       ret = regmap_field_read(data->reg_ps_gain, &index);
+               if (ret < 0)
+                       return ret;
+ 
                *val = stk3310_scale_table[index][0];
                *val2 = stk3310_scale_table[index][1];
                return IIO_VAL_INT_PLUS_MICRO;
@@@ -354,6 -368,9 +368,9 @@@ static int stk3310_write_raw(struct iio
        int index;
        struct stk3310_data *data = iio_priv(indio_dev);
  
+       if (chan->type != IIO_LIGHT && chan->type != IIO_PROXIMITY)
+               return -EINVAL;
+ 
        switch (mask) {
        case IIO_CHAN_INFO_INT_TIME:
                index = stk3310_get_index(stk3310_it_table,
@@@ -368,7 -385,7 +385,7 @@@
                        ret = regmap_field_write(data->reg_ps_it, index);
                if (ret < 0)
                        dev_err(&data->client->dev,
-                                       "sensor configuration failed\n");
+                               "sensor configuration failed\n");
                mutex_unlock(&data->lock);
                return ret;
  
@@@ -385,7 -402,7 +402,7 @@@
                        ret = regmap_field_write(data->reg_ps_gain, index);
                if (ret < 0)
                        dev_err(&data->client->dev,
-                                       "sensor configuration failed\n");
+                               "sensor configuration failed\n");
                mutex_unlock(&data->lock);
                return ret;
        }
@@@ -419,8 -436,8 +436,8 @@@ static int stk3310_set_state(struct stk
                dev_err(&client->dev, "failed to change sensor state\n");
        } else if (state != STK3310_STATE_STANDBY) {
                /* Don't reset the 'enabled' flags if we're going in standby */
-               data->ps_enabled  = !!(state & 0x01);
-               data->als_enabled = !!(state & 0x02);
+               data->ps_enabled  = !!(state & STK3310_STATE_EN_PS);
+               data->als_enabled = !!(state & STK3310_STATE_EN_ALS);
        }
        mutex_unlock(&data->lock);
  
@@@ -435,7 -452,10 +452,10 @@@ static int stk3310_init(struct iio_dev 
        struct stk3310_data *data = iio_priv(indio_dev);
        struct i2c_client *client = data->client;
  
-       regmap_read(data->regmap, STK3310_REG_ID, &chipid);
+       ret = regmap_read(data->regmap, STK3310_REG_ID, &chipid);
+       if (ret < 0)
+               return ret;
+ 
        if (chipid != STK3310_CHIP_ID_VAL &&
            chipid != STK3311_CHIP_ID_VAL) {
                dev_err(&client->dev, "invalid chip id: 0x%x\n", chipid);
@@@ -469,12 -489,16 +489,12 @@@ static int stk3310_gpio_probe(struct i2
        dev = &client->dev;
  
        /* gpio interrupt pin */
 -      gpio = devm_gpiod_get_index(dev, STK3310_GPIO, 0);
 +      gpio = devm_gpiod_get_index(dev, STK3310_GPIO, 0, GPIOD_IN);
        if (IS_ERR(gpio)) {
                dev_err(dev, "acpi gpio get index failed\n");
                return PTR_ERR(gpio);
        }
  
 -      ret = gpiod_direction_input(gpio);
 -      if (ret)
 -              return ret;
 -
        ret = gpiod_to_irq(gpio);
        dev_dbg(dev, "GPIO resource, no:%d irq:%d\n", desc_to_gpio(gpio), ret);
  
@@@ -604,8 -628,13 +624,13 @@@ static int stk3310_probe(struct i2c_cli
        if (ret < 0)
                return ret;
  
-       if (client->irq < 0)
+       if (client->irq < 0) {
                client->irq = stk3310_gpio_probe(client);
+               if (client->irq < 0) {
+                       ret = client->irq;
+                       goto err_standby;
+               }
+       }
  
        if (client->irq >= 0) {
                ret = devm_request_threaded_irq(&client->dev, client->irq,
@@@ -614,17 -643,23 +639,23 @@@
                                                IRQF_TRIGGER_FALLING |
                                                IRQF_ONESHOT,
                                                STK3310_EVENT, indio_dev);
-               if (ret < 0)
+               if (ret < 0) {
                        dev_err(&client->dev, "request irq %d failed\n",
-                                       client->irq);
+                               client->irq);
+                       goto err_standby;
+               }
        }
  
        ret = iio_device_register(indio_dev);
        if (ret < 0) {
                dev_err(&client->dev, "device_register failed\n");
-               stk3310_set_state(data, STK3310_STATE_STANDBY);
+               goto err_standby;
        }
  
+       return 0;
+ 
+ err_standby:
+       stk3310_set_state(data, STK3310_STATE_STANDBY);
        return ret;
  }
  
@@@ -648,7 -683,7 +679,7 @@@ static int stk3310_suspend(struct devic
  
  static int stk3310_resume(struct device *dev)
  {
-       int state = 0;
+       u8 state = 0;
        struct stk3310_data *data;
  
        data = iio_priv(i2c_get_clientdata(to_i2c_client(dev)));
Empty description
This page took 0.219836 seconds and 4 git commands to generate.