linux-next: manual merge of the powernv-cpuidle tree with the powerpc tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the powernv-cpuidle tree got a conflict in
arch/powerpc/include/asm/opal.h between commit c7e64b9ce04a
("powerpc/powernv Platform dump interface") from the powerpc tree and
commit 97eb001f0349 ("powerpc/powernv: Add OPAL call to resync timebase
on wakeup") from the powernv-cpuidle tree.

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

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

diff --cc arch/powerpc/include/asm/opal.h
index 2636acfcd340,c71c72e47d47..000000000000
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@@ -159,15 -154,10 +159,16 @@@ extern int opal_enter_rtas(struct rtas_
  #define OPAL_FLASH_VALIDATE			76
  #define OPAL_FLASH_MANAGE			77
  #define OPAL_FLASH_UPDATE			78
+ #define OPAL_RESYNC_TIMEBASE			79
 +#define OPAL_DUMP_INIT				81
 +#define OPAL_DUMP_INFO				82
 +#define OPAL_DUMP_READ				83
 +#define OPAL_DUMP_ACK				84
  #define OPAL_GET_MSG				85
  #define OPAL_CHECK_ASYNC_COMPLETION		86
 +#define OPAL_DUMP_RESEND			91
  #define OPAL_SYNC_HOST_REBOOT			87
 +#define OPAL_DUMP_INFO2				94
  
  #ifndef __ASSEMBLY__
  
@@@ -888,13 -862,11 +889,14 @@@ extern void opal_get_rtc_time(struct rt
  extern unsigned long opal_get_boot_time(void);
  extern void opal_nvram_init(void);
  extern void opal_flash_init(void);
 +extern int opal_elog_init(void);
 +extern void opal_platform_dump_init(void);
  
  extern int opal_machine_check(struct pt_regs *regs);
 +extern bool opal_mce_check_early_recovery(struct pt_regs *regs);
  
  extern void opal_shutdown(void);
+ extern int opal_resync_timebase(void);
  
  extern void opal_lpc_init(void);
  
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20140317/115f7965/attachment.sig>