]> Git Repo - linux.git/commitdiff
Merge tag 'staging-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <[email protected]>
Sun, 8 Jan 2017 19:22:00 +0000 (11:22 -0800)
committerLinus Torvalds <[email protected]>
Sun, 8 Jan 2017 19:22:00 +0000 (11:22 -0800)
Pull staging/IIO fixes from Greg KH:
 "Here are some staging and IIO driver fixes for 4.10-rc3.

  Most of these are minor IIO fixes of reported issues, along with one
  network driver fix to resolve an issue. And a MAINTAINERS update with
  a new mailing list. All of these, except the MAINTAINERS file update,
  have been in linux-next with no reported issues (the MAINTAINERS patch
  happened on Friday...)"

* tag 'staging-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  MAINTAINERS: add greybus subsystem mailing list
  staging: octeon: Call SET_NETDEV_DEV()
  iio: accel: st_accel: fix LIS3LV02 reading and scaling
  iio: common: st_sensors: fix channel data parsing
  iio: max44000: correct value in illuminance_integration_time_available
  iio: adc: TI_AM335X_ADC should depend on HAS_DMA
  iio: bmi160: Fix time needed to sleep after command execution
  iio: 104-quad-8: Fix active level mismatch for the preset enable option
  iio: 104-quad-8: Fix off-by-one errors when addressing IOR
  iio: 104-quad-8: Fix index control configuration

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index a136dfbb8eea4cae307c690b0e932ed49327a4a4,f6cb07684cea88ce990a4596e24628227df9f4ef..c0441ab2f8b00f5b3703f8eba728411f35b79f50
@@@ -3800,7 -3800,6 +3800,7 @@@ F:      include/linux/devcoredump.
  DEVICE FREQUENCY (DEVFREQ)
  M:    MyungJoo Ham <[email protected]>
  M:    Kyungmin Park <[email protected]>
 +R:    Chanwoo Choi <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
  S:    Maintained
@@@ -5081,11 -5080,9 +5081,11 @@@ F:    drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
 +T:    git git://github.com/bzolnier/linux.git
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/fb/
  F:    drivers/video/
  F:    include/video/
@@@ -5507,6 -5504,7 +5507,7 @@@ M:      Alex Elder <[email protected]
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Maintained
  F:    drivers/staging/greybus/
+ L:    [email protected]
  
  GREYBUS AUDIO PROTOCOLS DRIVERS
  M:    Vaibhav Agarwal <[email protected]>
@@@ -8855,22 -8853,17 +8856,22 @@@ F:   drivers/video/fbdev/nvidia
  NVM EXPRESS DRIVER
  M:    Keith Busch <[email protected]>
  M:    Jens Axboe <[email protected]>
 +M:    Christoph Hellwig <[email protected]>
 +M:    Sagi Grimberg <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 -W:    https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/
 +T:    git://git.infradead.org/nvme.git
 +W:    http://git.infradead.org/nvme.git
  S:    Supported
  F:    drivers/nvme/host/
  F:    include/linux/nvme.h
 +F:    include/uapi/linux/nvme_ioctl.h
  
  NVM EXPRESS TARGET DRIVER
  M:    Christoph Hellwig <[email protected]>
  M:    Sagi Grimberg <[email protected]>
  L:    [email protected]
 +T:    git://git.infradead.org/nvme.git
 +W:    http://git.infradead.org/nvme.git
  S:    Supported
  F:    drivers/nvme/target/
  
@@@ -9850,7 -9843,7 +9851,7 @@@ M:      Mark Rutland <[email protected]
  M:    Lorenzo Pieralisi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/firmware/psci.c
 +F:    drivers/firmware/psci*.c
  F:    include/linux/psci.h
  F:    include/uapi/linux/psci.h
  
@@@ -13535,11 -13528,11 +13536,11 @@@ F:        arch/x86/xen/*swiotlb
  F:    drivers/xen/*swiotlb*
  
  XFS FILESYSTEM
 -M:    Dave Chinner <david@fromorbit.com>
 +M:    Darrick J. Wong <darrick.wong@oracle.com>
  M:    [email protected]
  L:    [email protected]
  W:    http://xfs.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
 +T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
  S:    Supported
  F:    Documentation/filesystems/xfs.txt
  F:    fs/xfs/
This page took 0.061154 seconds and 4 git commands to generate.