From patchwork Thu Dec 7 01:08:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 174824 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4483477vqy; Wed, 6 Dec 2023 17:08:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IHoZ+epU+ygGTjP/Vz/YB/TmTiitZZm2+jj86RvPsgp545o+PfU+DLuI+cqiaJ1cg6AyKbN X-Received: by 2002:a05:622a:190c:b0:425:4043:18c4 with SMTP id w12-20020a05622a190c00b00425404318c4mr2419745qtc.119.1701911329463; Wed, 06 Dec 2023 17:08:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701911329; cv=none; d=google.com; s=arc-20160816; b=VvcBsjppj6FvyO5biTMYwpR6UnVtlZmzinoVZKDtcY/IHpL9/J52AkkQLA0O12S3gZ pKWiCu7WvKLgsIA8zYVS1qu5kYkCZR0yC2t9e7tjlj5djD/CCyIQzzzqRPJneqPTNAYy LoT9gQfsR6c3VMh2UHGW+dA/T97urERh4PwrAWH+xVuxXKyAYDDLNceYH9Sbuh7n+PYa d2y/JuflFRR+h2VSeOlxAkM8mA55d31eCpbweIn3CQ89uxcuJSFdgcPvMb8vjBQovH+R hXXOuTnf1NdAjuFVm9/0Lcq82oJJC3AJ2c0+IL6ypzebRnDooeohopzaE9scx7kcCGBS aplQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=phe4O51H7/V3YS47hEgMUqHs3d968ZCnQlFDHma9U1Y=; fh=3hkyM82KDqnw+3h95t9izijM3iTdQqQfUzdhsfPDghY=; b=rIpmpEaua80//ZJ+WRPnLLEqmLRWuSK2LnM7JHbhxfYaJ1d6h1+rzq7T5WTecUvoc1 Sc7o/DwivCG3l9STN9bFAkcqAn+oG8EWn2SSwyc/cB/FSTBTPDJNC77Eq4vPd9DIhaZR 1gJHzyhST2n4bdikLIHBFPOIbLSn3fS8QuCds+GIccr+cUVThdH90ISDV06ox7LJqcJf yufbM9yuOyq2eA0HvwaTLh0JL0P/M2fgHabc3zps7w1xFjAsRVO8QrA4GGg4zu+2BlkZ Q5HqfEobfp6HgD0VwatxOJ+rTj57OIYR3SUrvUK6qbGtUC49L0l6Qxp8dM2gqsyDSYGn QFBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=lb0l514G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id bn15-20020a05622a1dcf00b0041cbafcc5a9si271166qtb.636.2023.12.06.17.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 17:08:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=lb0l514G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 5E5758312AC9; Wed, 6 Dec 2023 17:08:46 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1441966AbjLGBIh (ORCPT + 99 others); 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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 06 Dec 2023 17:08:46 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784583374521958207 X-GMAIL-MSGID: 1784583374521958207 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. diff --cc include/linux/security.h index 00809d2d5c38,750130a7b9dd..000000000000 --- a/include/linux/security.h