linux-kernel - Re: linux-next: manual merge of the vfs-jk tree with the fuse tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Tue, 27 Sep 2016 09:41:31 +0200
From:   Jan Kara <jack@...e.cz>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Jan Kara <jack@...e.cz>, Miklos Szeredi <miklos@...redi.hu>,
        linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the vfs-jk tree with the fuse tree

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@...e.com>
SUSE Labs, CR