Re: linux-next: manual merge of the seccomp tree with the kselftest tree

2020-08-05 Thread Stephen Rothwell
Hi Shuah, On Wed, 5 Aug 2020 16:24:04 -0600 Shuah Khan wrote: > > This is sorted out. I added a note to my pull request. Thanks for letting me know. -- Cheers, Stephen Rothwell pgpghIdO3Tsip.pgp Description: OpenPGP digital signature

Re: linux-next: manual merge of the seccomp tree with the kselftest tree

2020-08-05 Thread Shuah Khan
On 8/4/20 11:45 PM, Stephen Rothwell wrote: Hi all, On Mon, 20 Jul 2020 15:59:17 +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: 4c6614dc86ad ("selftests/seccomp: Che

Re: linux-next: manual merge of the seccomp tree with the kselftest tree

2020-08-04 Thread Stephen Rothwell
Hi all, On Mon, 20 Jul 2020 15:59:17 +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: > > 4c6614dc86ad ("selftests/seccomp: Check ENOSYS under tracing") > >

linux-next: manual merge of the seccomp tree with the kselftest tree

2020-07-19 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the seccomp tree got a conflict in: tools/testing/selftests/seccomp/seccomp_bpf.c between commit: 4c6614dc86ad ("selftests/seccomp: Check ENOSYS under tracing") from the kselftest tree and commit: 11eb004ef7ea ("selftests/seccomp: Check ENOSYS under t

Re: linux-next: manual merge of the seccomp tree with the kselftest tree

2020-07-07 Thread Kees Cook
On Tue, Jul 07, 2020 at 01:27:59PM -0600, Shuah Khan wrote: > 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/

Re: linux-next: manual merge of the seccomp tree with the kselftest tree

2020-07-07 Thread Shuah Khan
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 i

Re: linux-next: manual merge of the seccomp tree with the kselftest tree

2020-07-07 Thread Kees Cook
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 th

linux-next: manual merge of the seccomp tree with the kselftest tree

2020-07-06 Thread Stephen Rothwell
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 fo