linux-next: manual merge of the nvdimm tree with the powerpc tree

[Stephen Rothwell]

Hi all,

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

  arch/powerpc/platforms/pseries/papr_scm.c

between commit:

  bbbca72352bb ("powerpc/papr_scm: Implement initial support for injecting smart errors")

from the powerpc tree and commit:

  4c08d4bbc089 ("powerpc/papr_scm: Add perf interface support")

from the nvdimm 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/platforms/pseries/papr_scm.c
index 1238b94b3cc1,4dd513d7c029..000000000000
--- a/arch/powerpc/platforms/pseries/papr_scm.c
+++ b/arch/powerpc/platforms/pseries/papr_scm.c
@@@ -121,9 -124,8 +124,11 @@@ struct papr_scm_priv 
  	/* length of the stat buffer as expected by phyp */
  	size_t stat_buffer_len;
  
 +	/* The bits which needs to be overridden */
 +	u64 health_bitmap_inject_mask;
 +
+ 	 /* array to have event_code and stat_id mappings */
+ 	char **nvdimm_events_map;
  };
  
  static int papr_scm_pmem_flush(struct nd_region *nd_region,

Attachment: pgp0UREj4CrUc.pgp
Description: OpenPGP digital signature