Merge remote-tracking branch 'cisco/for-next'

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/setup.c
index 3d872a527cd966facecec3bd8440677ae1d99204,b14963ebc39b524956a6b3f35e602871a9440e99..fa57de34776d12bd615d119f9e3ff272317b522a
--- 1/arch/x86/kernel/setup.c
--- 2/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -50,7 -50,7 +50,8 @@@
  #include <linux/kvm_para.h>
  #include <linux/dma-contiguous.h>
  #include <xen/xen.h>
 +#include <uapi/linux/mount.h>
+ #include <linux/cmdline.h>
  
  #include <linux/errno.h>
  #include <linux/kernel.h>

diff --cc init/Kconfig
Simple merge