diff options
| author | Michael Forney <mforney@mforney.org> | 2021-02-23 19:01:59 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2021-03-02 16:20:17 -0800 |
| commit | d640328f5aac575a4199e88eb11eac0cd5261f4c (patch) | |
| tree | 74af6c39c425db78e3bd107a0d1e23f8f0205911 /pkg/linux-headers/patch | |
| parent | 9a2d7b14635f047f326a234d14aa02a33ead1429 (diff) | |
linux-headers: Update to 5.11
Diffstat (limited to 'pkg/linux-headers/patch')
| -rw-r--r-- | pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch | 8 | ||||
| -rw-r--r-- | pkg/linux-headers/patch/0003-Only-include-linux-sysinfo.h-from-linux-kernel.h-on-.patch | 26 |
2 files changed, 4 insertions, 30 deletions
diff --git a/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch b/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch index d17ab407..ea8a881b 100644 --- a/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch +++ b/pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch @@ -1,4 +1,4 @@ -From 06db5d14eec467c54a3a5f3aa03cc222271ef76b Mon Sep 17 00:00:00 2001 +From 6a41b5bb9244d4b6b1e74ac2074fff37d93d234b Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Tue, 2 Jun 2020 03:56:03 -0700 Subject: [PATCH] Revert change of BPF_F_* to enum constants @@ -8,10 +8,10 @@ Subject: [PATCH] Revert change of BPF_F_* to enum constants 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h -index b6238b2209b7..1f78be710fba 100644 +index 77d7c1bb2923..364d4d58ceb8 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h -@@ -3604,12 +3604,10 @@ enum { +@@ -4060,12 +4060,10 @@ enum { /* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and * BPF_FUNC_perf_event_read_value flags. */ @@ -28,5 +28,5 @@ index b6238b2209b7..1f78be710fba 100644 /* Current network namespace */ enum { -- -2.28.0 +2.30.0 diff --git a/pkg/linux-headers/patch/0003-Only-include-linux-sysinfo.h-from-linux-kernel.h-on-.patch b/pkg/linux-headers/patch/0003-Only-include-linux-sysinfo.h-from-linux-kernel.h-on-.patch deleted file mode 100644 index d35d32b7..00000000 --- a/pkg/linux-headers/patch/0003-Only-include-linux-sysinfo.h-from-linux-kernel.h-on-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2cea39d1a37c87e65e3bc8892f9d3d37e426b9e7 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Tue, 23 Jun 2020 14:34:45 -0700 -Subject: [PATCH] Only include linux/sysinfo.h from linux/kernel.h on glibc - ---- - include/uapi/linux/kernel.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h -index 0ff8f7477847..b2d59deef093 100644 ---- a/include/uapi/linux/kernel.h -+++ b/include/uapi/linux/kernel.h -@@ -2,7 +2,9 @@ - #ifndef _UAPI_LINUX_KERNEL_H - #define _UAPI_LINUX_KERNEL_H - -+#ifdef __GLIBC__ - #include <linux/sysinfo.h> -+#endif - - /* - * 'kernel.h' contains some often-used function prototypes etc --- -2.27.0 - |