commit: fbd109c85f41a654e009cf18b0488a8d9bbdad33 parent 89e45852644d37a23ff83ceb208f438a66a2835f Author: Michael Forney <mforney@mforney.org> Date: Fri, 21 Oct 2022 18:11:42 -0700 linux-headers: Update to 6.0Diffstat:
9 files changed, 32 insertions(+), 19 deletions(-)diff --git a/pkg/linux-headers/.gitignore b/pkg/linux-headers/.gitignore@@ -1,3 +1,3 @@ -/linux-5.16.tar.xz +/linux-6.0.tar.xz /src /tools.ninjadiff --git a/pkg/linux-headers/base.lua b/pkg/linux-headers/base.lua@@ -31,6 +31,7 @@ return { 'asm-generic/stat.h', 'asm-generic/statfs.h', 'asm-generic/swab.h', + 'asm-generic/termbits-common.h', 'asm-generic/termbits.h', 'asm-generic/termios.h', 'asm-generic/types.h', @@ -127,6 +128,7 @@ return { 'linux/btrfs_tree.h', 'linux/byteorder/big_endian.h', 'linux/byteorder/little_endian.h', + 'linux/cachefiles.h', 'linux/caif/caif_socket.h', 'linux/caif/if_caif.h', 'linux/can.h', @@ -156,6 +158,7 @@ return { 'linux/cn_proc.h', 'linux/coda.h', 'linux/coff.h', + 'linux/comedi.h', 'linux/connector.h', 'linux/const.h', 'linux/coresight-stm.h', @@ -164,6 +167,7 @@ return { 'linux/cryptouser.h', 'linux/cuda.h', 'linux/cxl_mem.h', + 'linux/cyclades.h', 'linux/cycx_cfm.h', 'linux/dcbnl.h', 'linux/dccp.h', @@ -333,6 +337,7 @@ return { 'linux/keyboard.h', 'linux/keyctl.h', 'linux/kfd_ioctl.h', + 'linux/kfd_sysfs.h', 'linux/kvm.h', 'linux/kvm_para.h', 'linux/l2tp.h', @@ -341,6 +346,7 @@ return { 'linux/limits.h', 'linux/lirc.h', 'linux/llc.h', + 'linux/loadpin.h', 'linux/loop.h', 'linux/lp.h', 'linux/lwtunnel.h', @@ -571,6 +577,7 @@ return { 'linux/perf_event.h', 'linux/personality.h', 'linux/pfkeyv2.h', + 'linux/pfrut.h', 'linux/pg.h', 'linux/phantom.h', 'linux/phonet.h', @@ -645,6 +652,7 @@ return { 'linux/serial_core.h', 'linux/serial_reg.h', 'linux/serio.h', + 'linux/sev-guest.h', 'linux/shm.h', 'linux/signal.h', 'linux/signalfd.h', @@ -721,6 +729,7 @@ return { 'linux/tty.h', 'linux/tty_flags.h', 'linux/types.h', + 'linux/ublk_cmd.h', 'linux/udf_fs_i.h', 'linux/udmabuf.h', 'linux/udp.h', @@ -835,6 +844,7 @@ return { 'rdma/bnxt_re-abi.h', 'rdma/cxgb4-abi.h', 'rdma/efa-abi.h', + 'rdma/erdma-abi.h', 'rdma/hfi/hfi1_ioctl.h', 'rdma/hfi/hfi1_user.h', 'rdma/hns-abi.h', @@ -865,6 +875,7 @@ return { 'scsi/fc/fc_gs.h', 'scsi/fc/fc_ns.h', 'scsi/scsi_bsg_fc.h', + 'scsi/scsi_bsg_mpi3mr.h', 'scsi/scsi_bsg_ufs.h', 'scsi/scsi_netlink.h', 'scsi/scsi_netlink_fc.h', @@ -878,6 +889,7 @@ return { 'sound/firewire.h', 'sound/hdsp.h', 'sound/hdspm.h', + 'sound/intel/avs/tokens.h', 'sound/sb16_csp.h', 'sound/sfnt_info.h', 'sound/skl-tplg-interface.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 8b57c152660e28afb04d9c03a5b8b5c224bd11fd Mon Sep 17 00:00:00 2001 +From d30eb4721a77809524e1028d7ec750f2a3d2eae6 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 ba5af15e25f5..90c141acf380 100644 +index 59a217ca2dfd..864d6345ebc3 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h -@@ -5185,12 +5185,10 @@ enum { +@@ -5606,12 +5606,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 ba5af15e25f5..90c141acf380 100644 /* Current network namespace */ enum { -- -2.34.1 +2.35.1diff --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 1c362a59b41e944dd21b5d72dbab4465d2346415 Mon Sep 17 00:00:00 2001 +From 0be2d9781e7023f71d1e9b8939a5faf844033846 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 5859ca0a1439..bbb078f3fddf 100644 +index 3974a2a911cc..ac58a16fc826 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h -@@ -554,22 +554,30 @@ struct __snd_pcm_sync_ptr { +@@ -561,22 +561,30 @@ struct __snd_pcm_sync_ptr { } c; }; @@ -48,7 +48,7 @@ index 5859ca0a1439..bbb078f3fddf 100644 struct __snd_timespec64 tstamp; /* Timestamp */ snd_pcm_state_t suspended_state;/* RO: suspended stream state */ __u32 pad3; /* Needed for 64 bit alignment */ -@@ -577,15 +585,18 @@ struct __snd_pcm_mmap_status64 { +@@ -584,15 +592,18 @@ struct __snd_pcm_mmap_status64 { }; struct __snd_pcm_mmap_control64 { @@ -72,5 +72,5 @@ index 5859ca0a1439..bbb078f3fddf 100644 __u32 flags; __u32 pad1; -- -2.34.0 +2.35.1diff --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 2098e4227bca59a46f19f817a6af1f52ea9a408e Mon Sep 17 00:00:00 2001 +From e0e81fd6e3be7bd03fcf82cbb598253a9b7c47f8 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 90c141acf380..b05ee9448e6a 100644 +index 864d6345ebc3..a2ac330e49bd 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h -@@ -6250,9 +6250,8 @@ struct bpf_spin_lock { +@@ -6688,9 +6688,8 @@ struct bpf_spin_lock { }; struct bpf_timer { @@ -25,8 +25,8 @@ index 90c141acf380..b05ee9448e6a 100644 + __u64 reserved[2]; +}; - struct bpf_sysctl { - __u32 write; /* Sysctl is being read (= 0) or written (= 1). + struct bpf_dynptr { + __u64 :64; -- -2.34.1 +2.35.1diff --git a/pkg/linux-headers/sha256 b/pkg/linux-headers/sha256@@ -1 +1 @@ -027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz +5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e linux-6.0.tar.xzdiff --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.16.tar.xz" +url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz"diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver@@ -1 +1 @@ -5.16 r0 +6.0 r0diff --git a/pkg/linux-headers/x86.lua b/pkg/linux-headers/x86.lua@@ -1,6 +1,7 @@ return { -- <cd src/arch/x86/include/uapi && find * -name '*.h' -exec printf "\t'%s',\n" {} + | LC_COLLATE=C sort 'asm/a.out.h', + 'asm/amd_hsmp.h', 'asm/auxvec.h', 'asm/bitsperlong.h', 'asm/boot.h',