summaryrefslogtreecommitdiffstats
path: root/patch-5.14.0-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-08-02 09:20:40 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-08-02 09:20:40 -0500
commit931af94c6888d2e5664ba2a1c077c24a2c889728 (patch)
tree79f5e1160b12678afaf66a698dfc09ffebf4fd85 /patch-5.14.0-redhat.patch
parentdc029228af959116ae63f50f64a333daaa945fb8 (diff)
downloadkernel-931af94c6888d2e5664ba2a1c077c24a2c889728.tar.gz
kernel-931af94c6888d2e5664ba2a1c077c24a2c889728.tar.xz
kernel-931af94c6888d2e5664ba2a1c077c24a2c889728.zip
kernel-5.14.0-0.rc4.36
* Mon Aug 02 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.0-0.rc4.36] - kernel-5.14.0-0.rc4.36 (Fedora Kernel Team) - kernel-5.14.0-0.rc4.35 (Fedora Kernel Team) - kernel-5.14.0-0.rc3.20210801gitf3438b4c4e69.34 (Fedora Kernel Team) - kernel-5.14.0-0.rc3.20210731gitc7d102232649.33 (Fedora Kernel Team) - x86: configs: Enable CONFIG_TEST_FPU for debug kernels (Vitaly Kuznetsov) [1988384] - kernel-5.14.0-0.rc3.20210730git764a5bc89b12.32 (Fedora Kernel Team) - redhat/configs: Move CHACHA and POLY1305 to core kernel to allow BIG_KEYS=y (root) [1983298] - Revert "bpf: Add tech preview taint for syscall" (Jiri Olsa) [1978833] - kernel.spec: fix build of samples/bpf (Jiri Benc) - Enable OSNOISE_TRACER and TIMERLAT_TRACER (Jerome Marchand) [1979379] - kernel-5.14.0-0.rc3.20210728git4010a528219e.31 (Fedora Kernel Team) - kernel-5.14.0-0.rc3.20210728git7d549995d4e0.30 (Fedora Kernel Team) - Don't tag a release as [redhat] (Justin M. Forbes) - Revert "Drop that for now" (Herton R. Krzesinski) - rpmspec: switch iio and gpio tools to use tools_make (Herton R. Krzesinski) [1956988] - configs/process_configs.sh: Handle config items with no help text (Patrick Talbert) - fedora: sound config updates for 5.14 (Peter Robinson) - fedora: Only enable FSI drivers on POWER platform (Peter Robinson) - The CONFIG_RAW_DRIVER has been removed from upstream (Peter Robinson) - fedora: updates for 5.14 with a few disables for common from pending (Peter Robinson) - fedora: migrate from MFD_TPS68470 -> INTEL_SKL_INT3472 (Peter Robinson) - fedora: Remove STAGING_GASKET_FRAMEWORK (Peter Robinson) - Fedora: move DRM_VMWGFX configs from ark -> common (Peter Robinson) - fedora: arm: disabled unused FB drivers (Peter Robinson) - fedora: don't enable FB_VIRTUAL (Peter Robinson) - redhat/configs: Double MAX_LOCKDEP_ENTRIES (Waiman Long) [1940075] - rpmspec: fix verbose output on kernel-devel installation (Herton R. Krzesinski) [1981406] Resolves: rhbz#1940075, rhbz#1956988, rhbz#1978833, rhbz#1979379, rhbz#1981406, rhbz#1983298, rhbz#1988384 Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.14.0-redhat.patch')
-rw-r--r--patch-5.14.0-redhat.patch30
1 files changed, 6 insertions, 24 deletions
diff --git a/patch-5.14.0-redhat.patch b/patch-5.14.0-redhat.patch
index d89148100..a2075fa77 100644
--- a/patch-5.14.0-redhat.patch
+++ b/patch-5.14.0-redhat.patch
@@ -55,7 +55,7 @@
include/linux/security.h | 5 +
init/Kconfig | 2 +-
kernel/Makefile | 1 +
- kernel/bpf/syscall.c | 24 +
+ kernel/bpf/syscall.c | 18 +
kernel/module.c | 2 +
kernel/module_signing.c | 9 +-
kernel/panic.c | 14 +
@@ -81,7 +81,7 @@
tools/testing/selftests/bpf/progs/linked_maps2.c | 76 ---
tools/testing/selftests/bpf/progs/linked_vars1.c | 54 --
tools/testing/selftests/bpf/progs/linked_vars2.c | 55 ---
- 83 files changed, 1161 insertions(+), 1492 deletions(-)
+ 83 files changed, 1155 insertions(+), 1492 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index bdb22006f713..61a3a4a4730b 100644
@@ -137,7 +137,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 6b555f64df06..0a73a38e82b0 100644
+index 27a072cffcb9..1aee287a8f9c 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -167,10 +167,10 @@ index 6b555f64df06..0a73a38e82b0 100644
$(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 82f908fa5676..6ffefb694a23 100644
+index 2fb7012c3246..47718b4f2f75 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1480,9 +1480,9 @@ config HIGHMEM
+@@ -1474,9 +1474,9 @@ config HIGHMEM
If unsure, say n.
config HIGHPTE
@@ -2316,7 +2316,7 @@ index 4df609be42d0..4ef0c0f6a8f4 100644
obj-$(CONFIG_MODULES) += kmod.o
obj-$(CONFIG_MULTIUSER) += groups.o
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index e343f158e556..840c5ecd4fc6 100644
+index e343f158e556..b2c979f9b80e 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -24,6 +24,7 @@
@@ -2351,24 +2351,6 @@ index e343f158e556..840c5ecd4fc6 100644
int sysctl_unprivileged_bpf_disabled __read_mostly =
IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0;
-@@ -4427,11 +4445,17 @@ static int bpf_prog_bind_map(union bpf_attr *attr)
- static int __sys_bpf(int cmd, bpfptr_t uattr, unsigned int size)
- {
- union bpf_attr attr;
-+ static int marked;
- int err;
-
- if (sysctl_unprivileged_bpf_disabled && !bpf_capable())
- return -EPERM;
-
-+ if (!marked) {
-+ mark_tech_preview("eBPF syscall", NULL);
-+ marked = true;
-+ }
-+
- err = bpf_check_uarg_tail_zero(uattr, sizeof(attr), size);
- if (err)
- return err;
diff --git a/kernel/module.c b/kernel/module.c
index ed13917ea5f3..88643913f3e4 100644
--- a/kernel/module.c