From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Jun 2021 06:37:40 +0000 (+1000)
Subject: Merge remote-tracking branch 'seccomp/for-next/seccomp'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=edd0fbb9eeed333b6ba2b8c61c1657fc21802c97;p=users%2Fjedix%2Flinux-maple.git

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

# Conflicts:
#	kernel/seccomp.c
---

edd0fbb9eeed333b6ba2b8c61c1657fc21802c97