oasis

commit: ee9b61348a8e2bc0d14690262670a40451993e09
parent c60a5f7767fe665db8ef884195bba03127469d3d
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 28 Apr 2021 01:22:44 -0700

linux-headers: Update to 5.12

Diffstat:
M
pkg/linux-headers/.gitignore
2
+-
M
pkg/linux-headers/base.lua
8
++++++++
M
pkg/linux-headers/patch/0002-Revert-change-of-BPF_F_-to-enum-constants.patch
8
++++----
M
pkg/linux-headers/sha256
2
+-
M
pkg/linux-headers/url
2
+-
M
pkg/linux-headers/ver
2
+-

6 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/pkg/linux-headers/.gitignore b/pkg/linux-headers/.gitignore
@@ -1,3 +1,3 @@
-/linux-5.11.tar.xz
+/linux-5.12.tar.xz
 /src
 /tools.ninja
diff --git a/pkg/linux-headers/base.lua b/pkg/linux-headers/base.lua
@@ -66,6 +66,7 @@ return {
 	'drm/vmwgfx_drm.h',
 	'linux/a.out.h',
 	'linux/acct.h',
+	'linux/acrn.h',
 	'linux/adb.h',
 	'linux/adfs_fs.h',
 	'linux/affs_hardblocks.h',
@@ -141,6 +142,7 @@ return {
 	'linux/capi.h',
 	'linux/cciss_defs.h',
 	'linux/cciss_ioctl.h',
+	'linux/ccs.h',
 	'linux/cdrom.h',
 	'linux/cec-funcs.h',
 	'linux/cec.h',
@@ -160,6 +162,7 @@ return {
 	'linux/cramfs_fs.h',
 	'linux/cryptouser.h',
 	'linux/cuda.h',
+	'linux/cxl_mem.h',
 	'linux/cyclades.h',
 	'linux/cycx_cfm.h',
 	'linux/dcbnl.h',
@@ -215,6 +218,7 @@ return {
 	'linux/fscrypt.h',
 	'linux/fsi.h',
 	'linux/fsl_hypervisor.h',
+	'linux/fsl_mc.h',
 	'linux/fsmap.h',
 	'linux/fsverity.h',
 	'linux/fuse.h',
@@ -351,6 +355,7 @@ return {
 	'linux/meye.h',
 	'linux/mii.h',
 	'linux/minix_fs.h',
+	'linux/misc/bcm_vk.h',
 	'linux/mman.h',
 	'linux/mmc/ioctl.h',
 	'linux/mmtimer.h',
@@ -649,12 +654,14 @@ return {
 	'linux/sonypi.h',
 	'linux/sound.h',
 	'linux/soundcard.h',
+	'linux/spi/spi.h',
 	'linux/spi/spidev.h',
 	'linux/stat.h',
 	'linux/stddef.h',
 	'linux/stm.h',
 	'linux/string.h',
 	'linux/sunrpc/debug.h',
+	'linux/surface_aggregator/cdev.h',
 	'linux/suspend_ioctls.h',
 	'linux/swab.h',
 	'linux/switchtec_ioctl.h',
@@ -750,6 +757,7 @@ return {
 	'linux/vbox_err.h',
 	'linux/vbox_vmmdev_types.h',
 	'linux/vboxguest.h',
+	'linux/vdpa.h',
 	'linux/veth.h',
 	'linux/vfio.h',
 	'linux/vfio_ccw.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 6a41b5bb9244d4b6b1e74ac2074fff37d93d234b Mon Sep 17 00:00:00 2001
+From 9529e62e156fcd491efb8464100339f0c66b0296 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 77d7c1bb2923..364d4d58ceb8 100644
+index 4ba4ef0ff63a..2a6af1f960b9 100644
 --- a/include/uapi/linux/bpf.h
 +++ b/include/uapi/linux/bpf.h
-@@ -4060,12 +4060,10 @@ enum {
+@@ -4146,12 +4146,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 77d7c1bb2923..364d4d58ceb8 100644
  /* Current network namespace */
  enum {
 -- 
-2.30.0
+2.31.1
 
diff --git a/pkg/linux-headers/sha256 b/pkg/linux-headers/sha256
@@ -1 +1 @@
-04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4  linux-5.11.tar.xz
+7d0df6f2bf2384d68d0bd8e1fe3e071d64364dcdc6002e7b5c87c92d48fac366  linux-5.12.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.11.tar.xz"
+url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz"
diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver
@@ -1 +1 @@
-5.11 r0
+5.12 r0