From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@Huawei•com>
Cc: Billy Tsai <billy_tsai@aspeedtech•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the iio tree with the iio-fixes tree
Date: Fri, 1 Oct 2021 13:38:41 +1000 [thread overview]
Message-ID: <20211001133841.2b46b779@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]
Hi all,
Today's linux-next merge of the iio tree got a conflict in:
drivers/iio/adc/aspeed_adc.c
between commit:
eb795cd97365 ("iio: adc: aspeed: set driver data when adc probe.")
from the iio-fixes tree and commit:
e96b152c6cc2 ("iio: adc: aspeed: Keep model data to driver data.")
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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/iio/adc/aspeed_adc.c
index 34ec0c28b2df,9e2c85c3cbe9..000000000000
--- a/drivers/iio/adc/aspeed_adc.c
+++ b/drivers/iio/adc/aspeed_adc.c
@@@ -183,7 -492,7 +492,8 @@@ static int aspeed_adc_probe(struct plat
data = iio_priv(indio_dev);
data->dev = &pdev->dev;
+ platform_set_drvdata(pdev, indio_dev);
+ data->model_data = of_device_get_match_data(&pdev->dev);
data->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(data->base))
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-10-01 3:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 3:38 Stephen Rothwell [this message]
2021-10-01 8:27 ` linux-next: manual merge of the iio tree with the iio-fixes tree Jonathan Cameron
-- strict thread matches above, loose matches on Subject: below --
2024-04-30 5:15 Stephen Rothwell
2024-05-02 8:36 ` Jean-Baptiste Maneyrol
2024-05-02 8:58 ` Jonathan Cameron
2024-05-31 4:06 Stephen Rothwell
2025-05-06 5:51 Stephen Rothwell
2025-05-06 5:57 Stephen Rothwell
2026-01-20 15:45 Mark Brown
2026-05-07 10:05 Thierry Reding
2026-05-07 10:29 ` Jonathan Cameron
2026-05-07 10:41 ` Thierry Reding
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=20211001133841.2b46b779@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jonathan.Cameron@Huawei$(echo .)com \
--cc=billy_tsai@aspeedtech$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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