From 786927289f3c1f79a1451e5b6150a45172e17d16 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Tue, 6 Feb 2024 14:03:43 +0100
Subject: [PATCH] linux-postmarketos-qcom-msm8996: enable new community kconfig
 options (MR 4795)

---
 .../linux-postmarketos-qcom-msm8996/APKBUILD  |  4 +--
 .../config-postmarketos-qcom-msm8996.aarch64  | 32 +++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/device/community/linux-postmarketos-qcom-msm8996/APKBUILD b/device/community/linux-postmarketos-qcom-msm8996/APKBUILD
index 2cc6f6607..65c0aca0a 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.3.1
-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="
 3d842c6fa3e1f93875f9c8d4f51e66b267bbd6b0eabccc25b461cbc0616a632ee6f1f2001b77bef2aff6aa36a788277ab9fc930fcd6e71732e5cbffec2dcb269  linux-v6.3.1-msm8996.tar.gz
-f567c9d2b5c64ee312d48d86c8082fb774e6d1a6a4cf1cb2c1b6bd0bd6464da495053be4fff1f56b6b5f7aab56469a21c618a530d277fcb213f0a9b0da1815b0  config-postmarketos-qcom-msm8996.aarch64
+e54f2ca8f33b540282d38326b0f9cb5c8c5b06c272c1bfbfaca24d1bab872c547427f993263729b8505c1ce276311c43c012cda265bebedf934cced511e51174  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 29358502c..5c08045e8 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.3.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.1.1_git20230527) 13.1.1 20230527"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130101
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24000
+CONFIG_AS_VERSION=24100
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24000
+CONFIG_LD_VERSION=24100
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -155,7 +155,8 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 #
 # Scheduler features
 #
-# CONFIG_UCLAMP_TASK is not set
+CONFIG_UCLAMP_TASK=y
+CONFIG_UCLAMP_BUCKETS_COUNT=5
 # end of Scheduler features
 
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
@@ -178,6 +179,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_SCHED_MM_CID=y
+CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 # CONFIG_CGROUP_RDMA is not set
 CONFIG_CGROUP_FREEZER=y
@@ -1027,7 +1029,7 @@ CONFIG_NFT_NAT=m
 # CONFIG_NFT_QUOTA is not set
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
-# CONFIG_NFT_COMPAT is not set
+CONFIG_NFT_COMPAT=m
 # CONFIG_NFT_HASH is not set
 CONFIG_NFT_FIB=m
 # CONFIG_NFT_FIB_INET is not set
@@ -1114,7 +1116,7 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_SCTP is not set
 # CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
 # CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 # CONFIG_NETFILTER_XT_MATCH_STRING is not set
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 # CONFIG_NETFILTER_XT_MATCH_TIME is not set
@@ -4620,7 +4622,7 @@ CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
-# CONFIG_UHID is not set
+CONFIG_UHID=m
 CONFIG_HID_GENERIC=y
 
 #
@@ -5168,7 +5170,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_CAMERA is not set
 CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
-# CONFIG_LEDS_TRIGGER_PATTERN is not set
+CONFIG_LEDS_TRIGGER_PATTERN=y
 # CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set
 
@@ -6736,8 +6738,18 @@ CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
-# CONFIG_CIFS is not set
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS2=y
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+# CONFIG_CIFS_UPCALL is not set
+# CONFIG_CIFS_XATTR is not set
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+# CONFIG_CIFS_SWN_UPCALL is not set
 # CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS_COMMON=m
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
 CONFIG_9P_FS=y