From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31BDA2DA759 for ; Mon, 15 Jun 2026 08:00:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781510441; cv=none; b=be6LktILr6ATo6IcNAw453jlXPzT5CW3gc1J61qnREPHrcbltkS+AaHbcctLY8TK//Ws/0wh9IJkGWYHsQwwibuYgeo6CO2X73eOpMfByWJDOdIuR4+oNuISoCQAvSXFr6UrbXhgG8JH0IUhWaiW285p33K4EEygCNMWKnqScUo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781510441; c=relaxed/simple; bh=OqsUi5daO9/E408pLMJmgmKaue6lYc49os6Cj8OLMVY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=IlaIEBVelkvuWB/Z1MlN0AOygyD88dN2zr5P3zA8uMpl/2MFKpMpPsO7kid9DWQWMA1ROzsYIbh3M5JAyHd6vcR26dn29lht8AZxbssxBQMf0dit4qmQaSuN9nq571Va1SBSBqfkWHqlK4DXVAvK70+bZDPmQ4sxCQrdNqJJdQ0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=obxfiqrF; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="obxfiqrF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED4E51F000E9; Mon, 15 Jun 2026 08:00:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781510440; bh=ca0dkI7DX5rJU/uvEk6KsYhIZILnP2RewseUgogNlTc=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=obxfiqrFk1fnxbOLY2vvZ+gV+DMIWXLOMMjiFPt84jjt0mj+uMMXkflgX2JNcCXiT prZH1D+AmOkxdyo1kTsxZgPffmXUwk30E+2qgQPCCbxY7IDXo/9Sh2izZmTMWrambD ibqolBF/rW0I2HtP3qUTg4pB+VNetyS+SHhPsZYPRx/IDUIWjC4Wshjg+cfQTc8Muu wYz9gwjMOS/cgXCZvp+iKgQk4z4cr3rgrta818907UcuIua8sSAEgWhhhOPgSUVa1J qqOhiUxe9+nbaZKouAO+0LwJdYSFqjErbL0I8HvGqzZXhKJqr9o88lmW2cdMQ0f8lv af8ul3gUO1YVg== Date: Mon, 15 Jun 2026 10:00:36 +0200 From: Ingo Molnar To: Thomas Gleixner Cc: Linus Torvalds , linux-kernel@vger.kernel.org, x86@kernel.org Subject: Re: [GIT pull] timers/nohz for v7.2-rc1 Message-ID: References: <178137555902.445890.9588113013654487803.tglx@fw13> <178137556766.445890.17221615557871210068.tglx@fw13> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <178137556766.445890.17221615557871210068.tglx@fw13> * Thomas Gleixner 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