Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the vhost tree with the pm tree
@ 2019-10-29  4:19 Stephen Rothwell
  2019-10-29  8:02 ` Yin Fengwei
  2019-10-29 22:13 ` Rafael J. Wysocki
  0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2019-10-29  4:19 UTC (permalink / raw)
  To: Michael S. Tsirkin, Rafael J. Wysocki
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Yin Fengwei

[-- 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 --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the vhost tree with the pm tree
  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
  1 sibling, 0 replies; 4+ messages in thread
From: Yin Fengwei @ 2019-10-29  8:02 UTC (permalink / raw)
  To: Stephen Rothwell, Michael S. Tsirkin, Rafael J. Wysocki
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

Hi,

On 2019/10/29 下午12:19, 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")
Sorry for this. I only check the linus tree and didn't notice there is
this patch in pm tree.

BTW, from this patch (a04c0533b07c), it has todo to extend the
hypervisor not only for kvm. So I suppose it's time to add one more:
ACRN. Thanks.

Regards
Yin, Fengwei

> 
> 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.
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the vhost tree with the pm tree
  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
  1 sibling, 1 reply; 4+ messages in thread
From: Rafael J. Wysocki @ 2019-10-29 22:13 UTC (permalink / raw)
  To: Stephen Rothwell, Michael S. Tsirkin
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Yin Fengwei

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.

> 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.
> 
> 





^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the vhost tree with the pm tree
  2019-10-29 22:13 ` Rafael J. Wysocki
@ 2019-10-30 23:25   ` Michael S. Tsirkin
  0 siblings, 0 replies; 4+ messages in thread
From: Michael S. Tsirkin @ 2019-10-30 23:25 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Yin Fengwei

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.
> > 
> > 
> 
> 
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git