Linux filesystem development
 help / color / mirror / Atom feed
* vfs.git#fixes: how to deal with duplicates of cherry-picked commits?
@ 2018-10-23 16:04 Al Viro
  2018-10-23 16:35 ` Linus Torvalds
  2018-10-24 16:27 ` Linus Torvalds
  0 siblings, 2 replies; 3+ messages in thread
From: Al Viro @ 2018-10-23 16:04 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-fsdevel

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

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

end of thread, other threads:[~2018-10-25  0:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-23 16:04 vfs.git#fixes: how to deal with duplicates of cherry-picked commits? Al Viro
2018-10-23 16:35 ` Linus Torvalds
2018-10-24 16:27 ` Linus Torvalds

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox