From a1917ca8d78179cb08e053f1e50a8b11049834b8 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Fri, 15 Jan 2021 03:29:51 -0500
Subject: Revert "linux-libre-4.19: Override command line"

This reverts commit 068238a1e2c58899fa8b519eda288f0b9f3c83b8.

This will break lilo adding "root=...".
---
diff --git a/changelog b/changelog
index 582e4ba..b5ec90e 100644
--- a/changelog
+++ b/changelog
@@ -5,7 +5,6 @@ config-x60 (2.8) trunk
   * config-linux-libre-x60: Drop package.
   * config-linux-libre-4.19-x60: Enable DMI scanning (needed by
     ThinkPad ACPI driver).
-  * config-linux-libre-4.19-x60: Override command line.
   * config-linux-libre-4.19-x60: Disable ACPI PCI Hotplug driver and IBM
     extensions (fixes "acpiphp_ibm: ibm_acpiphp_init:
     acpi_walk_namespace failed" error at boot).
diff --git a/src/build/linux-libre-4.19_4.19.167+gnu/config b/src/build/linux-libre-4.19_4.19.167+gnu/config
index c81b225..bcf9abe 100644
--- a/src/build/linux-libre-4.19_4.19.167+gnu/config
+++ b/src/build/linux-libre-4.19_4.19.167+gnu/config
@@ -346,7 +346,7 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="rw mce=0 page_poison=1 pti=on spectre_v2=off quiet"
-CONFIG_CMDLINE_OVERRIDE=y
+# CONFIG_CMDLINE_OVERRIDE is not set
 # CONFIG_MODIFY_LDT_SYSCALL is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
--
cgit v0.9.1