On Thu, Feb 09, 2023 at 02:28:25PM +0000, David Howells wrote: > Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> wrote: > > > extern int afs_getattr(struct mnt_idmap *idmap, const struct path *, > > struct kstat *, u32, unsigned int); > > extern int afs_setattr(struct mnt_idmap *idmap, struct dentry *, struct iattr *); > > This doesn't apply to linus/master. I'm guessing it's based on something > else? next-20230203. I'm guessing it's "fs: port xattr to mnt_idmap" that's causing merge conflicts for you?