commit: 78685881821b2dcd3d7b0dba7ec257453f2dc2ca parent 3dc80140e30a8d67a91771952599d25fbd392ced Author: Michael Forney <mforney@mforney.org> Date: Tue, 17 Jan 2023 22:24:18 -0800 linux-headers: Update to 6.1Diffstat:
8 files changed, 18 insertions(+), 19 deletions(-)diff --git a/pkg/linux-headers/.gitignore b/pkg/linux-headers/.gitignore@@ -1,3 +1,3 @@ -/linux-6.0.tar.xz +/linux-6.1.tar.xz /src /tools.ninjadiff --git a/pkg/linux-headers/base.lua b/pkg/linux-headers/base.lua@@ -181,7 +181,6 @@ return { 'linux/dm-log-userspace.h', 'linux/dma-buf.h', 'linux/dma-heap.h', - 'linux/dn.h', 'linux/dns_resolver.h', 'linux/dqblk_xfs.h', 'linux/dvb/audio.h', @@ -192,6 +191,7 @@ return { 'linux/dvb/osd.h', 'linux/dvb/version.h', 'linux/dvb/video.h', + 'linux/dw100.h', 'linux/edd.h', 'linux/efs_fs_sb.h', 'linux/elf-em.h', @@ -510,7 +510,6 @@ return { 'linux/netfilter_bridge/ebt_stp.h', 'linux/netfilter_bridge/ebt_vlan.h', 'linux/netfilter_bridge/ebtables.h', - 'linux/netfilter_decnet.h', 'linux/netfilter_ipv4.h', 'linux/netfilter_ipv4/ip_tables.h', 'linux/netfilter_ipv4/ipt_CLUSTERIP.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 d30eb4721a77809524e1028d7ec750f2a3d2eae6 Mon Sep 17 00:00:00 2001 +From 0fc94dce04b2699087f4b2472c7bcc44d24c0cff 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 59a217ca2dfd..864d6345ebc3 100644 +index 51b9aa640ad2..ae026feb4c5b 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h -@@ -5606,12 +5606,10 @@ enum { +@@ -5717,12 +5717,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 59a217ca2dfd..864d6345ebc3 100644 /* Current network namespace */ enum { -- -2.35.1 +2.37.3diff --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 0be2d9781e7023f71d1e9b8939a5faf844033846 Mon Sep 17 00:00:00 2001 +From d3ae5dd27d8158e810c093b85dc4c7df88f01c5d 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 3974a2a911cc..ac58a16fc826 100644 +index de6810e94abe..a57304e141ff 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h -@@ -561,22 +561,30 @@ struct __snd_pcm_sync_ptr { +@@ -545,22 +545,30 @@ struct __snd_pcm_sync_ptr { } c; }; @@ -48,7 +48,7 @@ index 3974a2a911cc..ac58a16fc826 100644 struct __snd_timespec64 tstamp; /* Timestamp */ snd_pcm_state_t suspended_state;/* RO: suspended stream state */ __u32 pad3; /* Needed for 64 bit alignment */ -@@ -584,15 +592,18 @@ struct __snd_pcm_mmap_status64 { +@@ -568,15 +576,18 @@ struct __snd_pcm_mmap_status64 { }; struct __snd_pcm_mmap_control64 { @@ -72,5 +72,5 @@ index 3974a2a911cc..ac58a16fc826 100644 __u32 flags; __u32 pad1; -- -2.35.1 +2.37.3diff --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@@ -1,4 +1,4 @@ -From e0e81fd6e3be7bd03fcf82cbb598253a9b7c47f8 Mon Sep 17 00:00:00 2001 +From c57c6e0abe79f908eaac16deac7cdb51a58dc2c4 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 @@ -12,10 +12,10 @@ Signed-off-by: Michael Forney <mforney@mforney.org> 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h -index 864d6345ebc3..a2ac330e49bd 100644 +index ae026feb4c5b..a41109d08558 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h -@@ -6688,9 +6688,8 @@ struct bpf_spin_lock { +@@ -6822,9 +6822,8 @@ struct bpf_spin_lock { }; struct bpf_timer { @@ -28,5 +28,5 @@ index 864d6345ebc3..a2ac330e49bd 100644 struct bpf_dynptr { __u64 :64; -- -2.35.1 +2.37.3diff --git a/pkg/linux-headers/sha256 b/pkg/linux-headers/sha256@@ -1 +1 @@ -5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e linux-6.0.tar.xz +2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb linux-6.1.tar.xzdiff --git a/pkg/linux-headers/url b/pkg/linux-headers/url@@ -1 +1 @@ -url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz" +url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz"diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver@@ -1 +1 @@ -6.0 r0 +6.1 r0