Linus,

please pull the latest timers/urgent branch from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-2025-12-01

up to:  c7418164b463: timekeeping: Fix error code in tk_aux_sysfs_init()


A delayed bugfix for the timekeeping code which makes the recent fix
plugging the resource leak correct in terms of the returned error code.

Thanks,

	tglx

------------------>
Dan Carpenter (1):
      timekeeping: Fix error code in tk_aux_sysfs_init()


 kernel/time/timekeeping.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 08e0943b54da..4790da895203 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -3073,8 +3073,10 @@ static int __init tk_aux_sysfs_init(void)
 		char id[2] = { [0] = '0' + i, };
 		struct kobject *clk = kobject_create_and_add(id, auxo);
 
-		if (!clk)
+		if (!clk) {
+			ret = -ENOMEM;
 			goto err_clean;
+		}
 
 		ret = sysfs_create_group(clk, &aux_clock_enable_attr_group);
 		if (ret)

* Thomas Gleixner <tglx@linutronix.de> wrote:

> Linus,
> 
> please pull the latest timers/urgent branch from:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-2025-12-01
> 
> up to:  c7418164b463: timekeeping: Fix error code in tk_aux_sysfs_init()
> 
> 
> A delayed bugfix for the timekeeping code which makes the recent fix
> plugging the resource leak correct in terms of the returned error code.
> 
> Thanks,
> 
> 	tglx
> 
> ------------------>
> Dan Carpenter (1):
>       timekeeping: Fix error code in tk_aux_sysfs_init()
> 
> 
>  kernel/time/timekeeping.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

So JFYI, this fix is already upstream:

  e69c7c175115 Merge tag 'timers_urgent_for_v6.18_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Boris sent timers/urgent yesterday morning.

Thanks,

	Ingo