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: 13289945 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 895D6EB64DA for ; Fri, 23 Jun 2023 02:23:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=s2JCfYxfqyXR2SIGLLeGAMgGEQkfYReWN29f3xuYY7s=; b=Zf+ hCavMjhdJdwISA2NGU2Om79kQxb06drUrHDYL9O+OPsUqep4//fG0Y3feYcN0wclTNFVbgjym2CUD bYCw8mnwzl+jwi2wjDG3x6nDT/w+jvuU1JwRPL61DnNizVt/1lFfOwNWGS3crRUUevJ7LR5HMRxCa rwsIRXfK208CZ/Bs10TazZfWpEzdHDfR3ogoYXj/t6/wQKT5Lh5wMljf/msvvNkGgaY0fNXdl5Oxp lgUOidUD+LAezo+JOaOh2rLJDEa4jNEruJSsFgcylDqZqFLlWOs6/lRivI+EhJve1GS45H1UwRtnV V/2q/JuGRigAVHG7dxNPjVLu9OKYKaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qCWRm-002JfQ-0f; Fri, 23 Jun 2023 02:22:50 +0000 Received: from gandalf.ozlabs.org ([150.107.74.76]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qCWRi-002Jei-2c for linux-arm-kernel@lists.infradead.org; Fri, 23 Jun 2023 02:22:48 +0000 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230622_192247_117148_F2B7F98A X-CRM114-Status: GOOD ( 15.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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