From: ebiederm@xmission•com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Miklos Szeredi <miklos@szeredi•hu>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the userns tree with the fuse tree
Date: Wed, 21 Mar 2018 09:02:06 -0500 [thread overview]
Message-ID: <87zi31y1b5.fsf@xmission.com> (raw)
In-Reply-To: <20180321172658.45b892a3@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 21 Mar 2018 17:26:58 +1100")
Stephen Rothwell <sfr@canb•auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the userns tree got a conflict in:
>
> fs/fuse/dev.c
>
> between commits:
>
> dbf107b2a7f3 ("fuse: Remove the buggy retranslation of pids in fuse_dev_do_read")
> c9582eb0ff7d ("fuse: Fail all requests with invalid uids or gids")
> 8cb08329b080 ("fuse: Support fuse filesystems outside of init_user_ns")
>
> from the fuse tree and commits:
>
> dbf107b2a7f3 ("fuse: Remove the buggy retranslation of pids in fuse_dev_do_read")
> c9582eb0ff7d ("fuse: Fail all requests with invalid uids or gids")
> 8cb08329b080 ("fuse: Support fuse filesystems outside of init_user_ns")
>
> from the userns tree.
>
> These commits seem to have been rebased in the fuse tree on top of
>
> 3b7008b226f3 ("fuse: return -ECONNABORTED on /dev/fuse read after abort")
>
> and modified a bit.
>
> I fixed it up (I used the fuse tree version, but please come to
> some arrangement about which is correct) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
As Miklos has merged these I plan to drop these changes from my tree.
Eric
prev parent reply other threads:[~2018-03-21 14:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-21 6:26 linux-next: manual merge of the userns tree with the fuse tree Stephen Rothwell
2018-03-21 14:02 ` Eric W. Biederman [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=87zi31y1b5.fsf@xmission.com \
--to=ebiederm@xmission$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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