From: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Cc: Billy Tsai <billy_tsai@aspeedtech.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the iio tree with the iio-fixes tree
Date: Fri, 1 Oct 2021 09:27:46 +0100 [thread overview]
Message-ID: <20211001092746.00006ef5@Huawei.com> (raw)
In-Reply-To: <20211001133841.2b46b779@canb.auug.org.au>
On Fri, 1 Oct 2021 13:38:41 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
>
Thanks.
Looks good to me.
Jonathan
> --
> 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))
next prev parent reply other threads:[~2021-10-01 8:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 3:38 linux-next: manual merge of the iio tree with the iio-fixes tree Stephen Rothwell
2021-10-01 8:27 ` Jonathan Cameron [this message]
-- 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
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=20211001092746.00006ef5@Huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=billy_tsai@aspeedtech.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).