summaryrefslogtreecommitdiffstats
path: root/patch-6.1-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-10-05 09:17:28 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-10-05 09:17:28 -0500
commitbb299186072c3d663a22343ce5373ca64c12ebf3 (patch)
tree81db28a9933981d6cc99ddeec5e16dcd9f575ddd /patch-6.1-redhat.patch
parentabbace108a3c9ba0745b68b7bf018eb5cb6de115 (diff)
downloadkernel-bb299186072c3d663a22343ce5373ca64c12ebf3.tar.gz
kernel-bb299186072c3d663a22343ce5373ca64c12ebf3.tar.xz
kernel-bb299186072c3d663a22343ce5373ca64c12ebf3.zip
kernel-6.1.0-0.rc0.20221005git2bca25eaeba6.2
* Wed Oct 05 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.2bca25eaeba6.2] - Trim changelog with the reset (Justin M. Forbes) - Linux v6.1.0-0.rc0.2bca25eaeba6 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-6.1-redhat.patch')
-rw-r--r--patch-6.1-redhat.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index 282142867..db7dbf394 100644
--- a/patch-6.1-redhat.patch
+++ b/patch-6.1-redhat.patch
@@ -68,7 +68,7 @@
67 files changed, 1547 insertions(+), 188 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 426fa892d311..11b6f16bc969 100644
+index e92d63d3e878..28c0ab72ce28 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6406,6 +6406,15 @@
@@ -2576,7 +2576,7 @@ index 318789c728d3..148911cf65da 100644
obj-$(CONFIG_MODULES) += kmod.o
obj-$(CONFIG_MULTIUSER) += groups.o
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 27760627370d..5cbbbd0cf581 100644
+index 7b373a5e861f..6b880dcbdeda 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -26,6 +26,7 @@
@@ -2611,7 +2611,7 @@ index 27760627370d..5cbbbd0cf581 100644
int sysctl_unprivileged_bpf_disabled __read_mostly =
IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0;
-@@ -5269,6 +5287,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write,
+@@ -5283,6 +5301,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write,
if (write && !ret) {
if (locked_state && unpriv_enable != 1)
return -EPERM;