Commit: 0b266eccd6710f8a36516d60b2f5f8c322f2b1fb
Parent: 16e36ac7981d7ed0d2dfc1e9621d24ac5a31b7dc
Author: Michael Forney
Date: Thu, 21 Mar 2024 22:35:22 -0700
linux-headers: Update to 6.8
Diffstat:
10 files changed, 95 insertions(+), 147 deletions(-)
diff --git a/pkg/devel/linux-headers/.gitignore b/pkg/devel/linux-headers/.gitignore
@@ -1,3 +1,3 @@
-/linux-6.4.tar.xz
+/linux-6.8.tar.xz
/src
/tools.ninja
diff --git a/pkg/devel/linux-headers/base.lua b/pkg/devel/linux-headers/base.lua
@@ -53,6 +53,7 @@ return {
'drm/nouveau_drm.h',
'drm/omap_drm.h',
'drm/panfrost_drm.h',
+ 'drm/pvr_drm.h',
'drm/qaic_accel.h',
'drm/qxl_drm.h',
'drm/radeon_drm.h',
@@ -62,6 +63,7 @@ return {
'drm/vgem_drm.h',
'drm/virtgpu_drm.h',
'drm/vmwgfx_drm.h',
+ 'drm/xe_drm.h',
'linux/a.out.h',
'linux/acct.h',
'linux/acrn.h',
@@ -117,7 +119,6 @@ return {
'linux/bpf.h',
'linux/bpf_common.h',
'linux/bpf_perf_event.h',
- 'linux/bpfilter.h',
'linux/bpqether.h',
'linux/bsg.h',
'linux/bt-bmc.h',
@@ -178,6 +179,7 @@ return {
'linux/dma-buf.h',
'linux/dma-heap.h',
'linux/dns_resolver.h',
+ 'linux/dpll.h',
'linux/dqblk_xfs.h',
'linux/dvb/audio.h',
'linux/dvb/ca.h',
@@ -198,6 +200,7 @@ return {
'linux/erspan.h',
'linux/ethtool.h',
'linux/ethtool_netlink.h',
+ 'linux/eventfd.h',
'linux/eventpoll.h',
'linux/ext4.h',
'linux/f2fs.h',
@@ -349,6 +352,7 @@ return {
'linux/loadpin.h',
'linux/loop.h',
'linux/lp.h',
+ 'linux/lsm.h',
'linux/lwtunnel.h',
'linux/magic.h',
'linux/major.h',
@@ -376,6 +380,7 @@ return {
'linux/mpls.h',
'linux/mpls_iptunnel.h',
'linux/mptcp.h',
+ 'linux/mptcp_pm.h',
'linux/mqueue.h',
'linux/mroute.h',
'linux/mroute6.h',
@@ -553,12 +558,15 @@ return {
'linux/nfsd/debug.h',
'linux/nfsd/export.h',
'linux/nfsd/stats.h',
+ 'linux/nfsd_netlink.h',
'linux/nilfs2_api.h',
'linux/nilfs2_ondisk.h',
'linux/nitro_enclaves.h',
'linux/nl80211-vnd-intel.h',
'linux/nl80211.h',
+ 'linux/npcm-video.h',
'linux/nsfs.h',
+ 'linux/nsm.h',
'linux/nubus.h',
'linux/nvme_ioctl.h',
'linux/nvram.h',
@@ -599,6 +607,7 @@ return {
'linux/prctl.h',
'linux/psample.h',
'linux/psci.h',
+ 'linux/psp-dbc.h',
'linux/psp-sev.h',
'linux/ptp_clock.h',
'linux/ptrace.h',
@@ -694,7 +703,6 @@ return {
'linux/tc_act/tc_gact.h',
'linux/tc_act/tc_gate.h',
'linux/tc_act/tc_ife.h',
- 'linux/tc_act/tc_ipt.h',
'linux/tc_act/tc_mirred.h',
'linux/tc_act/tc_mpls.h',
'linux/tc_act/tc_nat.h',
@@ -715,6 +723,7 @@ return {
'linux/tee.h',
'linux/termios.h',
'linux/thermal.h',
+ 'linux/thp7312.h',
'linux/time.h',
'linux/time_types.h',
'linux/timerfd.h',
@@ -727,6 +736,7 @@ return {
'linux/tipc_sockets_diag.h',
'linux/tls.h',
'linux/toshiba.h',
+ 'linux/tps6594_pfsm.h',
'linux/tty.h',
'linux/tty_flags.h',
'linux/types.h',
@@ -871,6 +881,7 @@ return {
'rdma/rvt-abi.h',
'rdma/siw-abi.h',
'rdma/vmw_pvrdma-abi.h',
+ 'regulator/regulator.h',
'scsi/cxlflash_ioctl.h',
'scsi/fc/fc_els.h',
'scsi/fc/fc_fs.h',
@@ -893,6 +904,7 @@ return {
'sound/hdspm.h',
'sound/intel/avs/tokens.h',
'sound/sb16_csp.h',
+ 'sound/scarlett2.h',
'sound/sfnt_info.h',
'sound/skl-tplg-interface.h',
'sound/snd_ar_tokens.h',
diff --git a/pkg/devel/linux-headers/patch/0002-Prevent-zero-length-array-members-in-asound.h.patch b/pkg/devel/linux-headers/patch/0002-Prevent-zero-length-array-members-in-asound.h.patch
@@ -0,0 +1,77 @@
+From 069cbc8a25155771af775ee084ba3519ed5a9602 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
+
+---
+ include/uapi/sound/asound.h | 31 +++++++++++++++++++++----------
+ 1 file changed, 21 insertions(+), 10 deletions(-)
+
+diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h
+index 628d46a0da92..23b0d301e83f 100644
+--- a/include/uapi/sound/asound.h
++++ b/include/uapi/sound/asound.h
+@@ -557,22 +557,30 @@ struct __snd_pcm_sync_ptr {
+ } c;
+ };
+
++#if __BITS_PER_LONG == 32
+ #if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
+-typedef char __pad_before_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
+-typedef char __pad_after_uframe[0];
++#define __PAD_BEFORE_UFRAME(x) char x[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
+ #endif
+
+ #if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
+-typedef char __pad_before_uframe[0];
+-typedef char __pad_after_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
++#define __PAD_AFTER_UFRAME(x) char x[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
++#endif
++#endif
++
++#ifndef __PAD_BEFORE_UFRAME
++#define __PAD_BEFORE_UFRAME(x)
++#endif
++
++#ifndef __PAD_AFTER_UFRAME
++#define __PAD_AFTER_UFRAME(x)
+ #endif
+
+ struct __snd_pcm_mmap_status64 {
+ snd_pcm_state_t state; /* RO: state - SNDRV_PCM_STATE_XXXX */
+ __u32 pad1; /* Needed for 64 bit alignment */
+- __pad_before_uframe __pad1;
++ __PAD_BEFORE_UFRAME(__pad1)
+ snd_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */
+- __pad_after_uframe __pad2;
++ __PAD_AFTER_UFRAME(__pad2)
+ struct __snd_timespec64 tstamp; /* Timestamp */
+ snd_pcm_state_t suspended_state;/* RO: suspended stream state */
+ __u32 pad3; /* Needed for 64 bit alignment */
+@@ -580,16 +588,19 @@ struct __snd_pcm_mmap_status64 {
+ };
+
+ struct __snd_pcm_mmap_control64 {
+- __pad_before_uframe __pad1;
++ __PAD_BEFORE_UFRAME(__pad1)
+ snd_pcm_uframes_t appl_ptr; /* RW: appl ptr (0...boundary-1) */
+- __pad_before_uframe __pad2; // This should be __pad_after_uframe, but binary
++ __PAD_BEFORE_UFRAME(__pad2) // This should be __pad_after_uframe, but binary
+ // backwards compatibility constraints prevent a fix.
+
+- __pad_before_uframe __pad3;
++ __PAD_BEFORE_UFRAME(__pad3)
+ snd_pcm_uframes_t avail_min; /* RW: min available frames for wakeup */
+- __pad_after_uframe __pad4;
++ __PAD_AFTER_UFRAME(__pad4)
+ };
+
++#undef __PAD_BEFORE_UFRAME
++#undef __PAD_AFTER_UFRAME
++
+ struct __snd_pcm_sync_ptr64 {
+ __u32 flags;
+ __u32 pad1;
+--
+2.44.0
+
diff --git a/pkg/devel/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch b/pkg/devel/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch
@@ -1,32 +0,0 @@
-From e373a645de1b2e57878dc17420dad3d0464694e6 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
-
----
- include/uapi/linux/bpf.h | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
-index c994ff5b157c..ed8261560f2b 100644
---- a/include/uapi/linux/bpf.h
-+++ b/include/uapi/linux/bpf.h
-@@ -5850,12 +5850,10 @@ enum {
- /* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and
- * BPF_FUNC_perf_event_read_value flags.
- */
--enum {
-- BPF_F_INDEX_MASK = 0xffffffffULL,
-- BPF_F_CURRENT_CPU = BPF_F_INDEX_MASK,
-+#define BPF_F_INDEX_MASK 0xffffffffULL
-+#define BPF_F_CURRENT_CPU BPF_F_INDEX_MASK
- /* BPF_FUNC_perf_event_output for sk_buff input context. */
-- BPF_F_CTXLEN_MASK = (0xfffffULL << 32),
--};
-+#define BPF_F_CTXLEN_MASK (0xfffffULL << 32)
-
- /* Current network namespace */
- enum {
---
-2.37.3
-
diff --git a/pkg/devel/linux-headers/patch/0003-Prevent-zero-length-array-members-in-asound.h.patch b/pkg/devel/linux-headers/patch/0003-Prevent-zero-length-array-members-in-asound.h.patch
@@ -1,77 +0,0 @@
-From 4d7aad2421c783cf57f359638197f0ad2a32a287 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
-
----
- include/uapi/sound/asound.h | 31 +++++++++++++++++++++----------
- 1 file changed, 21 insertions(+), 10 deletions(-)
-
-diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h
-index 0aa955aa8246..2e7ca9236c7a 100644
---- a/include/uapi/sound/asound.h
-+++ b/include/uapi/sound/asound.h
-@@ -550,22 +550,30 @@ struct __snd_pcm_sync_ptr {
- } c;
- };
-
-+#if __BITS_PER_LONG == 32
- #if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
--typedef char __pad_before_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
--typedef char __pad_after_uframe[0];
-+#define __PAD_BEFORE_UFRAME(x) char x[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
- #endif
-
- #if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
--typedef char __pad_before_uframe[0];
--typedef char __pad_after_uframe[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
-+#define __PAD_AFTER_UFRAME(x) char x[sizeof(__u64) - sizeof(snd_pcm_uframes_t)];
-+#endif
-+#endif
-+
-+#ifndef __PAD_BEFORE_UFRAME
-+#define __PAD_BEFORE_UFRAME(x)
-+#endif
-+
-+#ifndef __PAD_AFTER_UFRAME
-+#define __PAD_AFTER_UFRAME(x)
- #endif
-
- struct __snd_pcm_mmap_status64 {
- snd_pcm_state_t state; /* RO: state - SNDRV_PCM_STATE_XXXX */
- __u32 pad1; /* Needed for 64 bit alignment */
-- __pad_before_uframe __pad1;
-+ __PAD_BEFORE_UFRAME(__pad1)
- snd_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */
-- __pad_after_uframe __pad2;
-+ __PAD_AFTER_UFRAME(__pad2)
- struct __snd_timespec64 tstamp; /* Timestamp */
- snd_pcm_state_t suspended_state;/* RO: suspended stream state */
- __u32 pad3; /* Needed for 64 bit alignment */
-@@ -573,16 +581,19 @@ struct __snd_pcm_mmap_status64 {
- };
-
- struct __snd_pcm_mmap_control64 {
-- __pad_before_uframe __pad1;
-+ __PAD_BEFORE_UFRAME(__pad1)
- snd_pcm_uframes_t appl_ptr; /* RW: appl ptr (0...boundary-1) */
-- __pad_before_uframe __pad2; // This should be __pad_after_uframe, but binary
-+ __PAD_BEFORE_UFRAME(__pad2) // This should be __pad_after_uframe, but binary
- // backwards compatibility constraints prevent a fix.
-
-- __pad_before_uframe __pad3;
-+ __PAD_BEFORE_UFRAME(__pad3)
- snd_pcm_uframes_t avail_min; /* RW: min available frames for wakeup */
-- __pad_after_uframe __pad4;
-+ __PAD_AFTER_UFRAME(__pad4)
- };
-
-+#undef __PAD_BEFORE_UFRAME
-+#undef __PAD_AFTER_UFRAME
-+
- struct __snd_pcm_sync_ptr64 {
- __u32 flags;
- __u32 pad1;
---
-2.37.3
-
diff --git a/pkg/devel/linux-headers/patch/0005-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch b/pkg/devel/linux-headers/patch/0003-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch
diff --git a/pkg/devel/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch b/pkg/devel/linux-headers/patch/0004-Make-struct-bpf_timer-include-a-named-member.patch
@@ -1,32 +0,0 @@
-From 3685e3c0cb5029b4e17eee6a53d2214190738c24 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 ed8261560f2b..fb60bc7bb305 100644
---- a/include/uapi/linux/bpf.h
-+++ b/include/uapi/linux/bpf.h
-@@ -6968,9 +6968,8 @@ struct bpf_spin_lock {
- };
-
- struct bpf_timer {
-- __u64 :64;
-- __u64 :64;
--} __attribute__((aligned(8)));
-+ __u64 reserved[2];
-+};
-
- struct bpf_dynptr {
- __u64 :64;
---
-2.37.3
-
diff --git a/pkg/devel/linux-headers/sha256 b/pkg/devel/linux-headers/sha256
@@ -1 +1 @@
-8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3 linux-6.4.tar.xz
+c969dea4e8bb6be991bbf7c010ba0e0a5643a3a8d8fb0a2aaa053406f1e965f3 linux-6.8.tar.xz
diff --git a/pkg/devel/linux-headers/url b/pkg/devel/linux-headers/url
@@ -1 +1 @@
-url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz"
+url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.tar.xz"
diff --git a/pkg/devel/linux-headers/ver b/pkg/devel/linux-headers/ver
@@ -1 +1 @@
-6.4 r0
+6.8 r0