linux-kernel - linux-next: manual merge of the akpm tree with the mm-hotfixes 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: <20220510223530.67d9a27f@canb.auug.org.au>
Date:   Tue, 10 May 2022 22:35:30 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>
Cc:     Chengming Zhou <zhouchengming@...edance.com>,
        Joel Savitz <jsavitz@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the akpm tree with the mm-hotfixes tree

Hi all,

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

  tools/testing/selftests/vm/Makefile

between commit:

  e33ebf536f3e ("selftests: vm: Makefile: rename TARGETS to VMTARGETS")

from the mm-hotfixes tree and patch:

  "kselftest/vm: override TARGETS from arguments"

from the akpm tree.

I fixed it up the obvious way 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