up to 6.7.2

diff --git a/kernel-pinebook-pro.patch b/kernel-pinebook-pro.patch
index e946ec5c4cb60ac075960d3e39ca2d16215a6ae0..d92d5ab799e415819e2f2b71bb1eda31c5fc6836 100644 (file)
--- 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 <jpalus@fastmail.com>
-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 <jpalus@fastmail.com>
-Link: https://lore.kernel.org/r/20231111221704.5579-1-jpalus@fastmail.com
-Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
----
- 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 3aa7327419ce43eb393f283f208ed97b504c4b2c..f9fe40b107f59414533a377e393075b75bc187c2 100644 (file)
--- 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