logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 39bc474e789fd403404c244870fbfeea94921f57
parent 895bb274e59a1157cac88ba3058dc7f51bbffb96
Author: Michael Forney <mforney@mforney.org>
Date:   Sat, 12 Feb 2022 00:46:22 -0800

linux-headers: Update to 5.16

Diffstat:

Mpkg/linux-headers/.gitignore2+-
Mpkg/linux-headers/base.lua6++++--
Mpkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch8++++----
Mpkg/linux-headers/patch/0005-Make-struct-bpf_timer-include-a-named-member.patch8++++----
Apkg/linux-headers/patch/0006-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch26++++++++++++++++++++++++++
Mpkg/linux-headers/sha2562+-
Mpkg/linux-headers/url2+-
Mpkg/linux-headers/ver2+-
8 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/pkg/linux-headers/.gitignore b/pkg/linux-headers/.gitignore @@ -1,3 +1,3 @@ -/linux-5.15.tar.xz +/linux-5.16.tar.xz /src /tools.ninja diff --git a/pkg/linux-headers/base.lua b/pkg/linux-headers/base.lua @@ -73,6 +73,7 @@ return { 'linux/agpgart.h', 'linux/aio_abi.h', 'linux/am437x-vpfe.h', + 'linux/amt.h', 'linux/android/binder.h', 'linux/android/binderfs.h', 'linux/apm_bios.h', @@ -108,7 +109,6 @@ return { 'linux/batadv_packet.h', 'linux/batman_adv.h', 'linux/baycom.h', - 'linux/bcache.h', 'linux/bcm933xx_hcs.h', 'linux/bfs_fs.h', 'linux/binfmts.h', @@ -159,6 +159,7 @@ return { 'linux/connector.h', 'linux/const.h', 'linux/coresight-stm.h', + 'linux/counter.h', 'linux/cramfs_fs.h', 'linux/cryptouser.h', 'linux/cuda.h', @@ -345,6 +346,7 @@ return { 'linux/lwtunnel.h', 'linux/magic.h', 'linux/major.h', + 'linux/map_to_14segment.h', 'linux/map_to_7segment.h', 'linux/matroxfb.h', 'linux/max2175.h', @@ -544,7 +546,6 @@ return { 'linux/nfsd/cld.h', 'linux/nfsd/debug.h', 'linux/nfsd/export.h', - 'linux/nfsd/nfsfh.h', 'linux/nfsd/stats.h', 'linux/nilfs2_api.h', 'linux/nilfs2_ondisk.h', @@ -880,6 +881,7 @@ return { 'sound/sb16_csp.h', 'sound/sfnt_info.h', 'sound/skl-tplg-interface.h', + 'sound/snd_ar_tokens.h', 'sound/snd_sst_tokens.h', 'sound/sof/abi.h', 'sound/sof/fw.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 d770264c9479c16bc45729d7bddd7e9275e44199 Mon Sep 17 00:00:00 2001 +From 8b57c152660e28afb04d9c03a5b8b5c224bd11fd 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 791f31dd0abe..a2e8fd2e798c 100644 +index ba5af15e25f5..90c141acf380 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h -@@ -5120,12 +5120,10 @@ enum { +@@ -5185,12 +5185,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 791f31dd0abe..a2e8fd2e798c 100644 /* Current network namespace */ enum { -- -2.34.0 +2.34.1 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 @@ -1,4 +1,4 @@ -From aec886b601b85235a21baa303f75c589f434b727 Mon Sep 17 00:00:00 2001 +From 2098e4227bca59a46f19f817a6af1f52ea9a408e 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 a2e8fd2e798c..79d70644e6a0 100644 +index 90c141acf380..b05ee9448e6a 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h -@@ -6180,9 +6180,8 @@ struct bpf_spin_lock { +@@ -6250,9 +6250,8 @@ struct bpf_spin_lock { }; struct bpf_timer { @@ -28,5 +28,5 @@ index a2e8fd2e798c..79d70644e6a0 100644 struct bpf_sysctl { __u32 write; /* Sysctl is being read (= 0) or written (= 1). -- -2.34.0 +2.34.1 diff --git a/pkg/linux-headers/patch/0006-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch b/pkg/linux-headers/patch/0006-nfc-uapi-remove-stray-semicolon-in-struct-declaratio.patch @@ -0,0 +1,26 @@ +From c421db7540796882a53d9b533862da16d7810ec3 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Fri, 18 Feb 2022 01:51:13 -0800 +Subject: [PATCH] nfc: uapi: remove stray semicolon in struct declaration + +Signed-off-by: Michael Forney <mforney@mforney.org> +--- + include/uapi/linux/nfc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/uapi/linux/nfc.h b/include/uapi/linux/nfc.h +index 4fa4e979e948..8ab0833ed192 100644 +--- a/include/uapi/linux/nfc.h ++++ b/include/uapi/linux/nfc.h +@@ -277,7 +277,7 @@ struct sockaddr_nfc_llcp { + __u32 nfc_protocol; + __u8 dsap; /* Destination SAP, if known */ + __u8 ssap; /* Source SAP to be bound to */ +- char service_name[NFC_LLCP_MAX_SERVICE_NAME]; /* Service name URI */; ++ char service_name[NFC_LLCP_MAX_SERVICE_NAME]; /* Service name URI */ + __kernel_size_t service_name_len; + }; + +-- +2.34.1 + diff --git a/pkg/linux-headers/sha256 b/pkg/linux-headers/sha256 @@ -1 +1 @@ -57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8 linux-5.15.tar.xz +027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.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.15.tar.xz" +url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.16.tar.xz" diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver @@ -1 +1 @@ -5.15 r0 +5.16 r0