Re: linux-next: manual merge of the tip tree with the pm tree

2021-02-21 Thread Stephen Rothwell
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

Re: linux-next: manual merge of the tip tree with the pm tree

2021-02-17 Thread Andy Shevchenko
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

Re: linux-next: manual merge of the tip tree with the pm tree

2018-10-08 Thread Andy Shevchenko
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

Re: linux-next: manual merge of the tip tree with the pm tree

2018-10-08 Thread Andy Shevchenko
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

Re: linux-next: manual merge of the tip tree with the pm tree

2018-10-08 Thread Rafael J. Wysocki
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

Re: linux-next: manual merge of the tip tree with the pm tree

2018-10-08 Thread Rafael J. Wysocki
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

Re: linux-next: manual merge of the tip tree with the pm tree

2018-03-24 Thread Ingo Molnar
* 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: >

Re: linux-next: manual merge of the tip tree with the pm tree

2018-03-23 Thread Rafael J. Wysocki
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

Re: linux-next: manual merge of the tip tree with the pm tree

2018-03-22 Thread Ingo Molnar
* 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?

Re: linux-next: manual merge of the tip tree with the pm tree

2017-11-06 Thread Rafael J. Wysocki
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)") > >

Re: linux-next: manual merge of the tip tree with the pm tree

2017-09-03 Thread Stephen Rothwell
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

Re: linux-next: manual merge of the tip tree with the pm tree

2016-03-11 Thread Rafael J. Wysocki
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

Re: linux-next: manual merge of the tip tree with the pm tree

2015-03-31 Thread Rafael J. Wysocki
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

Re: linux-next: manual merge of the tip tree with the pm tree

2014-11-25 Thread Rafael J. Wysocki
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