Merge branch 'ib-iio-hid-sensors-v6.6-rc1' into togreg
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 24 Sep 2023 12:39:25 +0000 (13:39 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 24 Sep 2023 12:39:25 +0000 (13:39 +0100)
commit431dffc1df07b93ce9be26d264b7946cd65cb949
treef8aaf7d46c8d90f5b2ebe0d6af6f8991b658ea0b
parent57d3909596f9941c7d0777004994438df1b5ba0a
parentc6c97210e27237438689611980f8a7b87bcc79bf
Merge branch 'ib-iio-hid-sensors-v6.6-rc1' into togreg

The deta angle and deta velocity channels were added in parallel with
color temperature and chromacity so this merge had to assign a
consistent order. I put the color related ones second.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Documentation/ABI/testing/sysfs-bus-iio
drivers/iio/industrialio-core.c
drivers/iio/light/hid-sensor-als.c
include/uapi/linux/iio/types.h
tools/iio/iio_event_monitor.c