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

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

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

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