diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-22 19:30:30 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-22 19:30:30 +0100 |
commit | 866872f38c0b60a3a4ac3e8029e2006fa6ae9eab (patch) | |
tree | d0303133c6c4ca4d24115237c100f0ad19c520ea /patch-5.16-redhat.patch | |
parent | eb817d331380f5b5b5ddefd5914f1963fe6188cd (diff) | |
parent | 38e7304542efe54ecc96bcfbccbafc8750abcaf8 (diff) | |
download | kernel-866872f38c0b60a3a4ac3e8029e2006fa6ae9eab.tar.gz kernel-866872f38c0b60a3a4ac3e8029e2006fa6ae9eab.tar.xz kernel-866872f38c0b60a3a4ac3e8029e2006fa6ae9eab.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc6.20211222git2f47a9a4dfa3.43.vanilla.1.fc36kernel-5.16.0-0.rc6.20211222git2f47a9a4dfa3.43.vanilla.1.fc35kernel-5.16.0-0.rc6.20211222git2f47a9a4dfa3.43.vanilla.1.fc34
Diffstat (limited to 'patch-5.16-redhat.patch')
-rw-r--r-- | patch-5.16-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index 7d24b0f5a..c773f284c 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -75,10 +75,10 @@ 74 files changed, 1512 insertions(+), 188 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 9725c546a0d4..4d440bdcf5b9 100644 +index fc34332c8d9a..85f96e7a5005 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5936,6 +5936,15 @@ +@@ -5940,6 +5940,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. |