From 647c4233a347b4dfdf1acabeb1c8b7ced7cb4730 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Thu, 16 Mar 2023 09:41:33 +0100
Subject: [PATCH] linux-postmarketos-qcom-msm8996: update waydroid opts (MR
 3901)

---
 .../linux-postmarketos-qcom-msm8996/APKBUILD  |  4 ++--
 .../config-postmarketos-qcom-msm8996.aarch64  | 23 +++++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/device/community/linux-postmarketos-qcom-msm8996/APKBUILD b/device/community/linux-postmarketos-qcom-msm8996/APKBUILD
index cd9da8050..60dd2e917 100644
--- a/device/community/linux-postmarketos-qcom-msm8996/APKBUILD
+++ b/device/community/linux-postmarketos-qcom-msm8996/APKBUILD
@@ -4,7 +4,7 @@
 _flavor="postmarketos-qcom-msm8996"
 pkgname=linux-$_flavor
 pkgver=6.1.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8996 devices"
 arch="aarch64"
 _carch="arm64"
@@ -52,5 +52,5 @@ package() {
 }
 sha512sums="
 e610337d0b99a53d1c3e26a63232ac07bc8b66e98ba4220aed68c2b071fa3cafab558c84aa775826778de17404b9764009ef11a2648c5c05fb3156e06b68c1c7  linux-v6.1.14-msm8996.tar.gz
-27e29e00e9b62fc79c4d3b11f9966308e67aa743dc4b809bedb34d250a837dc022386215d0bbaf06df348444e51fe24bfd5fc2791324fe5afa288183f0b267d6  config-postmarketos-qcom-msm8996.aarch64
+f51a999944a4dbdd619b9803f821539f96c2c034497df27cdad1843161314a10609098155fe48683613340a527aaf8b9165f97d7b7beb297ee46c3553f950c9b  config-postmarketos-qcom-msm8996.aarch64
 "
diff --git a/device/community/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64 b/device/community/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64
index 8b403d44c..c5f36f6e6 100644
--- a/device/community/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64
+++ b/device/community/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64
@@ -2,14 +2,14 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.1.14 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r4) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r9) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23900
+CONFIG_AS_VERSION=24000
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23900
+CONFIG_LD_VERSION=24000
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -92,9 +92,12 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 #
 # BPF subsystem
 #
-# CONFIG_BPF_SYSCALL is not set
+CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
 CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+# CONFIG_BPF_PRELOAD is not set
 # end of BPF subsystem
 
 CONFIG_PREEMPT_BUILD=y
@@ -134,6 +137,9 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
 # end of RCU Subsystem
@@ -182,6 +188,7 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
 # CONFIG_CGROUP_MISC is not set
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_SOCK_CGROUP_DATA=y
@@ -900,6 +907,7 @@ CONFIG_AF_UNIX_OOB=y
 # CONFIG_TLS is not set
 # CONFIG_XFRM_USER is not set
 # CONFIG_NET_KEY is not set
+# CONFIG_XDP_SOCKETS is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -1332,6 +1340,7 @@ CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
+# CONFIG_BPF_STREAM_PARSER is not set
 CONFIG_NET_FLOW_LIMIT=y
 
 #
@@ -1458,6 +1467,9 @@ CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_SELFTESTS=m
+CONFIG_NET_SOCK_MSG=y
+CONFIG_PAGE_POOL=y
+# CONFIG_PAGE_POOL_STATS is not set
 CONFIG_FAILOVER=y
 CONFIG_ETHTOOL_NETLINK=y
 
@@ -3407,6 +3419,7 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 # CONFIG_REGULATOR_VQMMC_IPQ4019 is not set
 # CONFIG_REGULATOR_QCOM_LABIBB is not set
 CONFIG_RC_CORE=y
+# CONFIG_BPF_LIRC_MODE2 is not set
 CONFIG_LIRC=y
 CONFIG_RC_MAP=m
 # CONFIG_RC_DECODERS is not set
@@ -6921,6 +6934,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # end of Certificates for signature checking
 
+CONFIG_BINARY_PRINTF=y
+
 #
 # Library routines
 #