From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Apr 2018 16:01:26 +0000 (-0700)
Subject: Merge tag 'for_v4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: v4.17-rc2~23
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0d9cf33b4aabd8de03f80659ceae967ba2b3ba30;p=linux-2.6-block.git

Merge tag 'for_v4.17-rc2' of git://git./linux/kernel/git/jack/linux-fs

 - isofs memory leak fix

 - two fsnotify fixes of event mask handling

 - udf fix of UTF-16 handling

 - couple other smaller cleanups

* tag 'for_v4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Fix leak of UTF-16 surrogates into encoded strings
  fs: ext2: Adding new return type vm_fault_t
  isofs: fix potential memory leak in mount option parsing
  MAINTAINERS: add an entry for FSNOTIFY infrastructure
  fsnotify: fix typo in a comment about mark->g_list
  fsnotify: fix ignore mask logic in send_to_group()
  isofs compress: Remove VLA usage
  fs: quota: Replace GFP_ATOMIC with GFP_KERNEL in dquot_init
  fanotify: fix logic of events on child
---

0d9cf33b4aabd8de03f80659ceae967ba2b3ba30