linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20220712184238.3670f277@canb.auug.org.au>
Date:   Tue, 12 Jul 2022 18:42:38 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:     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: linux-next: manual merge of the mm tree with the m68k tree

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

Content of type "application/pgp-signature" skipped