From: Jan Palus Date: Fri, 26 Jan 2024 10:40:56 +0000 (+0100) Subject: up to 6.7.2 X-Git-Tag: auto/th/kernel-6.7.2-1~1 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fkernel.git;a=commitdiff_plain;h=93afd17c6b156947f11f3c10521d0ffb1fe1c94b up to 6.7.2 --- diff --git a/kernel-pinebook-pro.patch b/kernel-pinebook-pro.patch index e946ec5c..d92d5ab7 100644 --- a/kernel-pinebook-pro.patch +++ b/kernel-pinebook-pro.patch @@ -651,36 +651,3 @@ index c2f021a1a18f..fc33e111bbee 100644 -- 2.34.1 -From f37669119423ca852ca855b24732f25c0737aa57 Mon Sep 17 00:00:00 2001 -From: Jan Palus -Date: Sat, 11 Nov 2023 23:17:04 +0100 -Subject: power: supply: cw2015: correct time_to_empty units in sysfs - -RRT_ALRT register holds remaining battery time in minutes therefore it -needs to be scaled accordingly when exposing TIME_TO_EMPTY via sysfs -expressed in seconds - -Fixes: b4c7715c10c1 ("power: supply: add CellWise cw2015 fuel gauge driver") -Signed-off-by: Jan Palus -Link: https://lore.kernel.org/r/20231111221704.5579-1-jpalus@fastmail.com -Signed-off-by: Sebastian Reichel ---- - drivers/power/supply/cw2015_battery.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/power/supply/cw2015_battery.c b/drivers/power/supply/cw2015_battery.c -index bb29e9ebd24a8e..99f3ccdc30a6a7 100644 ---- a/drivers/power/supply/cw2015_battery.c -+++ b/drivers/power/supply/cw2015_battery.c -@@ -491,7 +491,7 @@ static int cw_battery_get_property(struct power_supply *psy, - - case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW: - if (cw_battery_valid_time_to_empty(cw_bat)) -- val->intval = cw_bat->time_to_empty; -+ val->intval = cw_bat->time_to_empty * 60; - else - val->intval = 0; - break; --- -cgit 1.2.3-korg - diff --git a/kernel.spec b/kernel.spec index 3aa73274..f9fe40b1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -61,7 +61,7 @@ %define rel 0.1 %define basever 6.7 -%define postver .0 +%define postver .2 # define this to '-%{basever}' for longterm branch %define versuffix %{nil} @@ -115,7 +115,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz # Source0-md5: 7861a2ed9d33c0694df738203532b715 %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz -# Patch0-md5: f8232b7bae1e82941f139bf4ef1f1f27 +# Patch0-md5: 418553a71754fb26a0edbc264890afa5 %endif Source1: kernel.sysconfig