From patchwork Mon Dec 4 01:03:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 173031 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2484375vqy; Sun, 3 Dec 2023 17:03:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IFtDKXmosBTZvlrbpmEzu38Tpjno9eIxZQb4Y9YFj3dQRXJGSzcvo0fc1OFKw+V+0YPx+h4 X-Received: by 2002:a17:902:8f8c:b0:1d0:6ffd:ae0a with SMTP id z12-20020a1709028f8c00b001d06ffdae0amr887341plo.113.1701651819832; Sun, 03 Dec 2023 17:03:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701651819; cv=none; d=google.com; s=arc-20160816; b=fWI7bOfR8v+8bQf5d9OeeL1uJh8gZkyO2dITXNbzE2EoPLWDBWWQK85L/Nj//pjQ7U LjPf+2g9eqjlKog7XvJPR2dL+cwgJMHhhnFqeY9ySkql2wrK1IsAfNoHJxBEcZZe4E7N ozjJWzb16fq+s4dmfFhpiiIPR2JJraN7IasSwukfEkPcW8t/TuDP2x9Ue3DSSYs7+FhR 2Wm/xY92BdAii3O/Uw6LFqhStdlH3K/DeF3rrTYQ/+WpUdM7F82P2nLhQ7VkAJ2/a3KG 2Bry1HwJaALg2ndAskNmQSYc/uemL9SYAvN0fTw00T2I5rToPxE6zXt6E1+Q9QhkD7lK qvqw== 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=QTgVbSc8ljMVBQbD1I9Qp/eGoaOdEunqZnUVXlnbtNU=; fh=emyQmLj61+78KWDwX9IiaB1YVv6iSuuAG106uUPwCC0=; b=JVa5Xy+8oTfl1USouKS0moFmtVG1tDZ1vS2nSziVGJ56e5ssvJQZoZ4i9jKgnBdJ6j /iI98QFj+P1FBI6Ynxa4gOJyEZIf9DVpGQKrlrgoJtzhk7jTmllw+vnRaAZ96TlisYP1 mO4pkIzPuGGlKcdvwUVYTx7WEYpVY2ciD4tqZUhG6vyeXcDnHwiN5WtV9OJzQ09eR56r mZmQdQZ3BdDBkFvqlDQADHtXi218HrTNrreOMIW8CDmUprC4lcTE99GFgXXJ2wJwrAXb CJ9XIxoC8n1LUAgNWS3LDrbJ7ya8JcH01XNXNcVZvcQa0e/oEfUCrmZtSwctXm3cj0Xk tKog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=f6CgkEb8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id j11-20020a170902da8b00b001cfcf1faaa6si6946807plx.206.2023.12.03.17.03.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 17:03:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=f6CgkEb8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 3FDB580677F0; Sun, 3 Dec 2023 17:03:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230034AbjLDBDO (ORCPT + 99 others); Sun, 3 Dec 2023 20:03:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229793AbjLDBDO (ORCPT ); Sun, 3 Dec 2023 20:03:14 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E431CB; Sun, 3 Dec 2023 17:03:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701651796; bh=QTgVbSc8ljMVBQbD1I9Qp/eGoaOdEunqZnUVXlnbtNU=; h=Date:From:To:Cc:Subject:From; b=f6CgkEb8+Ynj1frTRFyPaZPMDMX+2rdUiIb5ij7+RFQluV0ezZSe0YW5210aD9MQJ yZD/lo/XxZFwJT7NIHdv+7YCy6BQjAhk59UNEZHbxDD5OLqZl9nGneJoVvkK3eobeT Iz0L67MBTFg4sRwVIR5cLuXS2Vm5fNtMHu6yqf0wE+LAbi/kfIOwjGGv2qe0Qt2PR9 pZlespMIChAGuNLQqDd31uAShcl3bzbpcCWkqpO9COADSIeVNFEQCqPF16H0Z2JOce cU20WOdzTiI6JO+xYCmYukS7roXsXV8MyipoAEMjes5lTHB/KIcy3kdkxdOkeFyV68 21wcQBBh1LCwA== 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 4Sk54z6HTgz4xMv; Mon, 4 Dec 2023 12:03:15 +1100 (AEDT) Date: Mon, 4 Dec 2023 12:03:14 +1100 From: Stephen Rothwell To: Paul Moore , Jens Axboe Cc: Casey Schaufler , Kees Cook , Linux Kernel Mailing List , Linux Next Mailing List , Pavel Begunkov Subject: linux-next: manual merge of the security tree with the block tree Message-ID: <20231204120314.5718b5f6@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 agentk.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 (agentk.vger.email [0.0.0.0]); Sun, 03 Dec 2023 17:03:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784311258582067534 X-GMAIL-MSGID: 1784311258582067534 Hi all, Today's linux-next merge of the security tree got conflicts in: security/selinux/hooks.c security/smack/smack_lsm.c between commit: bf18dde00aa9 ("io_uring: split out cmd api into a separate header") from the block tree and commit: f3b8788cde61 ("LSM: Identify modules by more than name") 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 security/selinux/hooks.c index 17ec5e109aec,b340425ccfae..000000000000 --- a/security/selinux/hooks.c diff --cc security/smack/smack_lsm.c index 2cdaa46088a0,53336d7daa93..000000000000 --- a/security/smack/smack_lsm.c