From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: Stephen Hemminger <sthemmin@microsoft.com>,
Jork Loeser <Jork.Loeser@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
x86@kernel.org, linux-kernel@vger.kernel.org,
Steven Rostedt <rostedt@goodmis.org>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Ingo Molnar <mingo@redhat.com>, Andy Lutomirski <luto@kernel.org>,
"H. Peter Anvin" <hpa@zytor.com>,
devel@linuxdriverproject.org,
Thomas Gleixner <tglx@linutronix.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: [PATCH v8 07/10] hyper-v: globalize vp_index
Date: Wed, 14 Jun 2017 10:29:20 +0800 [thread overview]
Message-ID: <8760fzxpxb.fsf@vitty.brq.redhat.com> (raw)
In-Reply-To: <20170613162143.71ca0cc8@xeon-e3> (Stephen Hemminger's message of "Tue, 13 Jun 2017 16:21:43 -0700")
Stephen Hemminger <stephen@networkplumber.org> writes:
> On Fri, 9 Jun 2017 15:27:33 +0200
> Vitaly Kuznetsov <vkuznets@redhat.com> wrote:
>
>> To support implementing remote TLB flushing on Hyper-V with a hypercall
>> we need to make vp_index available outside of vmbus module. Rename and
>> globalize.
>>
>> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
>> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
>
> This is correct, but needs to be rebased.
> It conflicts with the PCI protocol version 1.2 patches that are
> in the PCI tree.
:-(
The question is - what do we do? As far as I understand the intent was
to push this through Greg's char-misc tree. If I rebase it to Bjorn's
pci tree patches won't apply to char-misc and Greg won't take them. I
see three possible ways to go:
1) Take them into char-misc and resolve the conflict in merge window
(Linus will hate us all :-( )
2) Ask Greg to merge with Bjorn _now_ so we can send the rebased
version.
3) Postpone these patches to the next kernel release. No guarantee we
won't clash with something else :-(
So I'm a bit lost. With Hyper-V drivers scattered across multiple trees
we're doomed to have such issues with every relatively big series.
--
Vitaly
next prev parent reply other threads:[~2017-06-14 2:29 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-09 13:27 [PATCH v8 00/10] Hyper-V: paravirtualized remote TLB flushing and hypercall improvements Vitaly Kuznetsov
2017-06-09 13:27 ` [PATCH v8 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set Vitaly Kuznetsov
2017-06-09 13:27 ` [PATCH v8 02/10] x86/hyper-v: stash the max number of virtual/logical processor Vitaly Kuznetsov
2017-06-09 13:27 ` [PATCH v8 03/10] x86/hyper-v: make hv_do_hypercall() inline Vitaly Kuznetsov
2017-06-09 13:27 ` [PATCH v8 04/10] x86/hyper-v: fast hypercall implementation Vitaly Kuznetsov
2017-06-09 13:27 ` [PATCH v8 05/10] hyper-v: use fast hypercall for HVCALL_SIGNAL_EVENT Vitaly Kuznetsov
2017-06-09 13:27 ` [PATCH v8 06/10] x86/hyper-v: implement rep hypercalls Vitaly Kuznetsov
2017-06-09 13:27 ` [PATCH v8 07/10] hyper-v: globalize vp_index Vitaly Kuznetsov
2017-06-13 23:21 ` Stephen Hemminger
2017-06-14 2:29 ` Vitaly Kuznetsov [this message]
2017-06-14 4:31 ` Jork Loeser
2017-06-14 16:10 ` Stephen Hemminger
2017-06-09 13:27 ` [PATCH v8 08/10] x86/hyper-v: use hypercall for remote TLB flush Vitaly Kuznetsov
2017-06-09 13:27 ` [PATCH v8 09/10] x86/hyper-v: support extended CPU ranges for TLB flush hypercalls Vitaly Kuznetsov
2017-06-09 13:27 ` [PATCH v8 10/10] tracing/hyper-v: trace hyperv_mmu_flush_tlb_others() Vitaly Kuznetsov
2017-06-09 18:04 ` Steven Rostedt
2017-06-09 18:23 ` Andy Shevchenko
2017-06-09 18:32 ` Steven Rostedt
2017-06-09 18:40 ` Andy Shevchenko
2017-06-09 18:53 ` Paul Bolle
2017-06-09 19:07 ` Steven Rostedt
2017-06-12 2:56 ` Vitaly Kuznetsov
2017-06-09 16:04 ` [PATCH v8 00/10] Hyper-V: paravirtualized remote TLB flushing and hypercall improvements Andy Shevchenko
2017-06-09 16:14 ` Stephen Hemminger
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=8760fzxpxb.fsf@vitty.brq.redhat.com \
--to=vkuznets@redhat.com \
--cc=Jork.Loeser@microsoft.com \
--cc=andy.shevchenko@gmail.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=haiyangz@microsoft.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=stephen@networkplumber.org \
--cc=sthemmin@microsoft.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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