From dc4582792a9e105fe0791a424eea1188a12673f1 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 7 Feb 2024 10:41:25 +0100
Subject: [PATCH] linux-postmarketos-qcom-sc7280: enable new community kconfig
 options (MR 4803)

---
 device/testing/linux-postmarketos-qcom-sc7280/APKBUILD      | 4 ++--
 .../config-postmarketos-qcom-sc7280.aarch64                 | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/device/testing/linux-postmarketos-qcom-sc7280/APKBUILD b/device/testing/linux-postmarketos-qcom-sc7280/APKBUILD
index 7298f9c5e..37330a2d7 100644
--- a/device/testing/linux-postmarketos-qcom-sc7280/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-sc7280/APKBUILD
@@ -3,7 +3,7 @@
 _flavor="postmarketos-qcom-sc7280"
 pkgname=linux-$_flavor
 pkgver=6.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Mainline Kernel fork for SC7280/SM7325/QCM6490 devices"
 arch="aarch64"
 _carch="arm64"
@@ -55,5 +55,5 @@ package() {
 
 sha512sums="
 91976b128540662a672db3789b7a6bcbd24d6464594df8039366d4c1871995f94ccb3677ee19c97fbcff6663ec7f5034d94971e705780d01ee82f5a6008db0df  linux-v6.7.0-sc7280.tar.gz
-765901ffef62ff9c45907ac49533ff0feb42bb809aabb0f62e39df6751c8d07620a54433f5255c94facf83534e53680ad074dd3fddfe634940045a1a95a9b36f  config-postmarketos-qcom-sc7280.aarch64
+62261b74e0529c0495cdc1747da9bcd15012de4969a07835744926686f172f7272d91f93645c735d918ba654cde7b1e4abb11048e4f45fdd312a3186772ae932  config-postmarketos-qcom-sc7280.aarch64
 "
diff --git a/device/testing/linux-postmarketos-qcom-sc7280/config-postmarketos-qcom-sc7280.aarch64 b/device/testing/linux-postmarketos-qcom-sc7280/config-postmarketos-qcom-sc7280.aarch64
index 4c2293051..bceea5b19 100644
--- a/device/testing/linux-postmarketos-qcom-sc7280/config-postmarketos-qcom-sc7280.aarch64
+++ b/device/testing/linux-postmarketos-qcom-sc7280/config-postmarketos-qcom-sc7280.aarch64
@@ -143,7 +143,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
@@ -167,6 +168,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
@@ -1092,7 +1094,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