diff options
| author | David S. Miller <davem@davemloft.net> | 2019-12-31 22:37:13 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-31 22:37:13 +0100 |
| commit | 31d518f35e1a80268a24a855be9477eb458540ad (patch) | |
| tree | 28494f630aede8f95d4ed2ebbfd14c222bd24fa6 /security/apparmor | |
| parent | net/ncsi: Fix gma flag setting after response (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-31d518f35e1a80268a24a855be9477eb458540ad.tar.xz linux-31d518f35e1a80268a24a855be9477eb458540ad.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Simple overlapping changes in bpf land wrt. bpf_helper_defs.h
handling.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions