linux-next: manual merge of the clk tree with the trivial tree

[Stephen Rothwell]

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
drivers/clk/mvebu/clk-core.c between commit 07f42258893d ("treewide: Fix
typos in printk") from the trivial tree and commit 4cb24e68a5af ("clk:
mvebu: Fix valid value range checking for cpu_freq_select") from the clk
tree.

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

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

diff --cc drivers/clk/mvebu/clk-core.c
index 1b4e333,2628610..0000000
--- a/drivers/clk/mvebu/clk-core.c
+++ b/drivers/clk/mvebu/clk-core.c
@@@ -156,8 -156,8 +156,8 @@@ static u32 __init armada_370_get_cpu_fr
  
        cpu_freq_select = ((readl(sar) >> SARL_A370_PCLK_FREQ_OPT) &
                           SARL_A370_PCLK_FREQ_OPT_MASK);
-       if (cpu_freq_select > ARRAY_SIZE(armada_370_cpu_frequencies)) {
+       if (cpu_freq_select >= ARRAY_SIZE(armada_370_cpu_frequencies)) {
 -              pr_err("CPU freq select unsuported %d\n", cpu_freq_select);
 +              pr_err("CPU freq select unsupported %d\n", cpu_freq_select);
                cpu_freq = 0;
        } else
                cpu_freq = armada_370_cpu_frequencies[cpu_freq_select];
@@@ -278,8 -278,8 +278,8 @@@ static u32 __init armada_xp_get_cpu_fre
        cpu_freq_select |= (((readl(sar+4) >> SARH_AXP_PCLK_FREQ_OPT) &
                             SARH_AXP_PCLK_FREQ_OPT_MASK)
                            << SARH_AXP_PCLK_FREQ_OPT_SHIFT);
-       if (cpu_freq_select > ARRAY_SIZE(armada_xp_cpu_frequencies)) {
+       if (cpu_freq_select >= ARRAY_SIZE(armada_xp_cpu_frequencies)) {
 -              pr_err("CPU freq select unsuported: %d\n", cpu_freq_select);
 +              pr_err("CPU freq select unsupported: %d\n", cpu_freq_select);
                cpu_freq = 0;
        } else
                cpu_freq = armada_xp_cpu_frequencies[cpu_freq_select];

pgpSOjvxgPqK7.pgp
Description: PGP signature