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

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

[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 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

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

[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 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") from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks!

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1693 bytes --]

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") from the pm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/mips/loongson/lemote-2f/clock.c
index 67dd94ef28e6,1eed38e28b1e..000000000000
--- a/arch/mips/loongson/lemote-2f/clock.c
+++ b/arch/mips/loongson/lemote-2f/clock.c
@@@ -91,10 -91,9 +91,10 @@@ EXPORT_SYMBOL(clk_put)
  
  int clk_set_rate(struct clk *clk, unsigned long rate)
  {
 +	unsigned int rate_khz = rate / 1000;
+ 	struct cpufreq_frequency_table *pos;
  	int ret = 0;
  	int regval;
- 	int i;
  
  	if (likely(clk->ops && clk->ops->set_rate)) {
  		unsigned long flags;
@@@ -107,15 -106,10 +107,10 @@@
  	if (unlikely(clk->flags & CLK_RATE_PROPAGATES))
  		propagate_rate(clk);
  
- 	for (i = 0; loongson2_clockmod_table[i].frequency != CPUFREQ_TABLE_END;
- 	     i++) {
- 		if (loongson2_clockmod_table[i].frequency ==
- 		    CPUFREQ_ENTRY_INVALID)
- 			continue;
- 		if (rate_khz == loongson2_clockmod_table[i].frequency)
+ 	cpufreq_for_each_valid_entry(pos, loongson2_clockmod_table)
 -		if (rate == pos->frequency)
++		if (rate_khz == pos->frequency)
  			break;
- 	}
- 	if (rate_khz != loongson2_clockmod_table[i].frequency)
 -	if (rate != pos->frequency)
++	if (rate_khz != pos->frequency)
  		return -ENOTSUPP;
  
  	clk->rate = rate;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]