| Message ID | 20231211122917.138d141b@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6778028vqy;
Sun, 10 Dec 2023 17:29:31 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IEnvCqGvn7aOSeG9rJ9+sM8Mbsc61TFVeTxsW/4rNgTPply6THW6T0w4gRRpaEkiGkKUYNb
X-Received: by 2002:a05:6808:640f:b0:3b9:e4d1:9657 with SMTP id
fg15-20020a056808640f00b003b9e4d19657mr3913531oib.19.1702258171501;
Sun, 10 Dec 2023 17:29:31 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1702258171; cv=none;
d=google.com; s=arc-20160816;
b=H1hbylCQ7r0tIrjcTk4b5K3SyEwIoNNAK39gk+mL0oS5FpvI4xeOIxH7ZGapT6Kl+T
Rxl/Ot8+p7Ud2Xk1mx+4P8LUyCPRYl6qU3nQfnWtdyyAVoF2hd+VpGCM5gkSbPGEATyW
gIqQAYS99HQodJAcHC88ih22ZiD+eRnLpiXqB2umjvlT/9bcHhLmd8xlFpf/rfQnsDVI
FgwNKPQ1rYVz4+vbfB88kEA6PAaTLIM45+IcH1bkAXyQeoiCvQYyvJD7e8gtdkrWxKdD
qDyddf+r7Dgrf+fEVTG2WgDZ4UUTkFmaJhM/YftgaUaAbbuwAtpSgYSwrFYlLPUk3yWR
xLYA==
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=ORry25Z5o/8D2R+y4DclrXluDctJV4FlEMOgt6MNs7k=;
fh=PYSKNKmMhE6mkcLGcw+q4yCOGBVLxpUGwUb7smW8tc4=;
b=QsmgDXvImm8RKqnnF3ClhMNIpf3qVOHB0kXQBpXQkyNJJ78z097u60RrTwl57qiV0y
mM0ltC1KQ+yKekYGE8Qec8JjACyoaM90SkDaDzz++WQNGIhxE1idaPYaki+c+KO+lJeo
jIm3lbXy6A0ngK6/KXqgF+wdOh/VvKzLMl48Nel+D4CwCymKzV2KCLW4LnESXpcFDlkA
99wbDpunkZX26jjCbeEcoVmpiWdK2oqkPdDscZdkdnHDL/OZshn9c9nb2Ygsno/eNtNz
u0/akf6MYimdNIJI/SkSxupPIS3RQwv3R7xJNa7whZ5t222W+Q5iQ0uGyABVEIz67xyq
2wqA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=a0dg6gWu;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37])
by mx.google.com with ESMTPS id
i16-20020a170902c95000b001d0b1392c7fsi5341351pla.350.2023.12.10.17.29.31
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 10 Dec 2023 17:29:31 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=a0dg6gWu;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id C31438073299;
Sun, 10 Dec 2023 17:29:29 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229655AbjLKB3U (ORCPT <rfc822;hjfbswb@gmail.com> + 99 others);
Sun, 10 Dec 2023 20:29:20 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54606 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229564AbjLKB3T (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 10 Dec 2023 20:29:19 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1763CE4;
Sun, 10 Dec 2023 17:29:25 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1702258160;
bh=ORry25Z5o/8D2R+y4DclrXluDctJV4FlEMOgt6MNs7k=;
h=Date:From:To:Cc:Subject:From;
b=a0dg6gWuufHxVVlOP3prS7t4P9O/S0S8DR+Lq0s9dQX6PBKKq6zYDX5ot1F77Ev26
46uEIRz+sMOgLWhvb9XX1RI67sTN82qS75Qk493pkHzwBEuZTRvx1IUehDqGaPdCzo
dUDCreAq0ld4WbAwqgKbAKdiWxvN+HOReVlmjM+IbCG94CINmYITqMI+AzcTOoA4pP
D+JlgxmPZE3IAauj9/OTwft5AvsHnoYwTbTKxo2DygremvRU4esW/D2GsQfjaNmhAc
ponLHX+7UuVFjBQ0VU9gz23TiFz/LE1GDqheQyQndLQxa/5mB0/fML3gLeeUssP+Yv
5qrP9g8dI27HA==
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 4SpPKq44Wrz4wbQ;
Mon, 11 Dec 2023 12:29:19 +1100 (AEDT)
Date: Mon, 11 Dec 2023 12:29:17 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Moore <paul@paul-moore.com>, Jonathan Corbet <corbet@lwn.net>
Cc: Casey Schaufler <casey@schaufler-ca.com>,
Kees Cook <keescook@chromium.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sumit Garg <sumit.garg@linaro.org>
Subject: linux-next: manual merge of the security tree with the jc_docs tree
Message-ID: <20231211122917.138d141b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/VHdyE0Ee2I.oPd+91Q7uGKY";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS,
T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]);
Sun, 10 Dec 2023 17:29:30 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1784947064592493780
X-GMAIL-MSGID: 1784947064592493780
|
| Series |
linux-next: manual merge of the security tree with the jc_docs tree
|
|
Commit Message
Stephen Rothwell
Dec. 11, 2023, 1:29 a.m. UTC
Hi all,
Today's linux-next merge of the security tree got a conflict in:
Documentation/userspace-api/index.rst
between commit:
50709576d81b ("Documentation: Destage TEE subsystem documentation")
from the jc_docs 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.
Comments
Hi all, On Mon, 11 Dec 2023 12:29:17 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the security tree got a conflict in: > > Documentation/userspace-api/index.rst > > between commit: > > 50709576d81b ("Documentation: Destage TEE subsystem documentation") > > from the jc_docs 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc Documentation/userspace-api/index.rst > index 93174ffc7350,8be8b1979194..000000000000 > --- a/Documentation/userspace-api/index.rst > +++ b/Documentation/userspace-api/index.rst > @@@ -30,7 -33,7 +30,8 @@@ place where this information is gathere > sysfs-platform_profile > vduse > futex2 > + tee > + lsm > > .. only:: subproject and html > This is now a conflict between the jc_docs tree and Linus' tree.
diff --cc Documentation/userspace-api/index.rst index 93174ffc7350,8be8b1979194..000000000000 --- a/Documentation/userspace-api/index.rst