Hi Stephen,
On Tue 27-09-16 10:12:04, Stephen Rothwell wrote:
> Today's linux-next merge of the vfs-jk tree got a conflict in:
>
> fs/fuse/dir.c
>
> between commits:
>
> 3b3fb74935ce ("fuse: invalidate dir dentry after chmod")
> 5f69e628df75 ("fuse: fix killing s[ug]id in setattr")
>
> from the fuse tree and commit:
>
> 62490330769c ("fuse: Propagate dentry down to inode_change_ok()")
>
> from the vfs-jk tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
Thanks! The resolution looks good to me.
Honza
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
