From: Al Viro <viro@zeniv.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Moore <paul@paul-moore.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Ondrej Mosnacek <omosnace@redhat.com>
Subject: Re: linux-next: manual merge of the selinux tree with the vfs tree
Date: Tue, 18 Dec 2018 04:10:02 +0000 [thread overview]
Message-ID: <20181218041001.GU2217@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20181218144858.58d8d1f8@canb.auug.org.au>
On Tue, Dec 18, 2018 at 02:48:58PM +1100, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the selinux tree got a conflict in:
>
> security/selinux/hooks.c
>
> between commit:
>
> 2b8073b14c19 ("LSM: split ->sb_set_mnt_opts() out of ->sb_kern_mount()")
>
> from the vfs tree and commit:
>
> 2cbdcb882f97 ("selinux: always allow mounting submounts")
>
> from the selinux tree.
>
> I fixed it up (I used the vfs tree version, plus added the following
> patch but I am not sure if it is correct as the latter patch only affected
> selinux) 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.
> - if (!(fc->sb_flags & MS_KERNMOUNT)) {
> + if (!(fc->sb_flags & (MS_KERNMOUNT | MS_SUBMOUNT))) {
It is correct, but the long-term fix is to lift the conditional part out
of vfs_get_tree() into the callers (as discussed a couple of weeks ago).
I have it in a local branch, need to ripple it into the current main series...
next prev parent reply other threads:[~2018-12-18 4:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-18 3:48 linux-next: manual merge of the selinux tree with the vfs tree Stephen Rothwell
2018-12-18 4:10 ` Al Viro [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-11-27 0:52 Stephen Rothwell
2018-11-27 8:53 ` Ondrej Mosnacek
2018-11-27 9:14 ` Ondrej Mosnacek
2018-11-27 11:50 ` Stephen Rothwell
2018-11-28 21:52 ` Paul Moore
2018-11-29 10:07 ` Ondrej Mosnacek
2018-11-29 22:23 ` Paul Moore
2018-11-29 23:51 ` Al Viro
2018-11-30 0:57 ` Casey Schaufler
2018-11-30 1:27 ` Al Viro
2018-11-30 1:36 ` Al Viro
2018-12-01 21:32 ` Ondrej Mosnacek
2018-12-02 9:13 ` Ondrej Mosnacek
2018-12-03 10:12 ` Ondrej Mosnacek
2018-12-03 21:56 ` Al Viro
2018-12-05 9:37 ` Ondrej Mosnacek
2018-12-05 16:16 ` Al Viro
2018-12-05 21:58 ` Casey Schaufler
2018-11-30 15:10 ` David Howells
2018-11-30 15:17 ` Ondrej Mosnacek
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=20181218041001.GU2217@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=omosnace@redhat.com \
--cc=paul@paul-moore.com \
--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;
as well as URLs for NNTP newsgroup(s).