The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@kernel.org>
To: Thomas Gleixner <tglx@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	linux-kernel@vger.kernel.org, x86@kernel.org
Subject: Re: [GIT pull] timers/nohz for v7.2-rc1
Date: Mon, 15 Jun 2026 10:00:36 +0200	[thread overview]
Message-ID: <ai-xJK2EaeHOrZoH@gmail.com> (raw)
In-Reply-To: <178137556766.445890.17221615557871210068.tglx@fw13>


* Thomas Gleixner <tglx@kernel.org> wrote:

> Linus,
> 
> please pull the latest timers/nohz branch from:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-nohz-2026-06-13
> 
> up to:  6199f9999a9b: sched/cputime: Handle dyntick-idle steal time correctly
> 
> Updates for the NOHZ subsystem:

Merge note: there's a new conflict with the cpufreq tree which
is already upstream:

     Conflicts:
            drivers/cpufreq/cpufreq_governor.c

Due to these commits:

  080b5c6d9503 ("sched/cputime: Remove superfluous and error prone kcpustat_field() parameter")

  24fc5870808d ("cpufreq: governor: Fix stale prev_cpu_nice spike when enabling ignore_nice_load")

It's just overlapping changes, the resolution is to remove the
first argument of all 3 uses of kcpustat_field() from the cpufreq
version of the file, like 080b5c6d9503 does.

Thanks,

	Ingo

  reply	other threads:[~2026-06-15  8:00 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-13 21:24 [GIT pull] core/rseq for v7.2-rc1 Thomas Gleixner
2026-06-13 21:24 ` [GIT pull] irq/core " Thomas Gleixner
2026-06-15  8:51   ` pr-tracker-bot
2026-06-13 21:24 ` [GIT pull] irq/drivers " Thomas Gleixner
2026-06-15  8:51   ` pr-tracker-bot
2026-06-13 21:24 ` [GIT pull] irq/msi " Thomas Gleixner
2026-06-15  8:51   ` pr-tracker-bot
2026-06-13 21:25 ` [GIT pull] smp/core " Thomas Gleixner
2026-06-15  8:51   ` pr-tracker-bot
2026-06-13 21:25 ` [GIT pull] timers/clocksource " Thomas Gleixner
2026-06-15  8:51   ` pr-tracker-bot
2026-06-13 21:25 ` [GIT pull] timers/core " Thomas Gleixner
2026-06-15  8:51   ` pr-tracker-bot
2026-06-15 13:35   ` Oleg Nesterov
2026-06-13 21:25 ` [GIT pull] timers/nohz " Thomas Gleixner
2026-06-15  8:00   ` Ingo Molnar [this message]
2026-06-15  8:51   ` pr-tracker-bot
2026-06-13 21:25 ` [GIT pull] timers/ptp " Thomas Gleixner
2026-06-15  8:51   ` pr-tracker-bot
2026-06-13 21:25 ` [GIT pull] timers/vdso " Thomas Gleixner
2026-06-15  8:51   ` pr-tracker-bot
2026-06-15  8:51 ` [GIT pull] core/rseq " pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ai-xJK2EaeHOrZoH@gmail.com \
    --to=mingo@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox