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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the pm tree with the mips tree
Date	2017-01-31 02:10 +0100
Message-ID	<t5v7k-2HW-3@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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 config option")

from the pm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/mips/configs/lemote2f_defconfig
index 0cdb431bff80,bed745596d86..000000000000
--- a/arch/mips/configs/lemote2f_defconfig
+++ b/arch/mips/configs/lemote2f_defconfig
@@@ -39,8 -39,7 +39,7 @@@ CONFIG_HIBERNATION=
  CONFIG_PM_STD_PARTITION="/dev/hda3"
  CONFIG_CPU_FREQ=y
  CONFIG_CPU_FREQ_DEBUG=y
 -CONFIG_CPU_FREQ_STAT=m
 +CONFIG_CPU_FREQ_STAT=y
- CONFIG_CPU_FREQ_STAT_DETAILS=y
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
  CONFIG_CPU_FREQ_GOV_POWERSAVE=m
  CONFIG_CPU_FREQ_GOV_USERSPACE=m

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the pm tree with the mips tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-31 02:10 +0100

csiph-web