linux-kernel - linux-next: manual merge of the akpm-current tree with Linus' 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>] [day] [month] [year] [list]

Message-ID: <20210208231052.6af62234@canb.auug.org.au>
Date:   Mon, 8 Feb 2021 23:10:52 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Shaokun Zhang <zhangshaokun@...ilicon.com>,
        Thomas Gleixner <tglx@...utronix.de>,
        Yuqi Jin <jinyuqi@...wei.com>
Subject: linux-next: manual merge of the akpm-current tree with Linus' tree

Hi all,

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

  lib/cpumask.c

between commit:

  2452483d9546 ("Revert "lib: Restrict cpumask_local_spread to houskeeping CPUs"")

from Linus' tree and commits:

  9eca9bb9bd98 ("lib: optimize cpumask_local_spread()")
  a7ac26ba236f ("lib-optimize-cpumask_local_spread-v8")

from the akpm-current tree.

I fixed it up (it was sufficiently messy that I just dropped the 2
commits from the akpm-current tree for today) 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