Skip to content

Commit 0479072

Browse files
committed
efi/x86: Support builtin command line
jira LE-4066 Rebuild_History Non-Buildable kernel-4.18.0-553.72.1.el8_10 commit-author Arvind Sankar <nivedita@alum.mit.edu> commit 7dde67f Empty-Commit: Cherry-Pick Conflicts during history rebuild. Will be included in final tarball splat. Ref for failed cherry-pick at: ciq/ciq_backports/kernel-4.18.0-553.72.1.el8_10/7dde67f2.failed Add support for the x86 CMDLINE_BOOL and CMDLINE_OVERRIDE configuration options. Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu> Link: https://lore.kernel.org/r/20200430182843.2510180-11-nivedita@alum.mit.edu Signed-off-by: Ard Biesheuvel <ardb@kernel.org> (cherry picked from commit 7dde67f) Signed-off-by: Jonathan Maple <jmaple@ciq.com> # Conflicts: # drivers/firmware/efi/libstub/x86-stub.c
1 parent b0715e0 commit 0479072

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
efi/x86: Support builtin command line
2+
3+
jira LE-4066
4+
Rebuild_History Non-Buildable kernel-4.18.0-553.72.1.el8_10
5+
commit-author Arvind Sankar <nivedita@alum.mit.edu>
6+
commit 7dde67f2a23ac11962b17128d9a71698430ced95
7+
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
8+
Will be included in final tarball splat. Ref for failed cherry-pick at:
9+
ciq/ciq_backports/kernel-4.18.0-553.72.1.el8_10/7dde67f2.failed
10+
11+
Add support for the x86 CMDLINE_BOOL and CMDLINE_OVERRIDE configuration
12+
options.
13+
14+
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
15+
Link: https://lore.kernel.org/r/20200430182843.2510180-11-nivedita@alum.mit.edu
16+
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
17+
(cherry picked from commit 7dde67f2a23ac11962b17128d9a71698430ced95)
18+
Signed-off-by: Jonathan Maple <jmaple@ciq.com>
19+
20+
# Conflicts:
21+
# drivers/firmware/efi/libstub/x86-stub.c
22+
* Unmerged path drivers/firmware/efi/libstub/x86-stub.c
23+
* Unmerged path drivers/firmware/efi/libstub/x86-stub.c

0 commit comments

Comments
 (0)