From: Trond Myklebust <trondmy@hammerspace.com>
To: "sfr@canb.auug.org.au" <sfr@canb.auug.org.au>,
"paul@paul-moore.com" <paul@paul-moore.com>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"smayhew@redhat.com" <smayhew@redhat.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the selinux tree with the nfs tree
Date: Tue, 17 Mar 2020 13:33:16 +0000 [thread overview]
Message-ID: <bb623275e936c026cc425904e6c1cee0cbe85f28.camel@hammerspace.com> (raw)
In-Reply-To: <20200317133117.4569cc6a@canb.auug.org.au>
On Tue, 2020-03-17 at 13:31 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the selinux tree got a conflict in:
>
> fs/nfs/getroot.c
>
> between commit:
>
> e8213ffc2aec ("NFS: Ensure security label is set for root inode")
>
> from the nfs tree and commit:
>
> 28d4d0e16f09 ("When using NFSv4.2, the security label for the root
> inode should be set via a call to nfs_setsecurity() during the mount
> process, otherwise the inode will appear as unlabeled for up to
> acdirmin seconds. Currently the label for the root inode is
> allocated, retrieved, and freed entirely witin
> nfs4_proc_get_root().")
>
> from the selinux tree.
>
> These are basically the same patch with slight formatting
> differences.
>
> I fixed it up (I used the latter) 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.
>
OK... Why is this being pushed through the selinux tree? Was that your
intention Scott? Given that it didn't touch anything outside NFS and
had been acked by the Selinux folks, but had not been acked by the NFS
maintainers, I was assuming it was waiting to be applied here.
--
Trond Myklebust
Linux NFS client maintainer, Hammerspace
trond.myklebust@hammerspace.com
next prev parent reply other threads:[~2020-03-17 13:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 2:31 linux-next: manual merge of the selinux tree with the nfs tree Stephen Rothwell
2020-03-17 13:33 ` Trond Myklebust [this message]
2020-03-17 13:49 ` Paul Moore
2020-03-17 15:18 ` Scott Mayhew
2020-03-17 16:12 ` Trond Myklebust
2020-03-17 21:10 ` Paul Moore
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=bb623275e936c026cc425904e6c1cee0cbe85f28.camel@hammerspace.com \
--to=trondmy@hammerspace.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=sfr@canb.auug.org.au \
--cc=smayhew@redhat.com \
/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;
as well as URLs for NNTP newsgroup(s).