From: broonie@kernel.org
To: Luis Chamberlain <mcgrof@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Long Li <longli@microsoft.com>, Wei Liu <wei.liu@kernel.org>
Subject: linux-next: manual merge of the sysctl tree with the hyperv tree
Date: Mon, 24 Apr 2023 16:47:42 +0100 [thread overview]
Message-ID: <20230424154742.131094-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the sysctl tree got a conflict in:
drivers/hv/vmbus_drv.c
between commit:
9c318a1d9b500 ("Drivers: hv: move panic report code from vmbus to hv early init code")
from the hyperv tree and commit:
525f23fe58b59 ("hv: simplify sysctl registration")
from the sysctl 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.
diff --cc drivers/hv/vmbus_drv.c
index 1c65a6dfb9fae,229353f1e9c29..0000000000000
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
next reply other threads:[~2023-04-24 15:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-24 15:47 broonie [this message]
2023-04-24 17:42 ` linux-next: manual merge of the sysctl tree with the hyperv tree Wei Liu
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=20230424154742.131094-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=longli@microsoft.com \
--cc=mcgrof@kernel.org \
--cc=wei.liu@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