From patchwork Fri Jun 25 05:20:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12343609 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=unavailable 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 5B22AC49EA7 for ; Fri, 25 Jun 2021 05:20:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3AF4461425 for ; Fri, 25 Jun 2021 05:20:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233144AbhFYFWi (ORCPT ); Fri, 25 Jun 2021 01:22:38 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:49679 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230228AbhFYFWi (ORCPT ); Fri, 25 Jun 2021 01:22:38 -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 4GB51C5PTyz9sT6; Fri, 25 Jun 2021 15:20:14 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1624598416; bh=v9Sz1AU5rpnqUdoM7nrNk4xBnk8C9iV3y7lBBvJh+tk=; h=Date:From:To:Cc:Subject:From; b=E+kukCoDZyvBsnOaINvmk775PzqxHf4UorAxLPnt8zZUGMFwHrqqV1Dl92uCdXXrq qsYVWHR/tJ2+pOpfuFHUQTEEROvTH2HxO7bdqvY5gmZtpfaJyEQa20uwLooPXn0NuE KMdUs/s5Ny20MTZ3YNH2pGXSy6mtwgB+NIwnEwvThM+Cpfu7keEWIBoF/ZBxq1jNiW vc73nyHBlxgcPy1GoCK9TQufGBSD9FoB6QyQSY8usjMIT9WhZYhCh7xvyGNu+LhI/m 5za90UB0Gl/IdLw4ifIm9gCoHVDt6G+37RoRygoeXhKwoo6H4Q3YRHnbPnWpQyuUAE hfpaYIIOQqSGw== Date: Fri, 25 Jun 2021 15:20:13 +1000 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Paolo Bonzini , KVM Cc: Aaron Lewis , Jing Zhang , Linux Kernel Mailing List , Linux Next Mailing List , Steven Price Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree Message-ID: <20210625152013.7e121403@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: include/uapi/linux/kvm.h between commits: cb082bfab59a ("KVM: stats: Add fd-based API to read binary stats data") 19238e75bd8e ("kvm: x86: Allow userspace to handle emulation errors") from the kvm tree and commit: ea7fc1bb1cd1 ("KVM: arm64: Introduce MTE VM feature") 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 include/uapi/linux/kvm.h index 68c9e6d8bbda,da1edd2b4046..000000000000 --- a/include/uapi/linux/kvm.h