Re: [PULL] IIO: New device support, features and cleanup for 6.16

[Greg KH <gregkh@linuxfoundation.org>]

On Sun, May 18, 2025 at 07:09:33PM +0100, Jonathan Cameron wrote:
> On Sat, 17 May 2025 20:23:41 +0100
> Jonathan Cameron <jic23@kernel.org> wrote:
> 
> > The following changes since commit 0af2f6be1b4281385b618cb86ad946eded089ac8:
> > 
> >   Linux 6.15-rc1 (2025-04-06 13:11:33 -0700)
> > 
> > are available in the Git repository at:
> > 
> >   https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-for-6.16a
> > 
> > for you to fetch changes up to 1b8833364795fb4562b867623f62b401b72238e2:
> > 
> >   dt-bindings: iio: adc: Add ROHM BD79100G (2025-05-17 20:18:30 +0100)
> > 
> Hi Greg,
> 
> I didn't call it out in here because I'd forgotten about it when writing this
> pull request up whilst travelling.  There is a trivial conflict with the
> fixes pull request I just sent that modifies an adjacent line in the 
> ad7606 driver.
> 
> https://lore.kernel.org/all/20250502-iio-adc-ad7606-fix-raw-read-for-18-bit-chips-v1-1-06caa92d8f11@baylibre.com/
> called that out under the ---
> 
> I haven't resolved it locally because I meant to send that fix
> a while back and as mentioned I forgot about it.  Hope you don't mind
> doing the resolution during the merge.
> 
> Stephen's resolution was:
> https://lore.kernel.org/linux-next/20250506155728.65605bae@canb.auug.org.au/

I've used his resolution here as well, thanks!

greg k-h