| Message ID | 20231212104657.524d359e@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 r17csp7407296vqy;
Mon, 11 Dec 2023 15:47:39 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IFmpU/iX3hQckrF+KZjWIbsRn7WbHom/Pdhj54z5ZJr1SeQzYNiyliUajiKfwB0kJNYBts/
X-Received: by 2002:a05:6808:1489:b0:3b9:dddb:2921 with SMTP id
e9-20020a056808148900b003b9dddb2921mr7081908oiw.78.1702338459333;
Mon, 11 Dec 2023 15:47:39 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1702338459; cv=none;
d=google.com; s=arc-20160816;
b=YuoTznjY8E4RN4tghbk5YOdlDFIjjND8Rzf+KLpKa7l2h24gJECWHY3AsXMJKW+KCu
WKTuAU8WzRSGAz29OlN8oCSTr7GySD6TGib/CkX4IUNQepvJg7iQFyaN/ytMtyFcVo8c
O+9rv5ZCp02+mCm4qFpotWjGvrMP213cGwvEYzhaH4S1E/juWASShTd7+GWqnt4/dcyy
mDpYSKZnnRRsyPxUOp3vad9gO6TiFJhpArWEG80f0MmwbGjOr775NM+lwyMg4FxttgfW
IOJzDBzAWwQ5O7rHNjcypd6usmnsH1zDBfoM2UTIFBHjArT4wHVfemuevGJZLgvdUNvB
DswA==
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=PalGBobXg3qAUYZb0g5tjxFjYZtNWkQxoOPR3JpFqTQ=;
fh=gicxaH/X563DuwzxV78ZCX9ivZX6hdFUR4ZSx3PlQes=;
b=VaavLKGbn3vABrI9c0y0yRPJvwzfE1/gwJtgO424d14YBQwFDeQwybQxOgXutCuvX7
iZ4NKFTPnCd4+nMXX5w2oGMoyZ2vjpazOdEBkl0F05eh62Q16BYpCkGm9T3hhVJkhmRy
TNtU/9hMFPAQHKyf5tm1uHmWUmLSYkPuttUXj/Shz0DjQ9xxjTylmW/JRSN3bvOo3uFB
tiQvyrtw5Zf1/+3HgWRSp9jdE+WPf9ZV5I1NKgbooGAp4csTYtl+gLamkybKjYCjZIS2
vLNYyHacHhcKRJUo6NRE2ytwC3rCJSjrsJCjW4kUjQwT7C6uTEq28sCclGqQqrRSWwCl
b2/Q==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=iOA7okWT;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4])
by mx.google.com with ESMTPS id
bw9-20020a056a02048900b005c674eb1cb4si6880008pgb.477.2023.12.11.15.47.38
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 11 Dec 2023 15:47:39 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 as permitted sender)
client-ip=2620:137:e000::3:4;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=iOA7okWT;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id B232680490A8;
Mon, 11 Dec 2023 15:47:10 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1345300AbjLKXrB (ORCPT <rfc822;dexuan.linux@gmail.com>
+ 99 others); Mon, 11 Dec 2023 18:47:01 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54768 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1345163AbjLKXrA (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 11 Dec 2023 18:47:00 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2A73B5;
Mon, 11 Dec 2023 15:47:05 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1702338420;
bh=PalGBobXg3qAUYZb0g5tjxFjYZtNWkQxoOPR3JpFqTQ=;
h=Date:From:To:Cc:Subject:From;
b=iOA7okWTXICn7PcPShZJc9DQL4imaChNXKvidnIoaKUENtwrNeFRBJ2Tb8jSVykGc
ML6u6ElQWbnYq2Oi3XxlqjioQXqDHWgujwbolRLomiQTpj5SZHSa608KQ/xwR0b7qm
6DyTXKUSjxLsfsJgIW2FThWN0SntM4/52RyHC99TomhQYMMk+JNVrI4TiYAnlpyEED
oB6ZHuolEmCP83PJ0pzt05q4EPPwmTwErf2smsrasS1iW1aLAVFEWxR7RpAYzVm4yC
efA6C8/Xkeq+OS4UwzMqs8KkSYennwJ5EM4X5ePekcmiOsgSzXOGSx0qPh5cZXS0yK
+8zwOGp2o/O6A==
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 4Spz1H5wgSz4xGR;
Tue, 12 Dec 2023 10:46:59 +1100 (AEDT)
Date: Tue, 12 Dec 2023 10:46:57 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>,
Jonathan Corbet <corbet@lwn.net>
Cc: Hans de Goede <hdegoede@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Ma Jun <Jun.Ma2@amd.com>, Sumit Garg <sumit.garg@linaro.org>
Subject: linux-next: manual merge of the amdgpu tree with the jc_docs tree
Message-ID: <20231212104657.524d359e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/nNudTIv73jjuAoRzRQkI/gf";
protocol="application/pgp-signature"; micalg=pgp-sha256
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 howler.vger.email
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 (howler.vger.email [0.0.0.0]);
Mon, 11 Dec 2023 15:47:11 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1785031252281890034
X-GMAIL-MSGID: 1785031252281890034
|
| Series |
linux-next: manual merge of the amdgpu tree with the jc_docs tree
|
|
Commit Message
Stephen Rothwell
Dec. 11, 2023, 11:46 p.m. UTC
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
Documentation/driver-api/index.rst
between commit:
50709576d81b ("Documentation: Destage TEE subsystem documentation")
from the jc_docs tree and commit:
2128f3cca5a2 ("Documentation/driver-api: Add document about WBRF mechanism")
from the amdgpu 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
Stephen Rothwell <sfr@canb.auug.org.au> writes: > Hi all, > > Today's linux-next merge of the amdgpu tree got a conflict in: > > Documentation/driver-api/index.rst > > between commit: > > 50709576d81b ("Documentation: Destage TEE subsystem documentation") > > from the jc_docs tree and commit: > > 2128f3cca5a2 ("Documentation/driver-api: Add document about WBRF mechanism") > > from the amdgpu 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. Thanks, both fixups in that file seem fine. Clearly, though, we've run into the "everybody adding stuff to the end causes a lot of conflicts" problem. Time to impose some better organization onto that file. jon
diff --cc Documentation/driver-api/index.rst index 9511db303446,8bc4ebe7a36f..000000000000 --- a/Documentation/driver-api/index.rst