From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Yin Fengwei <fengwei.yin@intel.com>
Subject: linux-next: manual merge of the vhost tree with the pm tree
Date: Tue, 29 Oct 2019 15:19:28 +1100 [thread overview]
Message-ID: <20191029151928.780c8ede@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 762 bytes --]
Hi all,
Today's linux-next merge of the vhost tree got a conflict in:
drivers/acpi/processor_idle.c
between commit:
fa583f71a99c ("ACPI: processor_idle: Skip dummy wait if kernel is in guest")
from the pm tree and commit:
a04c0533b07c ("ACPI: disable extra P_LVLx access on KVM")
from the vhost tree.
I fixed it up (I just used the pm tree version) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-10-29 4:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 4:19 Stephen Rothwell [this message]
2019-10-29 8:02 ` linux-next: manual merge of the vhost tree with the pm tree Yin Fengwei
2019-10-29 22:13 ` Rafael J. Wysocki
2019-10-30 23:25 ` Michael S. Tsirkin
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=20191029151928.780c8ede@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=fengwei.yin@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
--cc=rjw@rjwysocki.net \
/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).