linux-headers: Update to 5.16

3 files changed, 34 insertions, 8 deletions

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
index 8296907d..bd4a51eb 100644
--- 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
index e1bcac0a..025a28d1 100644
--- 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
new file mode 100644
index 00000000..05de68d2
--- /dev/null
+++ 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
+