From patchwork Fri Jun 23 02:20:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 111875 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5481874vqr; Thu, 22 Jun 2023 19:38:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5+2XqNtTnKEiy5XHn7tmhpxAf0pWtJkrlqCTOxiQ9QmEWms0RjjfWK7kBXIRX35kaqVYw1 X-Received: by 2002:a17:902:ecc6:b0:1ae:8fa:cd4c with SMTP id a6-20020a170902ecc600b001ae08facd4cmr40706286plh.7.1687487935484; Thu, 22 Jun 2023 19:38:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687487935; cv=none; d=google.com; s=arc-20160816; b=PSZ8ieBbok+ivuK3L5RK4YxJMSrNZ3cIypk+TlnyQ7Q+F43ucY2SnnqFTKT6tcHsO8 41SO3IHtz5EUHCC7hsXAq6vDiD4SM//KLbRnuz/Id0Bf4EMVMIsc8XlCMuonnWaLm37B lJzki3H7qEa41ZufN9Tvf0eVHQcj55LZzysx99RQUI6UMSguUwCJ37uJV/saKJYfc+JB q6iyWxZKpUFc7PsPolHB80c0n+3xMXo+DLJaMx6UW5QGSpr8MApj/rw4MiUDPBK0hy1u cUCE/r7VHL3DpjU4ut4rFekIP16b8YypHlAqEbJpjNsjqtWyrqSkiP1OY80cRju31Tpb d68A== 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=TCCFMEXH3LH5PAQ+wFvijb678E4tpW9KTYyHVKC9U20=; b=bWUPp7IHeDHjgxWppRpjZKx6DQoFzt2ye8Ri8+/Ewim7pS6XUTsh/+RYjS0HN5s/P/ pXMUmgGXhlUtkSJSd2Mzr3A6hUvnw8nlINZuJXrXz8CzquUSnSZkxm9S162svpLkz1FN W/YlsjYG2V8CV/qVJfhxSch6FEjDhaEfeV24wxu4YZ6zK2PKrqHGMkviqZ0E9MQmtt9l zNy7FDuOwGd15aMTC0tx28V+KCneYRntiQ/IyOnwhmA6bAvhuPfvZUK84tK35s+imRm+ mSCPPs/zyNy+ZofflKaFuTJb3HSEkPwZfadFUZB5tMp0ci1dKrKkUk1Bupc34sUsABtk 8zHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Hlg9Opxz; 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 q3-20020a17090311c300b001b3b96dc6bbsi4061153plh.135.2023.06.22.19.38.39; Thu, 22 Jun 2023 19:38:54 -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=Hlg9Opxz; 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 S230255AbjFWCWv (ORCPT + 99 others); Thu, 22 Jun 2023 22:22:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229871AbjFWCWu (ORCPT ); Thu, 22 Jun 2023 22:22:50 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2CBF1BCA; Thu, 22 Jun 2023 19:22:48 -0700 (PDT) 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 (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QnLcL02xTz4x0L; Fri, 23 Jun 2023 12:22:41 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687486964; bh=TCCFMEXH3LH5PAQ+wFvijb678E4tpW9KTYyHVKC9U20=; h=Date:From:To:Cc:Subject:From; b=Hlg9OpxzQWUETfnm9O4rXdyMcR7T4wRgbcqSlrtofEDlq9pEGF3fLT7DmlTxKo/Vx /XOU5TqPmyDWlGjtou6Ildqxh0HYB/uX82TQwk5SQfDYOCxJYZnFVnl1EDneAj8djw nI16KYIbkmyrhtRoQO/pg0l8c5X1/uDoW9mKI9xlkSPeqrnnvQRVRIF7qaFE1jToBf pv1Il+AkKXiMmjhH74qcnW3FWf/55Z1S6YfIbVKMd3ZzgcYhJfUHxyqBuHLRIrvK9U Hq6LIY1fXvQdgbsi/kyDWTy9pCrMGvA/BpB5r+F2DO71VaH8yzKlo+4VinfXwnpz29 KbwMjg7BhFlFw== Date: Fri, 23 Jun 2023 12:20:37 +1000 From: Stephen Rothwell To: Sean Christopherson , Olof Johansson , Arnd Bergmann Cc: ARM , Conor Dooley , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the kvm-x86 tree with the arm-soc tree Message-ID: <20230623122037.16eb8bec@canb.auug.org.au> MIME-Version: 1.0 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,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769459349156560698?= X-GMAIL-MSGID: =?utf-8?q?1769459349156560698?= Hi all, Today's linux-next merge of the kvm-x86 tree got a conflict in: Documentation/process/maintainer-handbooks.rst between commit: 425d827ef91e ("Documentation/process: add soc maintainer handbook") from the arm-soc tree and commit: 63e2f55cabed ("Documentation/process: Add a maintainer handbook for KVM x86") from the kvm-x86 tree. I fixed it up (and sorted the entries - 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/process/maintainer-handbooks.rst index fe24cb665fb7,d12cbbe2b7df..000000000000 --- a/Documentation/process/maintainer-handbooks.rst