linux-kernel - Re: linux-next: manual merge of the seccomp tree with the kselftest 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] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 7 Jul 2020 13:27:59 -0600
From:   Shuah Khan <skhan@...uxfoundation.org>
To:     Kees Cook <keescook@...omium.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Shuah Khan <shuah@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Christian Brauner <christian.brauner@...ntu.com>,
        Shuah Khan <skhan@...uxfoundation.org>
Subject: Re: linux-next: manual merge of the seccomp tree with the kselftest
 tree

On 7/7/20 2:26 AM, Kees Cook wrote:
> On Tue, Jul 07, 2020 at 02:57:20PM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the seccomp tree got a conflict in:
>>
>>    tools/testing/selftests/seccomp/seccomp_bpf.c
>>
>> between commit:
>>
>>    9847d24af95c ("selftests/harness: Refactor XFAIL into SKIP")
>>
>> from the kselftest tree and commits:
>>
>>    aae7d264d68b ("selftests/seccomp: Check for EPOLLHUP for user_notif")
>>    11b4beaa0d31 ("selftests/seccomp: Make kcmp() less required")
>>    ef332c970dfa ("selftests/seccomp: Rename user_trap_syscall() to user_notif_syscall()")
>>
>> from the seccomp tree.
> 
> Har har -- a collision of my own creation. Yay lots of trees. ;) I'll
> make this go away; the cause is a harmless cleanup.
> 

Thanks Kees. Let me know if I have to do anything.

thanks,
-- Shuah