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 74B46C433ED for ; Thu, 22 Apr 2021 11:56:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 413D86144D for ; Thu, 22 Apr 2021 11:56:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236008AbhDVL5C (ORCPT ); Thu, 22 Apr 2021 07:57:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:27429 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235977AbhDVL5B (ORCPT ); Thu, 22 Apr 2021 07:57:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619092586; 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=r/EfgkIAyveAD+413kdmsLTagFR2+ozoz9ZwbDock6Y=; b=WNBUCXWitlicQ+JZur8/QFWY/+YqewEfAPrZo32aP3kCbowhO9YrSV6U1Ot0Qvw2eRjUpA 51EdtVasxIlBdzWLKbsrnUk62cI4WHXHx6XAIvunDeZqHtFgPO8gvDxZpkE+yPN/+xURrm 12tXpJrADoQb7qb5rCUItCP4W48QKOA= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293-Bi8vThknOtix3y9X_QGkzw-1; Thu, 22 Apr 2021 07:56:24 -0400 X-MC-Unique: Bi8vThknOtix3y9X_QGkzw-1 Received: by mail-ej1-f70.google.com with SMTP id w2-20020a1709062f82b0290378745f26d5so7055875eji.6 for ; Thu, 22 Apr 2021 04:56:24 -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=r/EfgkIAyveAD+413kdmsLTagFR2+ozoz9ZwbDock6Y=; b=QcJHRhloSvj/YfaA/ZiIWl3fl0+ocwS/ZQTJMmqucBk70pVId2veNP9AwBoR8LFsSR EqTazBIa1IcHaVx4T0skSBlNAwZyLhLLH4dbP5oqtA39NuKiwdHW5iYzcWDebVzyk6mh SRCNNIv6sYA6bOjLq7g6/5RwTEznh8vxmED7t1RggqF3k6sAkJnfVqXOZlS3KRSOx5qf 8+ctRpj+kG/CFghfKFBkAeGCkYnHiGFIX9UQPYMHh4VJa6HJHCsVDWe9O3s/Bjp1I+C3 4t2h4c3ED6KI2tQ3mYdhfjhCqXOdFl4zL8s5vCLLXgyxEqHGtj+xxrTSG8Z+F/Le62ug I+wg== X-Gm-Message-State: AOAM53066WC+TlDKRsmICuh8nBuxERp2jOT/AylH1JApIi6W1qm2q07E c7BlVZJ3efXPcNEiE8Bh0QuZqVKB2FwRFyDi/nakiLuenYaCvRstLTUUrZDKklGx1NKwVrIppzE nG2lVZlB9BEDUXW9YfuqWbg== X-Received: by 2002:a17:906:4746:: with SMTP id j6mr3036122ejs.39.1619092583640; Thu, 22 Apr 2021 04:56:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCeeqN0ifqMSMQ2inHAeNFtxH8+83gzY3wP7UhM9Zgkyaq44qYqtN6tKTnJVbhKUD424wd2A== X-Received: by 2002:a17:906:4746:: with SMTP id j6mr3036108ejs.39.1619092583465; Thu, 22 Apr 2021 04:56:23 -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 b18sm1771934eju.22.2021.04.22.04.56.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Apr 2021 04:56:22 -0700 (PDT) Subject: Re: linux-next: manual merge of the cgroup tree with the kvm tree To: Tejun Heo Cc: Stephen Rothwell , KVM , Linux Kernel Mailing List , Linux Next Mailing List , Sean Christopherson , Vipin Sharma References: <20210422155355.471c7751@canb.auug.org.au> <124cf94f-e7f5-d6f3-7e7a-2685e1e7517f@redhat.com> From: Paolo Bonzini Message-ID: <58697cc7-cb94-19f0-0b60-759ec8fdbae8@redhat.com> Date: Thu, 22 Apr 2021 13:56:21 +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: Content-Type: text/plain; charset=utf-8; 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 13:48, Tejun Heo wrote: > Hello, Paolo. > > On Thu, Apr 22, 2021 at 08:34:15AM +0200, Paolo Bonzini wrote: >> 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). > > My apologies, for some reason, I was incorrectly assuming it was all dandy > on the kvm side. It was, just full of conflicts. :) It's only a process thing and not a problem with the code. >> 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. > > I'd be happy with however you wanna resolve it. Please let me know if > there's anything I can do to help. Great, I've pulled from your tree then. Stephen, that will also fix the conflicts with Linus's tree, since Tejun's merge base was newer than mine. Paolo