From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from zeniv.linux.org.uk ([195.92.253.2]:43006 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726970AbeJXA2r (ORCPT ); Tue, 23 Oct 2018 20:28:47 -0400 Date: Tue, 23 Oct 2018 17:04:45 +0100 From: Al Viro To: Linus Torvalds Cc: linux-fsdevel@vger.kernel.org Subject: vfs.git#fixes: how to deal with duplicates of cherry-picked commits? Message-ID: <20181023160445.GY32577@ZenIV.linux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-fsdevel-owner@vger.kernel.org List-ID: I'd just noticed that one of the commits in #fixes (cachefiles: fix the race between cachefiles_bury_object() and rmdir(2)) got cherry-picked into mainline (with added S-o-b by Dave Howells); my fault for not spotting that earlier. Which way do you prefer to handle that kind of thing? Pull as-is (it merges clean, just results in two copies of commit in the tree), rebase the other two commits (e.g. on top of 4.19), send them as individual patches or perhaps cherry-pick them into mainline on your own? Up to you; pull request for the branch would've been as below, with all commits independent from each other. The first one is the duplicate in question... The following changes since commit ffc4c92227db5699493e43eb140b4cb5904c30ff: sysfs: Do not return POSIX ACL xattrs via listxattr (2018-09-18 07:30:48 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git fixes for you to fetch changes up to 3df629d873f8683af6f0d34dfc743f637966d483: gfs2_meta: ->mount() can get NULL dev_name (2018-10-13 00:19:13 -0400) ---------------------------------------------------------------- Al Viro (3): cachefiles: fix the race between cachefiles_bury_object() and rmdir(2) ecryptfs_rename(): verify that lower dentries are still OK after lock_rename() gfs2_meta: ->mount() can get NULL dev_name fs/cachefiles/namei.c | 2 +- fs/ecryptfs/inode.c | 11 ++++++++--- fs/gfs2/ops_fstype.c | 3 +++ 3 files changed, 12 insertions(+), 4 deletions(-)