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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAMuHMdUdFwoHqwtH-eL3dc3s612fV4v7gYteuCZxZnPpHOFh-Q@mail.gmail.com>
Date:   Tue, 12 Jul 2022 10:47:24 +0200
From:   Geert Uytterhoeven <geert@...ux-m68k.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Anshuman Khandual <anshuman.khandual@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Zhang Jiaming <jiaming@...china.com>
Subject: Re: linux-next: manual merge of the mm tree with the m68k tree

Hi Stephen,

On Tue, Jul 12, 2022 at 10:42 AM Stephen Rothwell <sfr@...b.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@...ux-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