linux-kernel - Re: linux-next: manual merge of the mm-nonmm-stable tree with the userns 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-prev] [day] [month] [year] [list]

Message-Id: <20220512130220.c9ec9b150c9d5f3848ef3389@linux-foundation.org>
Date:   Thu, 12 May 2022 13:02:20 -0700
From:   Andrew Morton <akpm@...ux-foundation.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     "Eric W. Biederman" <ebiederm@...ssion.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Tiezhu Yang <yangtiezhu@...ngson.cn>
Subject: Re: linux-next: manual merge of the mm-nonmm-stable tree with the
 userns tree

On Thu, 12 May 2022 18:22:15 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the mm-nonmm-stable tree got a conflict in:
> 
>   include/linux/ptrace.h
> 
> between commit:
> 
>   c200e4bb44e8 ("ptrace/um: Replace PT_DTRACE with TIF_SINGLESTEP")
> 
> from the userns tree and commit:
> 
>   a9866bef5171 ("ptrace: fix wrong comment of PT_DTRACE")
> 
> from the mm-nonmm-stable tree.
> 
> I fixed it up (the former removed the line modified by the latter, so I
> just removed it) 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.

Thanks.

Eric, I'll send that patch to you for inclusion in the userns tree,
please.