Merge 4.11-rc6 into staging-next

We want the staging and iio fixes in here to handle merging easier.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc .mailmap
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
Simple merge

diff --cc drivers/iio/common/hid-sensors/hid-sensor-attributes.c
Simple merge