From: James Morris <james.l.morris@oracle.com>
Date: Fri, 4 Nov 2016 16:31:23 +0000 (-0600)
Subject: Merge tag 'seccomp-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eafb7b9d01a7001ff8e9624e7dcb706844f981b3;p=linux-beck.git

Merge tag 'seccomp-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into ra-next

- fix function prototype documentation
- fix samples to include NNP setting
- fix samples to avoid rule truncation
- fix samples hostprogs variable in Makefile
---

eafb7b9d01a7001ff8e9624e7dcb706844f981b3