From: Michael Ellerman <mpe@ellerman.id.au>
Date: Sat, 30 Jul 2016 03:43:19 +0000 (+1000)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux... 
X-Git-Tag: v4.8-rc1~85^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=719dbb2df78fc9a40e28392b07cd715bfc5a665c;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next

Freescale updates from Scott:

"Highlights include more 8xx optimizations, device tree updates,
and MVME7100 support."
---

719dbb2df78fc9a40e28392b07cd715bfc5a665c
diff --cc arch/powerpc/Kconfig
index a5e0b47f7f20,fcfe5332416f..6a656f8ca26d
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -165,7 -165,7 +165,8 @@@ config PP
  	select ARCH_HAS_UBSAN_SANITIZE_ALL
  	select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
  	select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
 +	select GENERIC_CPU_AUTOPROBE
+ 	select HAVE_VIRT_CPU_ACCOUNTING
  
  config GENERIC_CSUM
  	def_bool CPU_LITTLE_ENDIAN