* linux-next: manual merge of the mtd tree with the mtd-fixes tree
@ 2022-10-18 22:28 Stephen Rothwell
2022-10-19 5:31 ` Rafał Miłecki
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2022-10-18 22:28 UTC (permalink / raw)
To: Richard Weinberger, Boris Brezillon
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Miquel Raynal,
Rafał Miłecki
[-- Attachment #1: Type: text/plain, Size: 792 bytes --]
Hi all,
Today's linux-next merge of the mtd tree got a conflict in:
drivers/mtd/mtdcore.c
between commit:
12b58961de0b ("mtd: core: add missing of_node_get() in dynamic partitions code")
from the mtd-fixes tree and commit:
63db0cb35e1c ("mtd: core: simplify (a bit) code find partition-matching dynamic OF node")
from the mtd tree.
I fixed it up (I just used the latter version) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the mtd tree with the mtd-fixes tree
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
0 siblings, 1 reply; 6+ messages in thread
From: Rafał Miłecki @ 2022-10-19 5:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Richard Weinberger, Boris Brezillon, Linux Kernel Mailing List,
Linux Next Mailing List, Miquel Raynal
Hi,
On 2022-10-19 00:28, Stephen Rothwell wrote:
> Today's linux-next merge of the mtd tree got a conflict in:
>
> drivers/mtd/mtdcore.c
>
> between commit:
>
> 12b58961de0b ("mtd: core: add missing of_node_get() in dynamic
> partitions code")
>
> from the mtd-fixes tree and commit:
>
> 63db0cb35e1c ("mtd: core: simplify (a bit) code find
> partition-matching dynamic OF node")
>
> from the mtd tree.
>
> I fixed it up (I just used the latter version) 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.
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;
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the mtd tree with the mtd-fixes tree
2022-10-19 5:31 ` Rafał Miłecki
@ 2022-10-19 7:08 ` Stephen Rothwell
2022-10-19 13:49 ` Miquel Raynal
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2022-10-19 7:08 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Richard Weinberger, Boris Brezillon, Linux Kernel Mailing List,
Linux Next Mailing List, Miquel Raynal
[-- 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the mtd tree with the mtd-fixes tree
2022-10-19 7:08 ` Stephen Rothwell
@ 2022-10-19 13:49 ` Miquel Raynal
2022-10-19 14:06 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Miquel Raynal @ 2022-10-19 13:49 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rafał Miłecki, Richard Weinberger, Boris Brezillon,
Linux Kernel Mailing List, Linux Next Mailing List
Hi,
sfr@canb.auug.org.au wrote on Wed, 19 Oct 2022 18:08:07 +1100:
> 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.
Thanks Rafał for the right resolution and Stephen for carrying the fix.
I'll send the fixes PR soon and rebase on top of an -rc containing it
to avoid this conflict resolution to be needed when sending the final
PR to Linus during the next MW.
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the mtd tree with the mtd-fixes tree
2022-10-19 13:49 ` Miquel Raynal
@ 2022-10-19 14:06 ` Stephen Rothwell
2022-10-20 8:10 ` Miquel Raynal
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2022-10-19 14:06 UTC (permalink / raw)
To: Miquel Raynal
Cc: Rafał Miłecki, Richard Weinberger, Boris Brezillon,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
Hi Miquel,
On Wed, 19 Oct 2022 15:49:07 +0200 Miquel Raynal <miquel.raynal@bootlin.com> wrote:
>
> Thanks Rafał for the right resolution and Stephen for carrying the fix.
> I'll send the fixes PR soon and rebase on top of an -rc containing it
> to avoid this conflict resolution to be needed when sending the final
> PR to Linus during the next MW.
Why not just merge your mtd/fixes branch into your mtd/branch (rather
than rebasing)?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the mtd tree with the mtd-fixes tree
2022-10-19 14:06 ` Stephen Rothwell
@ 2022-10-20 8:10 ` Miquel Raynal
0 siblings, 0 replies; 6+ messages in thread
From: Miquel Raynal @ 2022-10-20 8:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rafał Miłecki, Richard Weinberger, Boris Brezillon,
Linux Kernel Mailing List, Linux Next Mailing List
Hi Stephen,
sfr@canb.auug.org.au wrote on Thu, 20 Oct 2022 01:06:47 +1100:
> Hi Miquel,
>
> On Wed, 19 Oct 2022 15:49:07 +0200 Miquel Raynal <miquel.raynal@bootlin.com> wrote:
> >
> > Thanks Rafał for the right resolution and Stephen for carrying the fix.
> > I'll send the fixes PR soon and rebase on top of an -rc containing it
> > to avoid this conflict resolution to be needed when sending the final
> > PR to Linus during the next MW.
>
> Why not just merge your mtd/fixes branch into your mtd/branch (rather
> than rebasing)?
>
Yes, actually I usually wait for the next -rc and merge Linus' tag.
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-10-20 8:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2022-10-19 13:49 ` Miquel Raynal
2022-10-19 14:06 ` Stephen Rothwell
2022-10-20 8:10 ` Miquel Raynal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox