From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafał Miłecki" <rafal@milecki.pl>
Cc: Richard Weinberger <richard.weinberger@gmail.com>,
Boris Brezillon <boris.brezillon@collabora.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: Re: linux-next: manual merge of the mtd tree with the mtd-fixes tree
Date: Wed, 19 Oct 2022 18:08:07 +1100 [thread overview]
Message-ID: <20221019180807.6dac24a0@canb.auug.org.au> (raw)
In-Reply-To: <23d311953ef13608be2283a05b2e853d@milecki.pl>
[-- Attachment #1: Type: text/plain, Size: 841 bytes --]
Hi Rafał,
On Wed, 19 Oct 2022 07:31:57 +0200 Rafał Miłecki <rafal@milecki.pl> wrote:
>
> this isn't exactly the correct fix, of_node_get() is still needed.
>
> I'll make sure we let Linus know about this conflict (and solution) when
> sending 6.2 pull request.
>
>
> diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
> index 07249af4f890..20fcedc3021e 100644
> --- a/drivers/mtd/mtdcore.c
> +++ b/drivers/mtd/mtdcore.c
> @@ -559,7 +559,7 @@ static void mtd_check_of_node(struct mtd_info *mtd)
> if (!mtd_is_partition(mtd))
> return;
>
> - parent_dn = mtd_get_of_node(mtd->parent);
> + parent_dn = of_node_get(mtd_get_of_node(mtd->parent));
> if (!parent_dn)
> return;
>
Thanks for checking. I have added that to my resolution for tomorrow
onward.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-10-19 7:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 22:28 linux-next: manual merge of the mtd tree with the mtd-fixes tree Stephen Rothwell
2022-10-19 5:31 ` Rafał Miłecki
2022-10-19 7:08 ` Stephen Rothwell [this message]
2022-10-19 13:49 ` Miquel Raynal
2022-10-19 14:06 ` Stephen Rothwell
2022-10-20 8:10 ` Miquel Raynal
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=20221019180807.6dac24a0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=boris.brezillon@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=rafal@milecki.pl \
--cc=richard.weinberger@gmail.com \
/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 NNTP newsgroup(s).