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: 755156 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 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" 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-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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