From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Dec 2018 07:24:54 +0000 (+1100)
Subject: Merge remote-tracking branch 'cisco/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=af18d349b07761aca5c53a2a1602e84d450ee52e;p=users%2Fwilly%2Flinux.git

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

af18d349b07761aca5c53a2a1602e84d450ee52e
diff --cc arch/x86/kernel/setup.c
index 3d872a527cd9,b14963ebc39b..fa57de34776d
--- a/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>