From patchwork Tue Jun 22 05:31:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12336447 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE3A5C2B9F4 for ; Tue, 22 Jun 2021 05:31:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ACBD36128E for ; Tue, 22 Jun 2021 05:31:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229999AbhFVFd0 (ORCPT ); Tue, 22 Jun 2021 01:33:26 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:43751 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229853AbhFVFd0 (ORCPT ); Tue, 22 Jun 2021 01:33:26 -0400 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 4G8FP92yLZz9sjB; Tue, 22 Jun 2021 15:31:08 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1624339870; bh=+iTBWQ1I2dZ1rputthWeJ/k2YsXV48BguOCFkccfVsM=; h=Date:From:To:Cc:Subject:From; b=j7lrNnbCjMXFeINRUnZ0RewL4ixFZ75s05+TtrJU1Xt0At9CumtyqSGbtVzoDcK7c wvlZ4FPDEoHX798NGL0jS+CWBKoZX611iwZqLvwhj8jttj58mqBr7tHDpMElbqGBTX ptPOh6DNtbVZm14YKEBktMT+6/2suKyV7b1UBUAAW67j/znjEkLoEGDRfn9kekUuCg aXEK15o9pQFU9qPBbH4w5ESebDzGNzejLxrycB14mctRA3b7o2jYsJ81tTePqH56r0 KKKl2FmcIvtLd9ApU6m7R0NX134Ka5Jwm+1SDUlQzD8UMFPuPZ2n/7eTEcl/LW0E0q SV/QWWTNrTNyQ== Date: Tue, 22 Jun 2021 15:31:07 +1000 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Paolo Bonzini , KVM Cc: Jim Mattson , Linux Kernel Mailing List , Linux Next Mailing List , Ricardo Koller Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree Message-ID: <20210622153107.1db31b13@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: tools/testing/selftests/kvm/Makefile between commit: 4c63c9234085 ("KVM: selftests: Hoist APIC functions out of individual tests") from the kvm tree and commit: e3db7579ef35 ("KVM: selftests: Add exception handling support for aarch64") from the kvm-arm 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 tools/testing/selftests/kvm/Makefile index 61e2accd080d,36e4ebcc82f0..000000000000 --- a/tools/testing/selftests/kvm/Makefile