linux-kernel - linux-next: manual merge of the mm 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: <20221107135239.77e8b1da@canb.auug.org.au>
Date:   Mon, 7 Nov 2022 13:52:39 +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>,
        "Masami Hiramatsu (Google)" <mhiramat@...nel.org>,
        Rafael Mendonca <rafaelmendsr@...il.com>,
        wuqiang <wuqiang.matt@...edance.com>
Subject: linux-next: manual merge of the mm tree with Linus' tree

Hi all,

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

  kernel/trace/fprobe.c

between commit:

  d05ea35e7eea ("fprobe: Check rethook_alloc() return in rethook initialization")

from Linus' tree and commit:

  7ceeb4e77fec ("kprobes,lib: kretprobe scalability improvement")

from the mm tree.

I fixed it up (the latter included the fix from the former, so I just
used the latter) 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