linux-next: manual merge of the iio tree with the tip tree
Mark Brown
maintainerHi 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
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.cbetween commit:
c04731b5f1502("iio: ReplaceIRQF_ONESHOTwithIRQF_NO_THREAD")from the tip tree and commits:
ff085189cb170("iio: adc: ad7768-1: add support for ADAQ776x-1 ADC Family")ac9fabd578a03("iio: ReplaceIRQF_ONESHOTwithIRQF_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
That's an impressive fixup diff :)
I'll zap the iio: commit from my tree tomorrow...
Thanks,
tglx
Mark Brown
maintainerQuoted 8 lines · Thomas Gleixner
drivers/iio/adc/ad7768-1.c
Quoted 4 lines · Mark Brown
drivers/iio/adc/ad7768-1.c +0
-0That'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.