diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-23 18:16:12 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-23 18:16:12 +0100 |
| commit | 72db8379fd80a62629d21f26b9e9ee9c90ca413d (patch) | |
| tree | 20db9b036bb1ba3707c4a1d759a66918ed7bb85f /patch-5.10.0-redhat.patch | |
| parent | d17259e62379cc156675b9cf903e6cfdf677a27e (diff) | |
| parent | 07ebe84e7e31faaf69c3ffbc7306dee6ff657b6c (diff) | |
| download | kernel-72db8379fd80a62629d21f26b9e9ee9c90ca413d.tar.gz kernel-72db8379fd80a62629d21f26b9e9ee9c90ca413d.tar.xz kernel-72db8379fd80a62629d21f26b9e9ee9c90ca413d.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc5.82.vanilla.1.fc34kernel-5.10.0-0.rc5.82.vanilla.1.fc31
Diffstat (limited to 'patch-5.10.0-redhat.patch')
| -rw-r--r-- | patch-5.10.0-redhat.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patch-5.10.0-redhat.patch b/patch-5.10.0-redhat.patch index c618ea3ff..51f27ee79 100644 --- a/patch-5.10.0-redhat.patch +++ b/patch-5.10.0-redhat.patch @@ -94,10 +94,10 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 526d65d8573a..0e78308a5dce 100644 +index 44fde25bb221..063ae5999610 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5512,6 +5512,14 @@ +@@ -5519,6 +5519,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -202,7 +202,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index e2c3f65c4721..36e66831ae23 100644 +index ed081e3eb800..549e1381c227 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ |