Re: linux-next: manual merge of the iio tree with the iio-fixes tree

From: Geert Uytterhoeven

Date: Tue Nov 17 2026 - 04:40:22 EST


Hi Mark,

On Tue, 3 Nov 2026 at 17:24, Mark Brown <broonie@xxxxxxxxxx> wrote:
> Today's linux-next merge of the iio tree got a conflict in:
>
> drivers/iio/humidity/hid-sensor-humidity.c
>
> between commit:
>
> 340d44bdf9db0 ("iio: humidity: hid-sensor-humidity: Use per-instance callbacks")
>
> from the iio-fixes tree and commit:
>
> 5ee5d306f1bd1 ("iio: humidity: hid-sensor-humidity: convert probe and teardown to devm-managed resources")
>
> from the iio tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks for your resolution!

> --- a/drivers/iio/humidity/hid-sensor-humidity.c
> +++ b/drivers/iio/humidity/hid-sensor-humidity.c
> @@@ -236,39 -241,13 +237,17 @@@ static int hid_humidity_probe(struct pl
>
> platform_set_drvdata(pdev, indio_dev);
>
> - humidity_callbacks.pdev = pdev;
> + humid_st->callbacks = (struct hid_sensor_hub_callbacks) {
> + .send_event = humidity_proc_event,
> + .capture_sample = humidity_capture_sample,
> + .pdev = pdev,
> + };
> - ret = sensor_hub_register_callback(hsdev, HID_USAGE_SENSOR_HUMIDITY,
> + ret = devm_sensor_hub_register_callback(dev, hsdev, HID_USAGE_SENSOR_HUMIDITY,
> - &humidity_callbacks);
> + &humid_st->callbacks);

The continuation is now misaligned.

> if (ret)

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds