Re: linux-next: manual merge of the iio tree with the tip tree
From: Mark Brown
Date: Mon Feb 02 2026 - 18:52:13 EST
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:
signature.asc
Description: PGP signature