From: Sasha Levin <sashal@kernel.org>
To: torvalds@linux-foundation.org
Cc: gregkh@linuxfoundation.org, linux-hyperv@vger.kernel.org,
kys@microsoft.com, haiyangz@microsoft.com,
sthemmin@microsoft.com, linux-kernel@vger.kernel.org,
linux-kernel@microsoft.com
Subject: [GIT PULL] hyper-v patches for 5.3
Date: Thu, 11 Jul 2019 14:32:18 -0400 [thread overview]
Message-ID: <20190711183218.GA10104@sasha-vm> (raw)
Hi Linus,
Please pull the signed tag below for two Hyper-V commits for 5.3.
You will see a conflict in arch/x86/include/asm/mshyperv.h due to
few Hyper-V related patches that went through tglx's tree, please
resolve that by keeping the header inclusion at the end but removing the
TSC related code. For reference, this is a correct resolution in
linux-next:
https://lore.kernel.org/lkml/20190709195358.25af244b@canb.auug.org.au/ .
Yes, this conflict is new-ish, but mostly because we split a series of
patches between this tree and tglx's. The patch in question is the same
as it was when I've accepted it back in May, and is well tested at this
point.
The following changes since commit 4b972a01a7da614b4796475f933094751a295a2f:
Linux 5.2-rc6 (2019-06-22 16:01:36 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git tags/hyperv-next-signed
for you to fetch changes up to 765e33f5211ab620c117ff1ee0c4f38c10f7a973:
Drivers: hv: vmbus: Break out ISA independent parts of mshyperv.h (2019-07-08 19:06:27 -0400)
----------------------------------------------------------------
- Add a module description to the Hyper-V vmbus module.
- Rework some vmbus code to separate architecture specifics out to
arch/x86/. This is part of the work of adding arm64 support to Hyper-V.
----------------------------------------------------------------
Joseph Salisbury (1):
drivers: hv: Add a module description line to the hv_vmbus driver
Michael Kelley (1):
Drivers: hv: vmbus: Break out ISA independent parts of mshyperv.h
MAINTAINERS | 1 +
arch/x86/include/asm/mshyperv.h | 148 ++--------------------------------------------------
drivers/hv/vmbus_drv.c | 1 +
include/asm-generic/mshyperv.h | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 187 insertions(+), 143 deletions(-)
create mode 100644 include/asm-generic/mshyperv.h
next reply other threads:[~2019-07-11 18:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 18:32 Sasha Levin [this message]
2019-07-12 23:20 ` [GIT PULL] hyper-v patches for 5.3 pr-tracker-bot
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=20190711183218.GA10104@sasha-vm \
--to=sashal@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=haiyangz@microsoft.com \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sthemmin@microsoft.com \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).