linux-next: manual merge of the mm tree with the m68k tree

linux-next: manual merge of the mm tree with the m68k tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 762 bytes --]

Hi all,

Today's linux-next merge of the mm tree got a conflict in:

  arch/m68k/include/asm/sun3_pgtable.h

between commit:

  c2a6236024b7 ("m68k: sun3: Fix spelling mistake")

from the m68k tree and commit:

  e7911fea382d ("m68k/mm: enable ARCH_HAS_VM_GET_PAGE_PROT")

from the mm tree.

I fixed it up (the latter removed the comment that the former updated)
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 --]

Re: linux-next: manual merge of the mm tree with the m68k tree

[Geert Uytterhoeven]

Hi Stephen,

On Tue, Jul 12, 2022 at 10:42 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the mm tree got a conflict in:
>
>   arch/m68k/include/asm/sun3_pgtable.h
>
> between commit:
>
>   c2a6236024b7 ("m68k: sun3: Fix spelling mistake")
>
> from the m68k tree and commit:
>
>   e7911fea382d ("m68k/mm: enable ARCH_HAS_VM_GET_PAGE_PROT")
>
> from the mm tree.
>
> I fixed it up (the latter removed the comment that the former updated)
> 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.

Ah, right. The previous version of the m68k/mm patch didn't remove
the comment, so I thought the spelling fix was safe to apply.

I'll drop the spelling fix from the m68k for-v5.20 branch.

Thanks for reporting!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds