Merge remote-tracking branch 'seccomp/for-next/seccomp'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 3 Jun 2021 06:37:40 +0000 (16:37 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 3 Jun 2021 06:37:40 +0000 (16:37 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 06:37:40 +0000 (16:37 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 06:37:40 +0000 (16:37 +1000)
diff --cc tools/testing/selftests/seccomp/seccomp_bpf.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 06:37:40 +0000 (16:37 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 06:37:40 +0000 (16:37 +1000)