diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
| commit | 38d5c149cae32d286308f7962e1d561e7939072f (patch) | |
| tree | 25e564ee34a2fe3778379afae39270d1023fe859 /0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch | |
| parent | f4c3c7a8ab9226af448d66103dfddf387711af9d (diff) | |
| parent | 05706a271a8883a9bf1bc091089a315129f3db00 (diff) | |
| download | kernel-38d5c149cae32d286308f7962e1d561e7939072f.tar.gz kernel-38d5c149cae32d286308f7962e1d561e7939072f.tar.xz kernel-38d5c149cae32d286308f7962e1d561e7939072f.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.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 69229c402..017a48a4f 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 89386f6f3ab6..f7ee70888a60 100644 +index f3eeecbb3f63..1708658fae27 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5228,6 +5228,14 @@ +@@ -5233,6 +5233,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. |