From mboxrd@z Thu Jan 1 00:00:00 1970 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=-7.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 DCCA7C433B4 for ; Thu, 22 Apr 2021 06:34:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F19461457 for ; Thu, 22 Apr 2021 06:34:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234797AbhDVGe4 (ORCPT ); Thu, 22 Apr 2021 02:34:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41839 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230232AbhDVGey (ORCPT ); Thu, 22 Apr 2021 02:34:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619073260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=32v070lHFea27N/7UXZgNzlr22E5m7KkC6ga6LEk8XM=; b=g2xP28gExffuPNIBjAddJEfrMKLIPWMURtV4iTBbcfVbB16hRtLijznL1k3y8c7bUWaC5p YNfe5c9hmRRpQ974MAAPQpI8CO20XjRyW3Op+B46H9rsSaSwsFUwhRs1FuIP6f900k9HO/ ycoU+r4aay+J3nUJSt7mX7qzlI0h01w= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-370-0gsqkRzbOjiqw2sip1JWNA-1; Thu, 22 Apr 2021 02:34:18 -0400 X-MC-Unique: 0gsqkRzbOjiqw2sip1JWNA-1 Received: by mail-ej1-f72.google.com with SMTP id 16-20020a1709063010b029037417ca2d43so6818496ejz.5 for ; Wed, 21 Apr 2021 23:34:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=32v070lHFea27N/7UXZgNzlr22E5m7KkC6ga6LEk8XM=; b=PeR6MrFW3FMpAlMS6GxBdTvUWjwpli8Z7DNt8c17cTdkzd7twxD06tC2ZWLO1bc1qd qPvBPDc7f5gMgVnR3BYa7+mxcWi7oulWJblewKsIE9XgYISk+ivWmfsAOCu2Za/McHvn uCs7XISGyPaILDVegqXy4KNrgNJMfDbYpWPFxlGKrgWpAe4p3zi6MF36M7zmHQ9vgyit Suq2ldof35vcTmfPLACRPkv+QhKzaZJtajcMAgGZy/vLWly8Oo9hrTmBEE764+1K8oKI EYyvz+6uC8oNOjlOSWWftWXuouw+rSPQdUe56cI2HeckpcPQuZW4NrG+jlntiQSUeIbj oPCQ== X-Gm-Message-State: AOAM5315oTaROjBaD0YAk+htJVqy4l2FrPL5mdDp6Wa0wmD8sH31H+rz u++XqRXy1j3ahtg4BJh8jnHe9d2nbNLx3X3F3X3/JwnsBGPcvBj8uOXDWh5L+pVBvef7Rk7nubM BO5i90fUjny5NZPM6BjTogA== X-Received: by 2002:a05:6402:5244:: with SMTP id t4mr1835093edd.355.1619073257020; Wed, 21 Apr 2021 23:34:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmLCrtpnW7vTQuG1hagGhM6plMHauJ8eOsASBJaES0xqweWLrTtOTKh4p/xUXsGl2I+Vr6Mw== X-Received: by 2002:a05:6402:5244:: with SMTP id t4mr1835080edd.355.1619073256851; Wed, 21 Apr 2021 23:34:16 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:c8dd:75d4:99ab:290a? ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id u6sm1164854ejn.14.2021.04.21.23.34.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 21 Apr 2021 23:34:16 -0700 (PDT) Subject: Re: linux-next: manual merge of the cgroup tree with the kvm tree To: Stephen Rothwell , Tejun Heo , KVM Cc: Linux Kernel Mailing List , Linux Next Mailing List , Sean Christopherson , Vipin Sharma References: <20210422155355.471c7751@canb.auug.org.au> From: Paolo Bonzini Message-ID: <124cf94f-e7f5-d6f3-7e7a-2685e1e7517f@redhat.com> Date: Thu, 22 Apr 2021 08:34:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <20210422155355.471c7751@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On 22/04/21 07:53, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the cgroup tree got conflicts in: > > arch/x86/kvm/svm/sev.c > > between commit: > > 9fa1521daafb ("KVM: SVM: Do not set sev->es_active until KVM_SEV_ES_INIT completes") > > 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. > Tejun, please don't commit patches to other tree without an Acked-by from the maintainer (which I wouldn't have provided, as the right way to go would have been a topic branch). Fortunately these patches are at the bottom of your tree. If it's okay, I'll just pull from there "as if" you had provided a topic branch all the time. Thanks, Paolo