linux-next: manual merge of the iio tree with the tip tree

linux-next: manual merge of the iio tree with the tip tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

Hi all,

Today's linux-next merge of the iio tree got a conflict in:

  drivers/iio/adc/ad7768-1.c

between commit:

  c04731b5f1502 ("iio: Replace IRQF_ONESHOT with IRQF_NO_THREAD")

from the tip tree and commits:

  ff085189cb170 ("iio: adc: ad7768-1: add support for ADAQ776x-1 ADC Family")
  ac9fabd578a03 ("iio: Replace IRQF_ONESHOT with IRQF_NO_THREAD")

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.

diff --cc drivers/iio/adc/ad7768-1.c
index 84ce23c8e5782,fcd8aea7152e8..0000000000000
--- a/drivers/iio/adc/ad7768-1.c
+++ b/drivers/iio/adc/ad7768-1.c

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Thomas Gleixner]

On Mon, Feb 02 2026 at 15:10, Mark Brown wrote:
> Today's linux-next merge of the iio tree got a conflict in:
>
>   drivers/iio/adc/ad7768-1.c
>
> between commit:
>
>   c04731b5f1502 ("iio: Replace IRQF_ONESHOT with IRQF_NO_THREAD")
>
> from the tip tree and commits:
>
>   ff085189cb170 ("iio: adc: ad7768-1: add support for ADAQ776x-1 ADC Family")
>   ac9fabd578a03 ("iio: Replace IRQF_ONESHOT with IRQF_NO_THREAD")
>
> 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.
>
> diff --cc drivers/iio/adc/ad7768-1.c
> index 84ce23c8e5782,fcd8aea7152e8..0000000000000
> --- a/drivers/iio/adc/ad7768-1.c
> +++ b/drivers/iio/adc/ad7768-1.c

That's an impressive fixup diff :)

I'll zap the iio: commit from my tree tomorrow...

Thanks,

        tglx

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 649 bytes --]

On Tue, Feb 03, 2026 at 12:48:41AM +0100, Thomas Gleixner wrote:
> On Mon, Feb 02 2026 at 15:10, Mark Brown wrote:

> > diff --cc drivers/iio/adc/ad7768-1.c
> > index 84ce23c8e5782,fcd8aea7152e8..0000000000000
> > --- a/drivers/iio/adc/ad7768-1.c
> > +++ b/drivers/iio/adc/ad7768-1.c

> That's an impressive fixup diff :)

Yeah, git does that sometimes - AFAICT it's when the resolution
corresponds entirely to one side of the diff (which it does in this
case), possibly other times too.  I'm sure there's a way to persuade it
to do something sensible here but didn't figure it out yet.

> I'll zap the iio: commit from my tree tomorrow...

Thanks.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]