diff options
author | Linus Torvalds | 2021-02-22 13:23:29 -0800 |
---|---|---|
committer | Linus Torvalds | 2021-02-22 13:23:29 -0800 |
commit | db990385427c278eef56aac2e2588ec8b8cab5b4 (patch) | |
tree | 3a8af82300f456626fefb7201a8cf216d32011c8 /net/ipv6/esp6_offload.c | |
parent | d61c6a58ae30e80fb68925877cab06ad7a4ce41e (diff) | |
parent | ac7b79fd190b02e7151bc7d2b9da692f537657f3 (diff) |
Merge tag 'fsnotify_for_v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull fsnotify update from Jan Kara:
"Make inotify groups be charged against appropriate memcgs"
* tag 'fsnotify_for_v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
inotify, memcg: account inotify instances to kmemcg
Diffstat (limited to 'net/ipv6/esp6_offload.c')
0 files changed, 0 insertions, 0 deletions