linux-kernel - Re: linux-next: manual merge of the userns tree with the asm-generic 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: <20220325095945.28cf4f6b@canb.auug.org.au>
Date:   Fri, 25 Mar 2022 09:59:45 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Eric W. Biederman" <ebiederm@...ssion.com>
Cc:     Arnd Bergmann <arnd@...db.de>, Alan Kao <alankao@...estech.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the userns tree with the
 asm-generic tree

Hi all,

On Tue, 15 Mar 2022 18:48:40 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> Today's linux-next merge of the userns tree got conflicts in:
> 
>   arch/nds32/include/asm/syscall.h
>   arch/nds32/kernel/ptrace.c
>   arch/nds32/kernel/signal.c
> 
> between commit:
> 
>   aec499c75cf8 ("nds32: Remove the architecture")
> 
> from the asm-generic tree and commits:
> 
>   153474ba1a4a ("ptrace: Create ptrace_report_syscall_{entry,exit} in ptrace.h")
>   03248addadf1 ("resume_user_mode: Move to resume_user_mode.h")
> 
> from the userns tree.
> 
> I fixed it up (I just removed the files) 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.

These are now conflicts between the userns tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped