From: Jan Kara <jack@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jan Kara <jack@suse.cz>, Miklos Szeredi <miklos@szeredi.hu>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the vfs-jk tree with the fuse tree
Date: Tue, 27 Sep 2016 09:41:31 +0200 [thread overview]
Message-ID: <20160927074131.GB1139@quack2.suse.cz> (raw)
In-Reply-To: <20160927101204.19fdab82@canb.auug.org.au>
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@suse.com>
SUSE Labs, CR
prev parent reply other threads:[~2016-09-27 7:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-27 0:12 linux-next: manual merge of the vfs-jk tree with the fuse tree Stephen Rothwell
2016-09-27 7:41 ` Jan Kara [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160927074131.GB1139@quack2.suse.cz \
--to=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox