linux-kernel - linux-next: manual merge of the sysctl 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230321132052.7d12fd7d@canb.auug.org.au>
Date:   Tue, 21 Mar 2023 13:20:52 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Luis Chamberlain <mcgrof@...nel.org>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Jiaqi Yan <jiaqiyan@...gle.com>,
        Kefeng Wang <wangkefeng.wang@...wei.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 sysctl tree with Linus' tree

Hi all,

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

  mm/memory-failure.c

between commit:

  44b8f8bf2438 ("mm: memory-failure: add memory failure stats to sysfs")

from Linus' tree and commit:

  cfe7e6ea5ee2 ("mm: memory-failure: Move memory failure sysctls to its own file")

from the sysctl tree.

I fixed it up (see below) 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