Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Jan 2018 01:13:21 +0000 (17:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Jan 2018 01:13:21 +0000 (17:13 -0800)
commit75d4276e83a353d5e41da676f418d4a12f6f6e6c
treed3d9a43afa64f5d358b99b987b7ad8c0e2847dac
parent5b6c02f38315b720c593c6079364855d276886aa
parent040ee69226f8a96b7943645d68f41d5d44b5ff7d
Merge branch 'for-linus' of git://git./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.
net/netfilter/xt_bpf.c