Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 1 Aug 2023 11:42:14 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Paul Moore <paul@paul-moore.com>,
        David Miller <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
Cc:     Networking <netdev@vger.kernel.org>,
        Guillaume Nault <gnault@redhat.com>,
        Khadija Kamran <kamrankhadijadj@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the security tree with the net-next
 tree
Message-ID: <20230801114214.2e169762@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/SlBZ/wYr8B1uaHmZK/xISTS";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

Today's linux-next merge of the security tree got a conflict in:

  security/security.c

between commit:

  5b52ad34f948 ("security: Constify sk in the sk_getsecid hook.")

from the net-next tree and commit:

  bd1f5934e460 ("lsm: add comment block for security_sk_classify_flow LSM h=
ook")

from the security tree.

I fixed it up (see below) 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

diff --cc security/security.c
index 2dfc7b9f6ed9,9177fd0968bd..000000000000
--- a/security/security.c
+++ b/security/security.c
@@@ -4396,7 -4421,14 +4421,14 @@@ void security_sk_clone(const struct soc
  }
  EXPORT_SYMBOL(security_sk_clone);
 =20
+ /**
+  * security_sk_classify_flow() - Set a flow's secid based on socket
+  * @sk: original socket
+  * @flic: target flow
+  *
+  * Set the target flow's secid to socket's secid.
+  */
 -void security_sk_classify_flow(struct sock *sk, struct flowi_common *flic)
 +void security_sk_classify_flow(const struct sock *sk, struct flowi_common=
 *flic)
  {
  	call_void_hook(sk_getsecid, sk, &flic->flowic_secid);
  }

--Sig_/SlBZ/wYr8B1uaHmZK/xISTS
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTIYvYACgkQAVBC80lX
0GxibAf/V0a39pcCXf9IcteRyqNunHpmz4gxlVi7pAUrGkNWZ5HSGOZqW6YzjcUG
021K7vdkI907fOtYQ78FpckhEykLY2Ibi0iwUezNmd39ycPniL3QTxWzOk6p4N/I
S5CaQfh9Xib03TWFhoNcMOvHY37RpLMXKbii8Njv8M4DwlwVVtrR1fxmFFoezYlO
ehGSZRjaEPLDDLze+hxAZi5XRvwdWYW77GuRwSbqw/letpC3r+0jbe6lP0jVGB3F
BS39zrSDb50l4nN8W6KkIhVSBUckBqgbJlx16VY67aJwov+yTjGqQJCAmgC/Yh7u
RG0MlqdcCrw+aMtIGZi9Sx6XFmzXeg==
=LR5K
-----END PGP SIGNATURE-----

--Sig_/SlBZ/wYr8B1uaHmZK/xISTS--