Linux IIO development
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Jonathan Cameron <jic23@kernel.org>
Cc: linux-iio@vger.kernel.org
Subject: Re: [PULL] IIO: New device support, features and cleanup for 6.16
Date: Wed, 21 May 2025 14:21:35 +0200	[thread overview]
Message-ID: <2025052113-reproach-zebra-005b@gregkh> (raw)
In-Reply-To: <2025052102-vanilla-acorn-606f@gregkh>

On Wed, May 21, 2025 at 02:20:34PM +0200, Greg KH wrote:
> 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!

Ick, I get the following errors when trying to merge this:

Commit: 59e1bb0b7f4e ("iio: adc: ad4000: Avoid potential double data word read")
	Fixes tag: Fixes: d0dba3df842f ("iio: adc: ad4000: Add support for SPI offload")
	Has these problem(s):
		- Target SHA1 does not exist
Commit: 6f9b765075be ("iio: dac: ad5592r: Delete stray unlock in ad5592r_write_raw()")
	Fixes tag: Fixes: f8fedb167ba4 ("iio: dac: ad5592r: use lock guards")
	Has these problem(s):
		- Target SHA1 does not exist
Commit: 959fd4301e1a ("docs: iio: ad3552r: fix malformed table")
	Fixes tag: Fixes: 9a259b51e3ea ("docs: iio: add documentation for ad3552r driver")
	Has these problem(s):
		- Target SHA1 does not exist

So I can't take it, sorry :(

greg k-h

  reply	other threads:[~2025-05-21 12:21 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-17 19:23 [PULL] IIO: New device support, features and cleanup for 6.16 Jonathan Cameron
2025-05-18 18:09 ` Jonathan Cameron
2025-05-21 12:20   ` Greg KH
2025-05-21 12:21     ` Greg KH [this message]
2025-05-21 12:31       ` Jonathan Cameron
2025-05-21 13:30         ` Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2025052113-reproach-zebra-005b@gregkh \
    --to=gregkh@linuxfoundation.org \
    --cc=jic23@kernel.org \
    --cc=linux-iio@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox