From nobody Sun Dec 28 15:33:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DC7EC4167B for ; Thu, 7 Dec 2023 01:08:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1441972AbjLGBIh (ORCPT ); Wed, 6 Dec 2023 20:08:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1441961AbjLGBIg (ORCPT ); Wed, 6 Dec 2023 20:08:36 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09A8512F; Wed, 6 Dec 2023 17:08:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701911315; bh=phe4O51H7/V3YS47hEgMUqHs3d968ZCnQlFDHma9U1Y=; h=Date:From:To:Cc:Subject:From; b=lb0l514GhPPpUFUIO2g5tSXP3nYjAIvM8WKSPJQ/fjLwmG9cLD0f+iEhGrvlvx+yF obQMBK4np8Rh7BumQsBoT/OkM9nuxFo+AvlN6JnEzVeXENefpZnUBxf6ob9iq1K7gs KCITTzuDDMHnv0pDEnocyCdfnAHhz0RGuNJoP48tHKFr57T+tyxcvgxW5S38iGriMJ Xxh/X2WJYdWZ4EcpHN97ubJgevzcjSGmI9KU/c5QvAIHcAEvPHxFEC7tv6H2wXKJMv 7Kk893gKFzyCMtQczY/Ah+tf8w3H5aLUBuiGcEMlE6Mi5x7mZii9/N2s881S4wQNGG QTFrxiy1MdkZA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Slx3k4BP6z4wc3; Thu, 7 Dec 2023 12:08:34 +1100 (AEDT) Date: Thu, 7 Dec 2023 12:08:33 +1100 From: Stephen Rothwell To: Paul Moore , Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko Cc: bpf , Networking , Casey Schaufler , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the security tree with the bpf-next tree Message-ID: <20231207120833.46ebfc2d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/XLz+L06gsoqiomsd0nyAVro"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/XLz+L06gsoqiomsd0nyAVro Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the security tree got a conflict in: include/linux/security.h between commit: d734ca7b33db ("bpf,lsm: add BPF token LSM hooks") from the bpf-next tree and commit: e1ca7129db2c ("LSM: Helpers for attribute names and filling lsm_ctx") 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 include/linux/security.h index 00809d2d5c38,750130a7b9dd..000000000000 --- a/include/linux/security.h +++ b/include/linux/security.h @@@ -32,7 -32,7 +32,8 @@@ #include #include #include +#include + #include =20 struct linux_binprm; struct cred; --Sig_/XLz+L06gsoqiomsd0nyAVro Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVxGxEACgkQAVBC80lX 0Gy4Vgf+O274EwUxOtVS9S2Y1V4GBLB4rb1nfBXkGFaZcVFEb0Me3AaxcaEzpg8d Kt4r6LSKFPfCR3vLi372ixaQSUJSYthQL8hoUNVDuCo1dVq7I2pFHfH/C/BsSFut xww4WgQOAp2iWekkU7/5XjPQLgqDGTd1fB+4fiNTW/2rOluhVOeOsqrf+pfymLHD 7kwej6pieq63GjksZD2462AGiYkwiS7vedj2smlvYBACVCB5sZ+L1NCWMZE6nKtc FG1/UsFpuIBvmaEGz8QlW20AFMB85SqxOnXSG/qvmfi5jINU3y32I6WEBGuGN0xT BgO0o1aotXB2X/z9yezZPGO329pBqA== =dqeK -----END PGP SIGNATURE----- --Sig_/XLz+L06gsoqiomsd0nyAVro--