From: Mark Brown <broonie@kernel•org>
To: Jonathan Cameron <Jonathan.Cameron@huawei•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Tomas Melin <tomas.melin@vaisala•com>
Subject: linux-next: manual merge of the iio tree with the iio-fixes tree
Date: Tue, 20 Jan 2026 15:45:13 +0000 [thread overview]
Message-ID: <aW-jCT9T1qWB_VPP@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1155 bytes --]
Hi all,
Today's linux-next merge of the iio tree got a conflict in:
drivers/iio/adc/ad9467.c
between commit:
92452b1760ff2 ("iio: adc: ad9467: fix ad9434 vref mask")
from the iio-fixes tree and commit:
bac5e3d20c453 ("iio: adc: ad9467: include two's complement in default mode")
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/ad9467.c
index 2d8f8da3671da,9cfe66425d4e9..0000000000000
--- a/drivers/iio/adc/ad9467.c
+++ b/drivers/iio/adc/ad9467.c
@@@ -94,8 -103,8 +103,8 @@@
*/
#define CHIPID_AD9434 0x6A
- #define AD9434_DEF_OUTPUT_MODE 0x00
+ #define AD9434_DEF_OUTPUT_MODE 0x01
-#define AD9434_REG_VREF_MASK 0xC0
+#define AD9434_REG_VREF_MASK GENMASK(4, 0)
/*
* Analog Devices AD9467 16-Bit, 200/250 MSPS ADC
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-01-20 15:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-20 15:45 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-07 10:05 linux-next: manual merge of the iio tree with the iio-fixes tree Thierry Reding
2026-05-07 10:29 ` Jonathan Cameron
2026-05-07 10:41 ` Thierry Reding
2025-05-06 5:57 Stephen Rothwell
2025-05-06 5:51 Stephen Rothwell
2024-05-31 4:06 Stephen Rothwell
2024-04-30 5:15 Stephen Rothwell
2024-05-02 8:36 ` Jean-Baptiste Maneyrol
2024-05-02 8:58 ` Jonathan Cameron
2021-10-01 3:38 Stephen Rothwell
2021-10-01 8:27 ` 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=aW-jCT9T1qWB_VPP@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=Jonathan.Cameron@huawei$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tomas.melin@vaisala$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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