Hi all,
On Wed, 17 Feb 2021 16:07:14 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/platform/intel-mid/device_libs/platform_bt.c
>
> between commit:
>
> 4590d98f5a4f ("sfi: Remove framework for deprecated firmware")
>
> from the
On Wed, Feb 17, 2021 at 7:38 AM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/platform/intel-mid/device_libs/platform_bt.c
>
> between commit:
>
> 4590d98f5a4f ("sfi: Remove framework for deprecated firmware")
>
> from the pm t
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/platform/intel-mid/device_libs/platform_bt.c
between commit:
4590d98f5a4f ("sfi: Remove framework for deprecated firmware")
from the pm tree and commit:
bdb154f074a6 ("x86/platform/intel-mid: Convert comma to s
On Mon, Oct 08, 2018 at 12:05:02PM +0200, Rafael J. Wysocki wrote:
> On Monday, October 8, 2018 4:40:20 AM CEST Stephen Rothwell wrote:
> >
> > --Sig_/8A/3tsSoWQOAryCmuI_nxw6
> > Content-Type: text/plain; charset=US-ASCII
> > Content-Transfer-Encoding: quoted-printable
> >
> > Hi all,
> >
> > To
On Mon, Oct 8, 2018 at 1:11 PM Rafael J. Wysocki wrote:
>
> On Monday, October 8, 2018 4:44:49 AM CEST Stephen Rothwell wrote:
> >
> > --Sig_/bNRy8ryxcqLmcoGqvlETGhp
> > Content-Type: text/plain; charset=US-ASCII
> > Content-Transfer-Encoding: quoted-printable
> >
> > Hi all,
> >
> > Today's linux
On Monday, October 8, 2018 4:44:49 AM CEST Stephen Rothwell wrote:
>
> --Sig_/bNRy8ryxcqLmcoGqvlETGhp
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/powercap/int
On Monday, October 8, 2018 4:40:20 AM CEST Stephen Rothwell wrote:
>
> --Sig_/8A/3tsSoWQOAryCmuI_nxw6
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/idle/intel_i
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/powercap/intel_rapl.c
between commit:
17ed15183c24 ("powercap: RAPL: Get rid of custom RAPL_CPU() macro")
from the pm tree and commit:
f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
from the tip tree.
I f
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/idle/intel_idle.c
between commit:
a4a008e53c9e ("intel_idle: Get rid of custom ICPU() macro")
from the pm tree and commit:
f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
from the tip tree.
I fixed it up (
* Rafael J. Wysocki wrote:
> On Friday, March 23, 2018 7:09:24 AM CET Ingo Molnar wrote:
> >
> > * Stephen Rothwell wrote:
> >
> > > Hi all,
> > >
> > > Today's linux-next merge of the tip tree got a conflict in:
> > >
> > > kernel/sched/cpufreq_schedutil.c
> > >
> > > between commit:
>
On Friday, March 23, 2018 7:09:24 AM CET Ingo Molnar wrote:
>
> * Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > kernel/sched/cpufreq_schedutil.c
> >
> > between commit:
> >
> > 0953feed3400 ("cpufreq: schedutil: rate lim
* Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/sched/cpufreq_schedutil.c
>
> between commit:
>
> 0953feed3400 ("cpufreq: schedutil: rate limits for SCHED_DEADLINE")
Rafael, could you please send that to the scheduler tree?
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/sched/cpufreq_schedutil.c
between commit:
0953feed3400 ("cpufreq: schedutil: rate limits for SCHED_DEADLINE")
from the pm tree and commit:
8f111bc357aa ("cpufreq/schedutil: Rewrite CPUFREQ_RT support")
from the
On Monday, November 6, 2017 3:10:40 AM CET Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/idle/intel_idle.c
>
> between commit:
>
> 0563bb7ba67e ("intel_idle: replace conditionals with
> static_cpu_has(X86_FEATURE_ARAT)")
>
>
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/idle/intel_idle.c
between commit:
0563bb7ba67e ("intel_idle: replace conditionals with
static_cpu_has(X86_FEATURE_ARAT)")
from the pm tree and commit:
675357362aeb ("Revert "x86/mm: Stop calling leave_mm() in i
Hi all,
On Fri, 11 Aug 2017 14:06:46 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/sched/fair.c
>
> between commit:
>
> 674e75411fc2 ("sched: cpufreq: Allow remote cpufreq callbacks")
>
> from the pm tree and commit:
>
> a030d
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/sched/fair.c
between commit:
674e75411fc2 ("sched: cpufreq: Allow remote cpufreq callbacks")
from the pm tree and commit:
a030d7381d8b ("sched/fair: Call cpufreq update util handlers less frequently
on UP")
fro
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/idle/Kconfig
drivers/idle/i7300_idle.c
between commits:
f2f31bb3f50b ("idle / i7300: Add CONFIG_PCI dependency")
ccd29e2ed6bc ("i7300_idle: avoid theoretical uninitialized data usage")
881ef1847b2d ("i7300_idl
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/powercap/intel_rapl.c
between commit:
9b1d0794b70d ("powercap / RAPL: add support for Skylake-X")
from the pm tree and commit:
62d167330679 ("x86, powercap, rapl: Use Intel model macros intead of
open-coding")
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/cpufreq/longhaul.c
between commit:
b49c22a6ca36 ("cpufreq: Convert printk(KERN_ to pr_")
from the pm tree and commit:
93984fbd4e33 ("x86/cpufeature: Replace cpu_has_apic with boot_cpu_has()
usage")
from the ti
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
tools/power/x86/turbostat/turbostat.c
between commit:
58cc30a4e608 ("tools/power turbostat: fix compiler warnings")
from the pm tree and commit:
1b69317d2dc8 ("tools/power turbostat: fix various build warnings")
from t
On Friday, March 11, 2016 12:57:46 PM Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/sched/sched.h
>
> between commit:
>
> adaf9fcd1369 ("cpufreq: Move scheduler-related code to the sched directory")
>
> from the pm tree and com
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/sched/sched.h
between commit:
adaf9fcd1369 ("cpufreq: Move scheduler-related code to the sched directory")
from the pm tree and commit:
e9532e69b8d1 ("sched/cputime: Fix steal time accounting vs. CPU hotplug")
f
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/cpufreq/intel_pstate.c
between commit:
7791e4aa59ad ("cpufreq: intel_pstate: Enable HWP by default")
from the pm tree and commit:
bc696ca05f5a ("x86/cpufeature: Replace the old static_cpu_has() with safe
varian
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm64/kernel/acpi.c
between commit:
f26527b1428f ("irqchip / GIC: Convert the GIC driver to ACPI probing")
from the pm tree and commit:
89e44b51cc0d ("arm64, acpi/apei: Implement arch_apei_get_mem_attributes()")
f
On Tuesday, March 31, 2015 06:58:44 PM Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got conflicts in
> include/linux/clockchips.h, kernel/time/tick-broadcast.c,
> kernel/time/tick-common.c and kernel/time/tick-internal.h between
> commit 01b9fdf7e540 ("tick: Move
Hi all,
Today's linux-next merge of the tip tree got conflicts in
include/linux/clockchips.h, kernel/time/tick-broadcast.c,
kernel/time/tick-common.c and kernel/time/tick-internal.h between
commit 01b9fdf7e540 ("tick: Move core only declarations and functions
to core") (and others) from the pm tre
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/arm/common/bL_switcher.c between commit bf03f36d239f ("arm:
bl_switcher: Kill tick suspend hackery") from the pm tree and commit
77e32c89a711 ("clockevents: Manage device's state separately for the
core") from the tip tree.
I
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/kernel/apic/io_apic.c between commit 16394fd03114 ("x86 / PM:
Replace CONFIG_PM_RUNTIME in io_apic.c") from the pm tree and various
commits from the tip tree.
I fixed it up (the tip tree seems to have made extensive chang
On Tuesday, November 25, 2014 04:46:40 PM Stephen Rothwell wrote:
>
> --Sig_/T.+7iMvUwEH92u+UTGF86Po
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> drivers/acpi/processor_core
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/acpi/processor_core.c between commit 9d48ea9f967b ("ACPI /
processor: Convert apic_id to phys_id to make it arch agnostic") from
the pm tree and commits 5922b6f497ed ("ACPI: Fix minor syntax issues in
processor_core.c") and
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/Kconfig between commit 8a1664be0b92 ("ACPI: add config for
BIOS table scan") from the pm tree and commit 44a69f619562 ("acpi, apei,
ghes: Make NMI error notification to be GHES architecture extension")
from the tip tree.
Hi all,
Today's linux-next merge of the tip tree got a conflict in
kernel/sched/idle.c between commit 52c324f8a87b ("cpuidle: Combine
cpuidle_enabled() with cpuidle_select()") from the pm tree and commit
37352273ad48 ("sched/idle: Reflow cpuidle_idle_call()") from the tip
tree.
I fixed it up (I h
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/acpi/apei/einj.c between commit 8b48463f8942 ("ACPI: Clean up
inclusions of ACPI header files") from the pm tree and commit
d3ab3edc029b ("ACPI, APEI: Cleanup alignment-aware accesses") from the
tip tree.
I fixed it up (se
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/acpi/processor_idle.c between commit 6cb85b2b9df9 ("ACPI /
cpuidle: fix max idle state handling with hotplug CPU support") from the
pm tree and commit 16824255394f ("x86, acpi, idle: Restructure the mwait
idle routines") fr
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/acpi/acpi_extlog.c between commit 7ede9f8a1805 ("ACPI / extlog:
replace open-coded _DSM code with helper functions") from the pm tree and
commit 42139eb356e3 ("ACPI, eMCA: Combine eMCA/EDAC event reporting
priority") from t
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/include/asm/processor.h between commit 61c63e5ed3b9 ("cpufreq:
Remove unused APERF/MPERF support") from the pm tree and commit
96e39ac0e9d1 ("x86: Introduce hypervisor_cpuid_base()") from the tip tree.
I fixed it up (see
Hi all,
Today's linux-next merge of the tip tree got a conflict in
include/linux/clockchips.h between commit 4dbad816febb ("timer: move enum
definition out of ifdef section") from the pm tree and commit
19919226c3f2 ("clockevents: Add missing tick_check_broadcast_expired()
for CLOCKEVENTS=n") from
38 matches
Mail list logo
