Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1DDEC04AA7 for ; Mon, 13 May 2019 16:21:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD52121473 for ; Mon, 13 May 2019 16:21:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729517AbfEMQVQ (ORCPT ); Mon, 13 May 2019 12:21:16 -0400 Received: from mx2.suse.de ([195.135.220.15]:33098 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728579AbfEMQVP (ORCPT ); Mon, 13 May 2019 12:21:15 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id DAF3DAD5E; Mon, 13 May 2019 16:21:14 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 309411E3E10; Mon, 13 May 2019 18:21:14 +0200 (CEST) Date: Mon, 13 May 2019 18:21:14 +0200 From: Jan Kara To: Linus Torvalds Cc: linux-fsdevel@vger.kernel.org Subject: [GIT PULL] Fsnotify changes for v5.2-rc1 Message-ID: <20190513162114.GC13297@quack2.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org 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 SUSE Labs, CR