Re: linux-next: manual merge of the mtd tree with the mtd-fixes tree

Stephen Rothwell
2022-10-19T07:08:42Z

[-- 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.