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=-13.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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 6B911C43462 for ; Thu, 22 Apr 2021 07:34:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 417376145C for ; Thu, 22 Apr 2021 07:34:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235037AbhDVHep (ORCPT ); Thu, 22 Apr 2021 03:34:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230438AbhDVHem (ORCPT ); Thu, 22 Apr 2021 03:34:42 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2A3DC06138B for ; Thu, 22 Apr 2021 00:34:05 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id m7so39876302ljp.10 for ; Thu, 22 Apr 2021 00:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=gEEBMhBSAcHjqpIEk9kFgoNJRNFl4oJ65WL8v6C0U/Q=; b=XaPSpzGVmkqEnmJDUT77EMq4WzCHQRYg1yM2aezvvn5ZehdvJNiAk5hyioPmv1LQNQ /belzPQmgfBGoGHDy+WpV45r8gF8SChbFyqVmHm06rX9ISBFFPLgIgCl1XPIU4yQ2Edm B+4mbb2rOKdfyqUIPfLPSRTgyQgmlXS9bMHlvWDXRKpkgAlzt3rFMOoLLPadU8FjrADy ER9moym8M466YphDdl5nwD7N+5/DngLMgnAUHtIIcnERRZmKmTD8hkwfLtvMQr9muDqG MrZ/p0J6bqUBBPbn9tA7l3Yv3G/bRY6oWhIJl+weuJzPQjNnm3nRwpaNyFKBwrNWub1h L7Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=gEEBMhBSAcHjqpIEk9kFgoNJRNFl4oJ65WL8v6C0U/Q=; b=ksPC8DoN1cwISQYxvpf2K9K1Ax5+aoQHlf930Tcu5sgb6u52s6TY6WyluXnBeIPzal vuXy740/QPl0IE0E3MKPasWvr7ZN3Kl27tOrzf/AcNyY9ghV+0Gtq+l+YpiaDUFYaW91 ZGaOf493byjbPLEJoJkL91NRwlFk5/SFLSIWQPoKit+2+HJ7QbYPxZ0sSY8UpePyi+Bm l+iFrIvIE5RIksqczRYS7HStb6ipdUoeufbQ1IqD3DYcX2gsMs+CbB5xgGJ9vmlmqKRT WXFp3ASJnurf438MYPeVOVI7tAOlGRqJwKRe/GZMvmnd1aESwE5iG855UHkagV+aW56a tdZg== X-Gm-Message-State: AOAM530fnZoyxza/IOBre1zu0SDNzuy0ifqSLgz1sZqQ18W1X0RqVwcW KTmdJXhJtbOdDA17xUn80QqQiYMEQaQriBRFyhgrgVohnTUE9Q== X-Google-Smtp-Source: ABdhPJzM21a0QPKLw9KWd9aRpGtkmgDqKm5rlTq2WeW4y1O+2yPBHNvBaQv/qH7MZ1IFwlGCeydzjuiy6pXKTWze3p4= X-Received: by 2002:a2e:91c3:: with SMTP id u3mr1614741ljg.106.1619076844002; Thu, 22 Apr 2021 00:34:04 -0700 (PDT) MIME-Version: 1.0 References: <20210422155355.471c7751@canb.auug.org.au> <124cf94f-e7f5-d6f3-7e7a-2685e1e7517f@redhat.com> In-Reply-To: <124cf94f-e7f5-d6f3-7e7a-2685e1e7517f@redhat.com> From: Vipin Sharma Date: Thu, 22 Apr 2021 00:33:47 -0700 Message-ID: Subject: Re: linux-next: manual merge of the cgroup tree with the kvm tree To: Paolo Bonzini Cc: Stephen Rothwell , Tejun Heo , KVM , Linux Kernel Mailing List , Linux Next Mailing List , Sean Christopherson , David Rientjes Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 21, 2021 at 11:34 PM Paolo Bonzini wrote: > > 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 > First of all, I am sorry that my patch series has caused this trouble to all of you. I am not aware of the correct way to submit a patch series which changes files in more than one maintainer's territory. Any guidance for the future will be helpful. Paolo, Stephen, We need a little more fix in the sev_asid_free() function for Stephen's changes to work correctly as es_active is used in that function also. Is there a repo and branch where I can see the final state of merges and then I can send my patch against that? Thanks Vipin