From: Paolo Bonzini <pbonzini@redhat.com>
To: Tejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
KVM <kvm@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sean Christopherson <seanjc@google.com>,
Vipin Sharma <vipinsh@google.com>
Subject: Re: linux-next: manual merge of the cgroup tree with the kvm tree
Date: Thu, 22 Apr 2021 13:56:21 +0200 [thread overview]
Message-ID: <58697cc7-cb94-19f0-0b60-759ec8fdbae8@redhat.com> (raw)
In-Reply-To: <YIFiiYtgL7/uvzng@slm.duckdns.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
next prev parent reply other threads:[~2021-04-22 11:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-22 5:53 linux-next: manual merge of the cgroup tree with the kvm tree Stephen Rothwell
2021-04-22 6:34 ` Paolo Bonzini
2021-04-22 7:33 ` Vipin Sharma
2021-04-22 7:47 ` Paolo Bonzini
2021-04-22 17:09 ` Vipin Sharma
2021-04-22 17:18 ` Paolo Bonzini
2021-04-22 17:30 ` Vipin Sharma
2021-04-22 11:48 ` Tejun Heo
2021-04-22 11:56 ` Paolo Bonzini [this message]
2021-04-22 5:57 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=58697cc7-cb94-19f0-0b60-759ec8fdbae8@redhat.com \
--to=pbonzini@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=seanjc@google.com \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
--cc=vipinsh@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).