From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Moore <paul@paul-moore.com>, Al Viro <viro@ZenIV.linux.org.uk>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Ondrej Mosnacek <omosnace@redhat.com>,
David Howells <dhowells@redhat.com>
Subject: linux-next: manual merge of the selinux tree with the vfs tree
Date: Tue, 27 Nov 2018 11:52:46 +1100 [thread overview]
Message-ID: <20181127115246.00967523@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 838 bytes --]
Hi Paul,
Today's linux-next merge of the selinux tree got a conflict in:
security/selinux/hooks.c
between commit:
0472421f47a9 ("vfs: Remove unused code after filesystem context changes")
from the vfs tree and commit:
2cbdcb882f97 ("selinux: always allow mounting submounts")
from the selinux tree.
I fixed it up (the former removed the function updated by the latter -
I am not sure if there are further changes necessary) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-11-27 0:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-27 0:52 Stephen Rothwell [this message]
2018-11-27 8:53 ` linux-next: manual merge of the selinux tree with the vfs tree 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
2018-12-18 3:48 Stephen Rothwell
2018-12-18 4:10 ` Al Viro
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=20181127115246.00967523@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=omosnace@redhat.com \
--cc=paul@paul-moore.com \
--cc=viro@ZenIV.linux.org.uk \
/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).