From patchwork Thu Apr 22 05:57:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12217697 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 AFF3DC433B4 for ; Thu, 22 Apr 2021 05:57:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7855B61417 for ; Thu, 22 Apr 2021 05:57:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234777AbhDVF6H (ORCPT ); Thu, 22 Apr 2021 01:58:07 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:44511 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229923AbhDVF6D (ORCPT ); Thu, 22 Apr 2021 01:58:03 -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 4FQmsh0Pskz9sTD; Thu, 22 Apr 2021 15:57:28 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1619071048; bh=sg9p+Yym4WtkPibvGln+BlE8RicUroqClBfSKpfPyY4=; h=Date:From:To:Cc:Subject:From; b=GoNHdzV6ijIt79lu9nIC7atw6SkqgdrUYlZMQG+2IVvYcZ2YILdsnp8M7pBwDa0Eh F8yOEsmioe9+Z2r4NidAS53Zasklj07lfrG3L6uxav2x4Htz6PkAzaj/xt2pCVF2R9 BRa5AKLF6ClDLBEOxYS3lNuod1i52YtAfzUNFntDiefwsEQCEDZVRTt7vl3xMw/a04 Ff+ug+rI0WoGfEURpOIulmEm65pPtnQVApfLY6Tl7gRWiWG0UBPx2l4XxNdvBQN6O8 yM4955hchw2rH8y+j8IiZu5sCDyEKrRbCvbo2+J8dJ4d4mGbnGRAL02eqI4DsEA+nu 3yd7Ls7aMlFDg== Date: Thu, 22 Apr 2021 15:57:27 +1000 From: Stephen Rothwell To: Tejun Heo , Paolo Bonzini , KVM Cc: Linux Kernel Mailing List , Linux Next Mailing List , Nathan Tempelman , Vipin Sharma Subject: linux-next: manual merge of the cgroup tree with the kvm tree Message-ID: <20210422155727.70ca2e49@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 cgroup tree got a conflict in: arch/x86/kvm/svm/svm.h between commit: 54526d1fd593 ("KVM: x86: Support KVM VMs sharing SEV context") from the kvm tree and commit: 7aef27f0b2a8 ("svm/sev: Register SEV and SEV-ES ASIDs to the misc controller") from the cgroup 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 arch/x86/kvm/svm/svm.h index 454da1c1d9b7,9806aaebc37f..000000000000 --- a/arch/x86/kvm/svm/svm.h