[GIT PULL] Fsnotify changes for v5.2-rc1

* [GIT PULL] Fsnotify changes for v5.2-rc1
@ 2019-05-13 16:21 Jan Kara
  2019-05-13 22:55 ` pr-tracker-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Jan Kara @ 2019-05-13 16:21 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-fsdevel

  Hello Linus,

  could you please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git fsnotify_for_v5.2-rc1

to get two fsnotify fixes. Note that there's a conflict with:
230c6402b1b3 ovl_lookup_real_one(): don't bother with strlen()
25b229dff4ff fsnotify(): switch to passing const struct qstr * for file_name

which you've already merged where one of the moved lines got updated by
these commits. I've pushed out suggested resolution to
fsnotify_testmerge_5.2-rc1.

Top of the tree is 4d8e7055a405. The full shortlog is:

Amir Goldstein (1):
      fsnotify: fix unlink performance regression

Jan Kara (1):
      fsnotify: Clarify connector assignment in fsnotify_add_mark_list()

The diffstat is

 fs/notify/fsnotify.c             | 41 ++++++++++++++++++++++++++++++++++++++++
 fs/notify/mark.c                 |  5 +++++
 include/linux/fsnotify.h         | 33 --------------------------------
 include/linux/fsnotify_backend.h |  4 ++++
 4 files changed, 50 insertions(+), 33 deletions(-)

							Thanks
								Honza

-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

^ permalink raw reply	[flat|nested] 2+ messages in thread