From patchwork Sun Dec 17 23:47:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 180089 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp935000dyi; Sun, 17 Dec 2023 15:48:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IEvOhattKGViQ7HC3m34SlfYt9/HbK2TMxNWO3sDm335hj2fus22i7zTBLQkgvlW7TtG5VB X-Received: by 2002:a50:9e2e:0:b0:54c:b88a:7a69 with SMTP id z43-20020a509e2e000000b0054cb88a7a69mr8187507ede.73.1702856895051; Sun, 17 Dec 2023 15:48:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702856895; cv=none; d=google.com; s=arc-20160816; b=BvNhbni3urHQF4e89Ya2z7kWPBajYFPjUljlQ7mLjUMgkVzx8AbGEQtiT1NJKMogx2 l+Y7Z/rp/ywKhDYWE0dFBniI0itpqVkSud2xxt+OKbWDNlKd0x8kQ1jrZgeOP7Nkrud2 VRGm/ZVAq8rbXHvvPwysSpK+kQM9j83DwiUA+Q3aLovadCJcZPqpNNrbqYJgq8+E2J3A TH14ZhAYY2jcXDashVmYG9/KQGYtZby4EuKZQA/qlNz4JdWHQl06yYObOqQBExUS8vyx fpXwDumWQv8eDd/7vLFx+YU+jOqO1paJUDAzvoscMIdQLcSITRiHuHnUAu8DcLUt/w1T g3KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=Xd4o/leb3WIoJq7yzKGbJXYhThjRBM0bKQp6shqfr6s=; fh=s4eGoKboelvF8BIhb3ZdwLuwWbtj9b52Hkddlgbs+qE=; b=eDDtht48X7ytdqy7s/QP8zA6aTNBc1fizyTcMeBjSHQo6FfCqii4gTudBVVCs/R5Sh Do5WDxSqj6owGbgNRp7bMdoHyujB0jFK4M81+ZNrBwCANK4+ZgWC5Z/9yuI42SOMiqQQ bq1bH56K849BXiksr7ApOgFOwPYKHHV6qBImj9Ew8nKRdFbcE/fdpqgm/b1JY2g94LHI KyoixjTp2mbOg0XCmbgH4Nna2EjF1EfRl1ydUtsAMgt89mtuF9mkjfBJSsf5BUZzyGeF cq6tJejkUXP+WIz5cFjU6sPJmmSK6eSrodkjy+ctn+I4izvE6xII6usFj3gLP3zqDfn2 R/0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BKxmEd5U; spf=pass (google.com: domain of linux-kernel+bounces-2870-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-2870-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id n9-20020a5099c9000000b005529d3279fdsi2869447edb.683.2023.12.17.15.48.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 15:48:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-2870-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BKxmEd5U; spf=pass (google.com: domain of linux-kernel+bounces-2870-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-2870-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id A749D1F218F0 for ; Sun, 17 Dec 2023 23:48:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7BAC64B150; Sun, 17 Dec 2023 23:48:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="BKxmEd5U" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 69F3A4B122; Sun, 17 Dec 2023 23:47:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1702856871; bh=Xd4o/leb3WIoJq7yzKGbJXYhThjRBM0bKQp6shqfr6s=; h=Date:From:To:Cc:Subject:From; b=BKxmEd5UqQk09NEwNo3vhgxYfjH829gpQLsQsbGIaIMVTJ0ccnWM8jyz+TKSjcvdR pWcoe0hcOksD795WHGSy4DKV7x0ITzc/HMnAnFJkEM4qXivWzZsUxFpuFn3S79oKdi /laBRT4CE5UIznwnSvWp6FDWSPrkmnhLOxBCApts2QMrunJWGr5y5Kv31r1bVTdTtI 8dcjkbdKM6sdkuYFPWM7DhJ7kH3X8xkS2PZOnlZzIrEjjtntWoV/7zLxtcTqndrQWk UU58qFYx74MSZWnYm18/h2EwOPTSToD34elHSgNAnIpeug+jxMwmyX43soVrsUpOnA k0NBRy+/UoNjQ== 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 4StflV2Km3z4wd4; Mon, 18 Dec 2023 10:47:50 +1100 (AEDT) Date: Mon, 18 Dec 2023 10:47:49 +1100 From: Stephen Rothwell To: Herbert Xu Cc: Linux Crypto List , Hans de Goede , Jonathan Corbet , Linux Kernel Mailing List , Linux Next Mailing List , Ma Jun , Sumit Garg , Tom Zanussi Subject: linux-next: manual merge of the crypto tree with the jc_docs, wireless-next trees Message-ID: <20231218104749.560969bf@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785574871827140674 X-GMAIL-MSGID: 1785574871827140674 Hi all, Today's linux-next merge of the crypto tree got a conflict in: Documentation/driver-api/index.rst between commits: 50709576d81b ("Documentation: Destage TEE subsystem documentation") 2128f3cca5a2 ("Documentation/driver-api: Add document about WBRF mechanism") from the jc_docs, wireless-next trees and commit: 8ccc257b29a1 ("crypto: iaa - Add IAA Compression Accelerator Documentation") from the crypto 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 Documentation/driver-api/index.rst index e8e7ee506b13,8b95501cc208..000000000000 --- a/Documentation/driver-api/index.rst