summary refs log tree commit diff
path: root/kernel/trace/bpf_trace.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-06 17:13:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-06 17:13:21 -0800
commit75d4276e83a353d5e41da676f418d4a12f6f6e6c (patch)
treed3d9a43afa64f5d358b99b987b7ad8c0e2847dac /kernel/trace/bpf_trace.c
parent5b6c02f38315b720c593c6079364855d276886aa (diff)
parent040ee69226f8a96b7943645d68f41d5d44b5ff7d (diff)
downloadlinux-75d4276e83a353d5e41da676f418d4a12f6f6e6c.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:

 - untangle sys_close() abuses in xt_bpf

 - deal with register_shrinker() failures in sget()

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix "netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'"
  sget(): handle failures of register_shrinker()
  mm,vmscan: Make unregister_shrinker() no-op if register_shrinker() failed.
Diffstat (limited to 'kernel/trace/bpf_trace.c')
0 files changed, 0 insertions, 0 deletions