All of lore.kernel.org
 help / color / mirror / Atom feed
From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-fsdevel@vger.kernel.org
Subject: vfs.git#fixes: how to deal with duplicates of cherry-picked commits?
Date: Tue, 23 Oct 2018 17:04:45 +0100	[thread overview]
Message-ID: <20181023160445.GY32577@ZenIV.linux.org.uk> (raw)

	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(-)

             reply	other threads:[~2018-10-24  0:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-23 16:04 Al Viro [this message]
2018-10-23 16:35 ` vfs.git#fixes: how to deal with duplicates of cherry-picked commits? Linus Torvalds
2018-10-24 16:27 ` Linus Torvalds

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181023160445.GY32577@ZenIV.linux.org.uk \
    --to=viro@zeniv.linux.org.uk \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.