From: "Michael S. Tsirkin" <mst@redhat.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
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: Re: linux-next: manual merge of the vhost tree with the pm tree
Date: Wed, 30 Oct 2019 19:25:07 -0400 [thread overview]
Message-ID: <20191030192308-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <2535052.Q9mzRWFaI7@kreacher>
On Tue, Oct 29, 2019 at 11:13:57PM +0100, Rafael J. Wysocki wrote:
> On Tuesday, October 29, 2019 5:19:28 AM CET Stephen Rothwell wrote:
> > 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")
>
> Well, if this touches code under drivers/acpi/, it should have been CCed to
> linux-acpi@vger.kernel.org, but I don't recall seeing it.
It's an old RFC, posted a couple of years ago.
I guess I can drop it for now.
> > 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.
> >
> >
>
>
>
prev parent reply other threads:[~2019-10-30 23:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 4:19 linux-next: manual merge of the vhost tree with the pm tree Stephen Rothwell
2019-10-29 8:02 ` Yin Fengwei
2019-10-29 22:13 ` Rafael J. Wysocki
2019-10-30 23:25 ` Michael S. Tsirkin [this message]
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=20191030192308-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=fengwei.yin@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
/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).