diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-07-25 19:07:34 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-07-25 19:07:34 +0200 |
| commit | bea823821912429faab12e68930faeb02b56d67f (patch) | |
| tree | da1598abf1b88b9a0bd423e921c31bc5dff049df /patch-5.19-redhat.patch | |
| parent | 1f6428a19b9215788a0a647fd6cae28e5f5f2e49 (diff) | |
| parent | d729b1559867638437f0579d1f6d77eb183a272a (diff) | |
| download | kernel-bea823821912429faab12e68930faeb02b56d67f.tar.gz kernel-bea823821912429faab12e68930faeb02b56d67f.tar.xz kernel-bea823821912429faab12e68930faeb02b56d67f.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.19.0-0.rc8.59.vanilla.1.fc37kernel-5.19.0-0.rc8.59.vanilla.1.fc36kernel-5.19.0-0.rc8.59.vanilla.1.fc35
Diffstat (limited to 'patch-5.19-redhat.patch')
| -rw-r--r-- | patch-5.19-redhat.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch index db6a113ac..9c6147cd1 100644 --- a/patch-5.19-redhat.patch +++ b/patch-5.19-redhat.patch @@ -89,10 +89,10 @@ 88 files changed, 2766 insertions(+), 324 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index f2d26cb7e853..c8c658e66f69 100644 +index c0fdb04a0435..f5de4eb69748 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6297,6 +6297,15 @@ +@@ -6315,6 +6315,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -298,7 +298,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 00fd80c5dd6e..7ab3609b69aa 100644 +index b79c1c18149d..d6aa78ebf187 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ |