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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  arch/powerpc/sysdev/xive/common.c

between commit:

  cbc06f051c52 ("powerpc/xive: Do not skip CPU-less nodes when creating the IPIs")

from Linus' tree and commit:

  17df41fec5b8 ("powerpc: use IRQF_NO_DEBUG for IPIs")

from the powerpc 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 arch/powerpc/sysdev/xive/common.c
index 943fd30095af,458645c7a72b..000000000000
--- a/arch/powerpc/sysdev/xive/common.c
+++ b/arch/powerpc/sysdev/xive/common.c
@@@ -1170,22 -1166,6 +1157,22 @@@ out
  	return ret;
  }
  
 +static int __init xive_request_ipi(unsigned int cpu)
 +{
 +	struct xive_ipi_desc *xid = &xive_ipis[early_cpu_to_node(cpu)];
 +	int ret;
 +
 +	if (atomic_inc_return(&xid->started) > 1)
 +		return 0;
 +
 +	ret = request_irq(xid->irq, xive_muxed_ipi_action,
- 			  IRQF_PERCPU | IRQF_NO_THREAD,
++			  IRQF_NO_DEBUG | IRQF_PERCPU | IRQF_NO_THREAD,
 +			  xid->name, NULL);
 +
 +	WARN(ret < 0, "Failed to request IPI %d: %d\n", xid->irq, ret);
 +	return ret;
 +}
 +
  static int xive_setup_cpu_ipi(unsigned int cpu)
  {
  	unsigned int xive_ipi_irq = xive_ipi_cpu_to_irq(cpu);

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