diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-08-05 16:39:29 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-08-05 16:39:29 +0200 |
| commit | f2701b77bbd992f3df4631de8493f21db0830452 (patch) | |
| tree | b05b2bf8b47002ae81c79aaa9de2a311b8ee075e /arch/arc/configs/hsdk_defconfig | |
| parent | x86/KVM/VMX: Don't set l1tf_flush_l1d from vmx_handle_external_intr() (diff) | |
| parent | Linux 4.18-rc7 (diff) | |
| download | linux-f2701b77bbd992f3df4631de8493f21db0830452.tar.xz linux-f2701b77bbd992f3df4631de8493f21db0830452.zip | |
Merge 4.18-rc7 into master to pick up the KVM dependcy
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arc/configs/hsdk_defconfig')
| -rw-r--r-- | arch/arc/configs/hsdk_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arc/configs/hsdk_defconfig b/arch/arc/configs/hsdk_defconfig index 1b54c72f4296..6491be0ddbc9 100644 --- a/arch/arc/configs/hsdk_defconfig +++ b/arch/arc/configs/hsdk_defconfig @@ -9,7 +9,6 @@ CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/" CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_VM_EVENT_COUNTERS is not set |