diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-24 16:26:27 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-24 16:26:27 +0200 |
| commit | 3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e (patch) | |
| tree | f49795de3f8aaae86e73f6a1f21b7b1948048311 /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | |
| parent | c01e23554af1d0635829396c9b8b7f5040a2d7d3 (diff) | |
| parent | 427e0b0cd9f365866f7b2517c77ed712f5df9cc7 (diff) | |
| download | kernel-5.9.0-0.rc2.1.vanilla.2.fc31.tar.gz kernel-5.9.0-0.rc2.1.vanilla.2.fc31.tar.xz kernel-5.9.0-0.rc2.1.vanilla.2.fc31.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc2.1.vanilla.2.fc34kernel-5.9.0-0.rc2.1.vanilla.2.fc33kernel-5.9.0-0.rc2.1.vanilla.2.fc32kernel-5.9.0-0.rc2.1.vanilla.2.fc31
Diffstat (limited to '0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch')
| -rw-r--r-- | 0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch index f711ee9db..7dcb0ac74 100644 --- a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch +++ b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch @@ -34,10 +34,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index bdc1f33fd3d1..f3ffc38c4aa4 100644 +index a1068742a6df..aba9439caec9 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5373,6 +5373,14 @@ +@@ -5370,6 +5370,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. |