From: Mark Brown <broonie@kernel.org>
To: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Jonathan Santos <Jonathan.Santos@analog.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Thomas Gleixner <tglx@kernel.org>
Subject: linux-next: manual merge of the iio tree with the tip tree
Date: Mon, 2 Feb 2026 15:10:44 +0000 [thread overview]
Message-ID: <aYC-dATLw09TXP4K@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 931 bytes --]
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.
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-02-02 15:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-02 15:10 Mark Brown [this message]
2026-02-02 23:48 ` linux-next: manual merge of the iio tree with the tip tree Thomas Gleixner
2026-02-02 23:51 ` Mark Brown
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=aYC-dATLw09TXP4K@sirena.org.uk \
--to=broonie@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=Jonathan.Santos@analog.com \
--cc=bigeasy@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tglx@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