Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 17 Mar 2020 13:31:17 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Paul Moore <paul@paul-moore.com>,
        Trond Myklebust <trondmy@gmail.com>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Scott Mayhew <smayhew@redhat.com>
Subject: linux-next: manual merge of the selinux tree with the nfs tree
Message-ID: <20200317133117.4569cc6a@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/QrWTEzrMvwuCGuAWfBhfOSX";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/QrWTEzrMvwuCGuAWfBhfOSX
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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, oth=
erwise the inode will appear as unlabeled for up to acdirmin seconds.  Curr=
ently the label for the root inode is allocated, retrieved, and freed entir=
ely 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/QrWTEzrMvwuCGuAWfBhfOSX
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl5wNnUACgkQAVBC80lX
0GyHVwf/fzO6n0OwdU9ZrALMJhLWqQN84OwCQvQQDFJYKDGuPkXjtJBeDHZT2To2
epx0ZcHfNjpVIMszv+44hz+iH06tku75EJFHRZ7KmYM51dlqbxSnEBYJgiB/54im
lo4rewljw8YvZuTKYhK2szxoypxf2Hfe5/3h+jUD7VGmG18t3QOLCENC4LBhhylm
BB6lMph87B8Dg7nAb6f6IKSfECIfRpOr1CQ463Tj4qziw8KKFPZBZX3/LE7+JIto
lLhL5E5/3/qSvDnwFs5ml67bU7hKv/3KPNlyAyEA44ImrcVwUfVmNkO6Ijz0sEK5
7m2s8IOSNwnAQZvBrF6cspUdXSYxGw==
=YN6V
-----END PGP SIGNATURE-----

--Sig_/QrWTEzrMvwuCGuAWfBhfOSX--