diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-11-23 10:53:22 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-11-23 10:53:22 -0600 |
| commit | 07ebe84e7e31faaf69c3ffbc7306dee6ff657b6c (patch) | |
| tree | fa46ce1d5db508b97fc30cb8f1e41230743a6493 /patch-5.10.0-redhat.patch | |
| parent | 9a733b7fc936752211d28f5c0fca84ddd7aa7da4 (diff) | |
| download | kernel-07ebe84e7e31faaf69c3ffbc7306dee6ff657b6c.tar.gz kernel-07ebe84e7e31faaf69c3ffbc7306dee6ff657b6c.tar.xz kernel-07ebe84e7e31faaf69c3ffbc7306dee6ff657b6c.zip | |
kernel-5.10.0-0.rc4.20201120git4d02da974ea8.81
* Fri Nov 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201120git4d02da974ea8.81]
- Fedora config update ("Justin M. Forbes")
- redhat: generic enable CONFIG_INET_MPTCP_DIAG (Davide Caratti)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
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)), \ |