Skip to contentSkip to conversation

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

PATCH Mark Brown 2 participants 3 messages Feb 2

Subsystems (4)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

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.

drivers/iio/adc/ad7768-1.c +0 -0
diff --cc drivers/iio/adc/ad7768-1.c
index 84ce23c8e5782,fcd8aea7152e8..0000000000000
#1 lore raw

drivers/iio/adc/ad7768-1.c

Quoted 26 lines · Mark Brown

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.

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

That's an impressive fixup diff :)

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

Thanks,

tglx

author maintainer
#2 lore raw
Quoted 8 lines · Thomas Gleixner

drivers/iio/adc/ad7768-1.c

Quoted 4 lines · Mark Brown
drivers/iio/adc/ad7768-1.c +0 -0
diff --cc drivers/iio/adc/ad7768-1.c
index 84ce23c8e5782,fcd8aea7152e8..0000000000000

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.

Quoted 1 line

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

Thanks.