Re: 回复: [PATCH 1/2] hfsplus: fix to update ctime after rename

[John Paul Adrian Glaubitz]

Hi Slava,

On Thu, 2025-05-01 at 18:57 +0000, Viacheslav Dubeyko wrote:
> On Thu, 2025-05-01 at 12:01 +0000, 李扬韬 wrote:
> > Hi Slava,
> > 
> > > Unfortunately, I am unable to apply you patch. In 6.15-rc4 we have already:
> > 
> > Why can't apply?
> > 
> > > Could you please prepare the patch for latest state of the kernel tree?
> > 
> > In fact, I applied these two patches to 6.15-rc4, and there were no abnormalities.
> > based on commit 4f79eaa2ceac86a0e0f304b0bab556cca5bf4f30
> > 
> 
> It's strange. The 'git apply' doesn't work, but 'git am' does work.
> 
> git apply -v ./\[EXTERNAL\]\ \[PATCH\ 1_2\]\ hfsplus\:\ fix\ to\ update\ ctime\
> after\ rename.mbox
> Checking patch fs/hfsplus/dir.c...
> error: while searching for:
> 			  struct inode *new_dir, struct dentry *new_dentry,?
> 			  unsigned int flags)?
> {?
> 	int res;?
> ?
> 	if (flags & ~RENAME_NOREPLACE)?
> 
> error: patch failed: fs/hfsplus/dir.c:534
> error: fs/hfsplus/dir.c: patch does not apply
> 
> git am ./\[EXTERNAL\]\ \[PATCH\ 1_2\]\ hfsplus\:\ fix\ to\ update\ ctime\ after\
> rename.mbox
> Applying: hfsplus: fix to update ctime after rename
> 
> Does 'git apply' works on your side if you try to apply the patch from email? Is
> it some glitch on my side? As far as I can see, I am trying to apply on clean
> kernel tree.

git-apply is for applying plain patches while git-am is for patches from mailboxes.

I would suggest to always use git-am after fetching patches using "b4 am <MSGID>"
from the kernel mailing list.

Please note that when you apply patches with git-am, you should always use the "-s"
option so that the patches are automatically signed-off with your own email address.

Btw, can you push your tree somewhere until you've got your kernel.org account?

Thanks,
Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913