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

[Jonathan Cameron <jic23@kernel.org>]

On Thu, 2 Jul 2026 18:43:32 +0100
Mark Brown <broonie@kernel.org> wrote:

> Hi all,
> 
> Today's linux-next merge of the device-id tree got a conflict in:
> 
>   drivers/iio/accel/stk8ba50.c
> 
> between commit:
> 
>   e8de771d80a3a ("iio: accel: stk8ba50: Update includes to match IWYU")
> 
> from the iio tree and commit:
> 
>   80f98bb4f07ea ("Replace <linux/mod_devicetable.h> by more specific <linux/device-id/*.h> (c files)")
> 
> from the device-id 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.  That header drop patch is likely to cause quite a lot of context
and minor merge conflicts. I guess that'll resolve if anyone affected
merges in rc2 once available.

Jonathan

> 
> diff --cc drivers/iio/accel/stk8ba50.c
> index 4bacc007897ae,d0c53b8ac850a..0000000000000
> --- a/drivers/iio/accel/stk8ba50.c
> +++ b/drivers/iio/accel/stk8ba50.c
> @@@ -7,19 -7,11 +7,18 @@@
>    * STK8BA50 7-bit I2C address: 0x18.
>    */
>   
>  +#include <linux/array_size.h>
>  +#include <linux/bitops.h>
>  +#include <linux/dev_printk.h>
>  +#include <linux/errno.h>
>   #include <linux/i2c.h>
>   #include <linux/interrupt.h>
>  -#include <linux/kernel.h>
>   #include <linux/module.h>
> - #include <linux/mod_devicetable.h>
>  +#include <linux/mutex.h>
>  +#include <linux/pm.h>
>  +#include <linux/sysfs.h>
>   #include <linux/types.h>
>  +
>   #include <linux/iio/buffer.h>
>   #include <linux/iio/iio.h>
>   #include <linux/iio/sysfs.h>