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

[Stephen Rothwell]

Hi all,

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

  arch/x86/xen/irq.c

between commits:

  20125c872a3f ("x86/xen: Make save_fl() noinstr")
  d7bfc7d57cbe ("x86/xen: Make irq_enable() noinstr")
  09c413071e2d ("x86/xen: Make irq_disable() noinstr")
  1462eb381b4c ("x86/xen: Rework the xen_{cpu,irq,mmu}_opsarrays")

from the tip tree and commit:

  97c79d816979 ("x86/xen: switch initial pvops IRQ functions to dummy ones")

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.

There may be more required, though.
-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/xen/irq.c
index 4fe387e520af,ae8537583102..000000000000
--- a/arch/x86/xen/irq.c
+++ b/arch/x86/xen/irq.c
@@@ -94,16 -40,14 +40,16 @@@ static void xen_halt(void
  		xen_safe_halt();
  }
  
 -static const struct pv_irq_ops xen_irq_ops __initconst = {
 -	/* Initial interrupt flag handling only called while interrupts off. */
 -	.save_fl = __PV_IS_CALLEE_SAVE(paravirt_ret0),
 -	.irq_disable = __PV_IS_CALLEE_SAVE(paravirt_nop),
 -	.irq_enable = __PV_IS_CALLEE_SAVE(paravirt_BUG),
 +static const typeof(pv_ops) xen_irq_ops __initconst = {
 +	.irq = {
- 
- 		.save_fl = PV_CALLEE_SAVE(xen_save_fl),
- 		.irq_disable = PV_CALLEE_SAVE(xen_irq_disable),
- 		.irq_enable = PV_CALLEE_SAVE(xen_irq_enable),
++		/* Initial interrupt flag handling only called while interrupts off. */
++		.save_fl = __PV_IS_CALLEE_SAVE(paravirt_ret0),
++		.irq_disable = __PV_IS_CALLEE_SAVE(paravirt_nop),
++		.irq_enable = __PV_IS_CALLEE_SAVE(paravirt_BUG),
  
 -	.safe_halt = xen_safe_halt,
 -	.halt = xen_halt,
 +		.safe_halt = xen_safe_halt,
 +		.halt = xen_halt,
 +	},
  };
  
  void __init xen_init_irq_ops(void)

Attachment: pgpQj9s1Mi1IH.pgp
Description: OpenPGP digital signature