We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>