Skip to contentSkip to conversation

Fsnotify changes for v5.2-rc1

GIT PULL Merged Jan Kara 2 participants 2 messages May 13, 2019 VFS

lore
Share & tools
lore

Jan Kara

author reviewer
#0 lore raw

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

Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR
merge bot Merged
#1 lore raw
The pull request you sent on Mon, 13 May 2019 18:21:14 +0200:

The pull request you sent on Mon, 13 May 2019 18:21:14 +0200:

Quoted 1 line

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

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d4c608115c6203efbab14befab90a6d1b61177d8

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker