Skip to contentSkip to conversation

Staging driver fixes for 4.6-rc3

GIT PULL Greg KH 1 participant 1 message Apr 9, 2016

lore
Share & tools
lore

Greg KH

author
#0 lore raw

The following changes since commit f55532a0c0b8bb6148f4e07853b876ef73bc69ca:

Linux 4.6-rc1 (2016-03-26 16:03:24 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/ tags/staging-4.6-rc3

for you to fetch changes up to 53c43c5ca13328ac8f415aa2251791b441a12b51:

Revert "Staging: olpc_dcon: Remove obsolete driver" (2016-04-04 13:52:35 -0700)

----------------------------------------------------------------
Staging / IIO driver fixes for 4.6-rc3

Here are some IIO driver fixes, along with two staging driver fixes for 4.6-rc3.

One staging driver patch reverts the deletion of a driver that happened in 4.6-rc1. We thought that laptop.org was dead, but it's still alive and kicking, and has users that were mad we broke their hardware by deleting a driver for their machines. So that driver is added back and everyone is happy again.

All of these have been in linux-next for a while with no reported issues.

----------------------------------------------------------------
Arnd Bergmann (1):
iio: st_magn: always define ST_MAGN_TRIGGER_SET_STATE

Greg Kroah-Hartman (3):

      Merge tag 'iio-fixes-for-4.6a' of git://git.kernel.org/.../jic23/iio into usb-linus
      Merge tag 'iio-fixes-for-4.6b' of git://git.kernel.org/.../jic23/iio into staging-linus
      Revert "Staging: olpc_dcon: Remove obsolete driver"

Irina Tirdea (4):
iio: fix config watermark initial value
iio: accel: bmc150: fix endianness when reading axes
iio: gyro: bmg160: fix endianness when reading axes
iio: gyro: bmg160: fix buffer read values

Krzysztof Kozlowski (1):
iio: adc: Fix build error of missing devm_ioremap_resource on UM

Markus Böhme (1):
staging/rdma/hfi1: select CRC32

Matt Ranostay (2):
iio: light: apds9960: correct FIFO check condition
iio: health: max30100: correct FIFO check condition

Richard Weinberger (1):
iio: imu: Fix inv_mpu6050 dependencies

Stefan Eichenberger (2):
iio: adc: max1363: add missing adc to max1363_id
iio: adc: max1363: correct reference voltage

 MAINTAINERS                                  |   8 +
 drivers/iio/accel/bmc150-accel-core.c        |   7 +-
 drivers/iio/adc/Kconfig                      |   1 +
 drivers/iio/adc/max1363.c                    |  12 +-
 drivers/iio/gyro/bmg160_core.c               |   9 +-
 drivers/iio/health/max30100.c                |   3 +-
 drivers/iio/imu/inv_mpu6050/Kconfig          |   3 +-
 drivers/iio/industrialio-buffer.c            |   1 +
 drivers/iio/light/apds9960.c                 |   3 +-
 drivers/iio/magnetometer/st_magn.h           |   1 +
 drivers/staging/Kconfig                      |   2 +
 drivers/staging/Makefile                     |   1 +
 drivers/staging/olpc_dcon/Kconfig            |  35 ++
 drivers/staging/olpc_dcon/Makefile           |   6 +
 drivers/staging/olpc_dcon/TODO               |   9 +
 drivers/staging/olpc_dcon/olpc_dcon.c        | 813 +++++++++++++++++++++++++++
 drivers/staging/olpc_dcon/olpc_dcon.h        | 111 ++++
 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c   | 205 +++++++
 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 161 ++++++
 drivers/staging/rdma/hfi1/Kconfig            |   1 +
 20 files changed, 1377 insertions(+), 15 deletions(-)
 create mode 100644 drivers/staging/olpc_dcon/Kconfig
 create mode 100644 drivers/staging/olpc_dcon/Makefile
 create mode 100644 drivers/staging/olpc_dcon/TODO
 create mode 100644 drivers/staging/olpc_dcon/olpc_dcon.c
 create mode 100644 drivers/staging/olpc_dcon/olpc_dcon.h
 create mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
 create mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c