linux-next: manual merge of the pm tree with the mips tree

2017-01-30 Thread Stephen Rothwell
Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: arch/mips/configs/lemote2f_defconfig between commit: b3f6046186ef ("MIPS: Update lemote2f_defconfig for CPU_FREQ_STAT change") from the mips tree and commit: e7f73a76e07a ("cpufreq: Remove CONFIG_CPU_FREQ_STAT_DETAILS

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

2014-05-01 Thread Rafael J. Wysocki
On Thursday, May 01, 2014 12:09:32 PM Stephen Rothwell wrote: > > --Signature=_Thu__1_May_2014_12_09_32_+1000_d7zY1SkU6vg6nEQn > Content-Type: text/plain; charset=US-ASCII > Content-Disposition: inline > Content-Transfer-Encoding: quoted-printable > > Hi Rafael, > > Today's linux-next merge of t

linux-next: manual merge of the pm tree with the mips tree

2014-04-30 Thread Stephen Rothwell
Hi Rafael, Today's linux-next merge of the pm tree got a conflict in arch/mips/loongson/lemote-2f/clock.c between commit a68ce6507a45 ("MIPS/loongson2_cpufreq: Fix CPU clock rate setting") from the mips tree and commit 4966ee4037fe ("mips: lemote 2f: Use cpufreq_for_each_entry macro for iteration"