| commit | eafb7b9d01a7001ff8e9624e7dcb706844f981b3 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Fri Nov 04 10:31:23 2016 -0600 |
| committer | James Morris <james.l.morris@oracle.com> | Fri Nov 04 10:31:23 2016 -0600 |
| tree | 59831f33afc57b1979b4869f93944abb6febc446 | |
| parent | 07d9a380680d1c0eb51ef87ff2eab5c994949e69 [diff] | |
| parent | d881d25cf5bc2fafbbfb383a475278977e1bd55a [diff] |
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