From patchwork Tue Aug 1 01:42: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: 128965 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2401379vqg; Mon, 31 Jul 2023 19:53:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlG8ILxbOfC5aPf+MYwx/RUi26K/vKJNHVS2qO+vbqgtADPWD86OgvMYJkQlemhvxeLfOPtJ X-Received: by 2002:a9d:7c90:0:b0:6b7:493d:69ae with SMTP id q16-20020a9d7c90000000b006b7493d69aemr11897466otn.31.1690858398380; Mon, 31 Jul 2023 19:53:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690858398; cv=none; d=google.com; s=arc-20160816; b=e0UXjvwmMrG781zXAh2+trYv+mcjNBMVLFDPdMBgdYC0XaoQTMVtDIHrQ/Y8QwH4wj u4bLsNn7kZ/K6CQs7tkazZfEXmKtNimG9dLGtZc5PkpY2eqWv4cq4foUNDF48UqbJYdC gMhKsuDTsT14vpzvOaajIhlDi1lHegv/8RLocEactbBSc1BMY/7dty6AtzQqptl5dO+f DoERpP6ecbwzqwP6jPSi8LtVtcWDRRn0ceJfHVqde/+o1GFKgzqR/pOsut0Md/7om9aP RFcHKExo9T9J1T05O6BnXtvvVMmAFEKEJNYRmZl85KfvdNuQyVdrSSjwgKazXiUgCsEU 6rzw== 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=R0PEe73zlfYAKebLRzhdfAzKrKATJClV0PH4WjYF9+Y=; fh=Me/5FtFMzaTjOHZW7wZ8ETv3MPj+/0WeNcks4YrCbCY=; b=TyESFHokm/DwdTwYYuTXwywzlorH3TaZYGiJ11OFh0XnUlzdunQ7rEM5SZNuLaYrz6 nmL7rrkcVmVIiMlzdQo9VCwJkannvxxg5Yb7G682+/qTwLOjl1K4t19r4PMHtU//rQR9 mK1u3B9usSjqhPXvERrjJ8OURMspV+L8+qoo7lxFvnEnOu88spOhDt+uZC6l7nogk+Ua W4cNrQ4nrEV/IZRmE3o6d9S/XPY+PUyCeml4N+orNGdYD2WpKRmDlQ2gxv3Crn5wBy8d wwTWSFjOsKOnXiP2+ojhnLVyq9Sz30Q6UtEYUEqayuIm2swupIai3lZXpnpQTg6nzpDe UXqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=JoH0sr+Y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k28-20020a637b5c000000b005633b3c6d44si8156515pgn.655.2023.07.31.19.53.05; Mon, 31 Jul 2023 19:53:18 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=JoH0sr+Y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229583AbjHABms (ORCPT + 99 others); Mon, 31 Jul 2023 21:42:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230518AbjHABmr (ORCPT ); Mon, 31 Jul 2023 21:42:47 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A24DF1BF1; Mon, 31 Jul 2023 18:42:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1690854137; bh=R0PEe73zlfYAKebLRzhdfAzKrKATJClV0PH4WjYF9+Y=; h=Date:From:To:Cc:Subject:From; b=JoH0sr+YSK8u4uQc94xxJYtL0S7C1R0vkckil6rOa2KHb7cYTnbAFpzwKU5spHrER kaqMVgKdhEzIySPt9FF7MnspVVSf/hCU342ZLO8t1oX0Wj/sf/t59WcNULrkv9h7Yi ETuvuOOsmSOcYCfqrMUZG2jbGogMwOuBvozjZ5+bja1QE72zYeJy1GTC1dN3acqBGR s1EM4fPyMtiA2JgPAkQQzcuMVGwMveU0/lK2DKCLux/GVnfKTs3LdawYtW/HtP21Kf Rrlcv853z3Szq0Cr/Ratnhxr4UaLJRw5/7AWBv2J4uvvx0neH2q9njEiBsr4Y4rRQA E9sXHH38Rs8mw== 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 ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RFHsg6VQwz4wZw; Tue, 1 Aug 2023 11:42:15 +1000 (AEST) Date: Tue, 1 Aug 2023 11:42:14 +1000 From: Stephen Rothwell To: Paul Moore , David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Guillaume Nault , Khadija Kamran , Linux Kernel Mailing List , Linux Next Mailing List 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 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772993536064931867 X-GMAIL-MSGID: 1772993536064931867 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 hook") 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/security.c index 2dfc7b9f6ed9,9177fd0968bd..000000000000 --- a/security/security.c