linux-next: manual merge of the xen-tip tree with Linus' tree

linux-next: manual merge of the xen-tip tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 799 bytes --]

Hi all,

Today's linux-next merge of the xen-tip tree got a conflict in:

  arch/x86/include/asm/xen/hypercall.h

between commits:

  f4afb713e5c3 ("x86/xen: Make get_debugreg() noinstr")
  7361fac0465b ("x86/xen: Make set_debugreg() noinstr")

from Linus' tree and commit:

  321d124f13fd ("xen: allow pv-only hypercalls only with CONFIG_XEN_PV")

from the xen-tip 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the xen-tip tree with Linus' tree

[Stefano Stabellini]

On Fri, 16 Feb 2018, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the xen-tip tree got a conflict in:
> 
>   drivers/xen/pvcalls-front.c
> 
> between commit:
> 
>   a9a08845e9ac ("vfs: do bulk POLL* -> EPOLL* replacement")
> 
> from Linus' tree and commit:
> 
>   1e7dbff356e5 ("pvcalls-front: introduce a per sock_mapping refcount")
> 
> from the xen-tip 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.

Hi Stephen,

it looks good.

Cheers,

Stefano


> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/xen/pvcalls-front.c
> index 753d9cb437d0,ca5b77309c7d..000000000000
> --- a/drivers/xen/pvcalls-front.c
> +++ b/drivers/xen/pvcalls-front.c
> @@@ -963,20 -942,13 +942,13 @@@ __poll_t pvcalls_front_poll(struct fil
>   {
>   	struct pvcalls_bedata *bedata;
>   	struct sock_mapping *map;
>  -	int ret;
>  +	__poll_t ret;
>   
> - 	pvcalls_enter();
> - 	if (!pvcalls_front_dev) {
> - 		pvcalls_exit();
> + 	map = pvcalls_enter_sock(sock);
> + 	if (IS_ERR(map))
>  -		return POLLNVAL;
>  +		return EPOLLNVAL;
> - 	}
>   	bedata = dev_get_drvdata(&pvcalls_front_dev->dev);
>   
> - 	map = (struct sock_mapping *) sock->sk->sk_send_head;
> - 	if (!map) {
> - 		pvcalls_exit();
> - 		return EPOLLNVAL;
> - 	}
>   	if (map->active_socket)
>   		ret = pvcalls_front_poll_active(file, bedata, map, wait);
>   	else
> 

linux-next: manual merge of the xen-tip tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1533 bytes --]

Hi all,

Today's linux-next merge of the xen-tip tree got a conflict in:

  drivers/xen/pvcalls-front.c

between commit:

  a9a08845e9ac ("vfs: do bulk POLL* -> EPOLL* replacement")

from Linus' tree and commit:

  1e7dbff356e5 ("pvcalls-front: introduce a per sock_mapping refcount")

from the xen-tip 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/xen/pvcalls-front.c
index 753d9cb437d0,ca5b77309c7d..000000000000
--- a/drivers/xen/pvcalls-front.c
+++ b/drivers/xen/pvcalls-front.c
@@@ -963,20 -942,13 +942,13 @@@ __poll_t pvcalls_front_poll(struct fil
  {
  	struct pvcalls_bedata *bedata;
  	struct sock_mapping *map;
 -	int ret;
 +	__poll_t ret;
  
- 	pvcalls_enter();
- 	if (!pvcalls_front_dev) {
- 		pvcalls_exit();
+ 	map = pvcalls_enter_sock(sock);
+ 	if (IS_ERR(map))
 -		return POLLNVAL;
 +		return EPOLLNVAL;
- 	}
  	bedata = dev_get_drvdata(&pvcalls_front_dev->dev);
  
- 	map = (struct sock_mapping *) sock->sk->sk_send_head;
- 	if (!map) {
- 		pvcalls_exit();
- 		return EPOLLNVAL;
- 	}
  	if (map->active_socket)
  		ret = pvcalls_front_poll_active(file, bedata, map, wait);
  	else

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the xen-tip tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the xen-tip tree got a conflict in:

  arch/x86/xen/p2m.c

between commit:

  98dd166ea3a3 ("x86/xen/p2m: hint at the last populated P2M entry")

from Linus' tree and commit:

  c5fdd42b47ab ("x86/xen: export xen_alloc_p2m_entry()")

from the xen-tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/xen/p2m.c
index 660b3cfef234,4ea676a49b6b..000000000000
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@@ -619,14 -611,9 +622,15 @@@ int xen_alloc_p2m_entry(unsigned long p
  			free_p2m_page(p2m);
  	}
  
 +	/* Expanded the p2m? */
 +	if (pfn > xen_p2m_last_pfn) {
 +		xen_p2m_last_pfn = pfn;
 +		HYPERVISOR_shared_info->arch.max_pfn = xen_p2m_last_pfn;
 +	}
 +
- 	return true;
+ 	return 0;
  }
+ EXPORT_SYMBOL(xen_alloc_p2m_entry);
  
  unsigned long __init set_phys_range_identity(unsigned long pfn_s,
  				      unsigned long pfn_e)

linux-next: manual merge of the xen-tip tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the xen-tip tree got a conflict in:

  arch/x86/xen/Makefile

between commit:

  fc5fee86bdd3 ("x86/xen: build "Xen PV" APIC driver for domU as well")

from Linus' tree and commit:

  6e3012fba294 ("xen/PMU: Initialization code for Xen PMU")

from the xen-tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/xen/Makefile
index 4b6e29ac0968,071fab5c720e..000000000000
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@@ -13,7 -13,7 +13,7 @@@ CFLAGS_mmu.o			:= $(nostackp
  obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \
  			time.o xen-asm.o xen-asm_$(BITS).o \
  			grant-table.o suspend.o platform-pci-unplug.o \
- 			p2m.o apic.o
 -			p2m.o pmu.o
++			p2m.o apic.o pmu.o
  
  obj-$(CONFIG_EVENT_TRACING) += trace.o