commit: d88d1365e6dd40e8dc5185485e6d058817683b31
parent 63ab9afa40aeeefea935067cbe6b1e4dbdaa92c8
Author: Michael Forney <mforney@mforney.org>
Date: Thu, 2 Dec 2021 14:55:23 -0800
linux-headers: Update to 5.15
Diffstat:
8 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/pkg/linux-headers/.gitignore b/pkg/linux-headers/.gitignore
@@ -1,3 +1,3 @@
-/linux-5.14.tar.xz
+/linux-5.15.tar.xz
/src
/tools.ninja
diff --git a/pkg/linux-headers/base.lua b/pkg/linux-headers/base.lua
@@ -296,8 +296,12 @@ return {
'linux/input-event-codes.h',
'linux/input.h',
'linux/io_uring.h',
+ 'linux/ioam6.h',
+ 'linux/ioam6_genl.h',
+ 'linux/ioam6_iptunnel.h',
'linux/ioctl.h',
'linux/iommu.h',
+ 'linux/ioprio.h',
'linux/ip.h',
'linux/ip6_tunnel.h',
'linux/ip_vs.h',
@@ -308,7 +312,6 @@ return {
'linux/ipsec.h',
'linux/ipv6.h',
'linux/ipv6_route.h',
- 'linux/ipx.h',
'linux/irqnr.h',
'linux/isdn/capicmd.h',
'linux/iso_fs.h',
@@ -334,7 +337,6 @@ return {
'linux/l2tp.h',
'linux/landlock.h',
'linux/libc-compat.h',
- 'linux/lightnvm.h',
'linux/limits.h',
'linux/lirc.h',
'linux/llc.h',
@@ -346,6 +348,7 @@ return {
'linux/map_to_7segment.h',
'linux/matroxfb.h',
'linux/max2175.h',
+ 'linux/mctp.h',
'linux/mdio.h',
'linux/media-bus-format.h',
'linux/media.h',
@@ -546,6 +549,7 @@ return {
'linux/nilfs2_api.h',
'linux/nilfs2_ondisk.h',
'linux/nitro_enclaves.h',
+ 'linux/nl80211-vnd-intel.h',
'linux/nl80211.h',
'linux/nsfs.h',
'linux/nubus.h',
@@ -759,6 +763,7 @@ return {
'linux/vbox_vmmdev_types.h',
'linux/vboxguest.h',
'linux/vdpa.h',
+ 'linux/vduse.h',
'linux/veth.h',
'linux/vfio.h',
'linux/vfio_ccw.h',
@@ -774,7 +779,9 @@ return {
'linux/virtio_console.h',
'linux/virtio_crypto.h',
'linux/virtio_fs.h',
+ 'linux/virtio_gpio.h',
'linux/virtio_gpu.h',
+ 'linux/virtio_i2c.h',
'linux/virtio_ids.h',
'linux/virtio_input.h',
'linux/virtio_iommu.h',
@@ -786,6 +793,7 @@ return {
'linux/virtio_pmem.h',
'linux/virtio_ring.h',
'linux/virtio_rng.h',
+ 'linux/virtio_scmi.h',
'linux/virtio_scsi.h',
'linux/virtio_snd.h',
'linux/virtio_types.h',
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
@@ -1,4 +1,4 @@
-From 5d59692ac21d659a7d8a08c49d83fef2399fff6f Mon Sep 17 00:00:00 2001
+From d770264c9479c16bc45729d7bddd7e9275e44199 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 bf9252c7381e..3c32dfb895a3 100644
+index 791f31dd0abe..a2e8fd2e798c 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
-@@ -5016,12 +5016,10 @@ enum {
+@@ -5120,12 +5120,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 bf9252c7381e..3c32dfb895a3 100644
/* Current network namespace */
enum {
--
-2.32.0
+2.34.0
diff --git a/pkg/linux-headers/patch/0004-Prevent-zero-length-array-members-in-asound.h.patch b/pkg/linux-headers/patch/0004-Prevent-zero-length-array-members-in-asound.h.patch
@@ -1,4 +1,4 @@
-From 3ff7594c56add20d75d8f8590e07d2dd56f3addd Mon Sep 17 00:00:00 2001
+From 1c362a59b41e944dd21b5d72dbab4465d2346415 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 30 Aug 2021 19:26:32 -0700
Subject: [PATCH] Prevent zero-length array members in asound.h
@@ -8,10 +8,10 @@ Subject: [PATCH] Prevent zero-length array members in asound.h
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h
-index 535a7229e1d9..fd8cdf7d5147 100644
+index 5859ca0a1439..bbb078f3fddf 100644
--- a/include/uapi/sound/asound.h
+++ b/include/uapi/sound/asound.h
-@@ -553,22 +553,30 @@ struct __snd_pcm_sync_ptr {
+@@ -554,22 +554,30 @@ struct __snd_pcm_sync_ptr {
} c;
};
@@ -48,7 +48,7 @@ index 535a7229e1d9..fd8cdf7d5147 100644
struct __snd_timespec64 tstamp; /* Timestamp */
snd_pcm_state_t suspended_state;/* RO: suspended stream state */
__u32 pad3; /* Needed for 64 bit alignment */
-@@ -576,15 +584,18 @@ struct __snd_pcm_mmap_status64 {
+@@ -577,15 +585,18 @@ struct __snd_pcm_mmap_status64 {
};
struct __snd_pcm_mmap_control64 {
@@ -72,5 +72,5 @@ index 535a7229e1d9..fd8cdf7d5147 100644
__u32 flags;
__u32 pad1;
--
-2.32.0
+2.34.0
diff --git a/pkg/linux-headers/patch/0005-Make-struct-bpf_timer-include-a-named-member.patch b/pkg/linux-headers/patch/0005-Make-struct-bpf_timer-include-a-named-member.patch
@@ -0,0 +1,32 @@
+From aec886b601b85235a21baa303f75c589f434b727 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Thu, 2 Dec 2021 14:49:08 -0800
+Subject: [PATCH] Make struct bpf_timer include a named member
+
+A struct without any named members is undefined behavior by C11
+6.7.2.1p8.
+
+Signed-off-by: Michael Forney <mforney@mforney.org>
+---
+ include/uapi/linux/bpf.h | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
+index a2e8fd2e798c..79d70644e6a0 100644
+--- a/include/uapi/linux/bpf.h
++++ b/include/uapi/linux/bpf.h
+@@ -6180,9 +6180,8 @@ struct bpf_spin_lock {
+ };
+
+ struct bpf_timer {
+- __u64 :64;
+- __u64 :64;
+-} __attribute__((aligned(8)));
++ __u64 reserved[2];
++};
+
+ struct bpf_sysctl {
+ __u32 write; /* Sysctl is being read (= 0) or written (= 1).
+--
+2.34.0
+
diff --git a/pkg/linux-headers/sha256 b/pkg/linux-headers/sha256
@@ -1 +1 @@
-7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2 linux-5.14.tar.xz
+57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8 linux-5.15.tar.xz
diff --git a/pkg/linux-headers/url b/pkg/linux-headers/url
@@ -1 +1 @@
-url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz"
+url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz"
diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver
@@ -1 +1 @@
-5.14 r0
+5.15 r0
