linux-kernel - linux-next: manual merge of the clk tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20150220111750.1aca940b@canb.auug.org.au>
Date:	Fri, 20 Feb 2015 11:17:50 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mike Turquette <mturquette@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Emil Medve <Emilian.Medve@...escale.com>,
	Michael Ellerman <mpe@...erman.id.au>
Subject: linux-next: manual merge of the clk tree with Linus' tree

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
arch/powerpc/configs/corenet32_smp_defconfig between commit
a85cade6762b ("powerpc: Update all configs using savedefconfig") from
the  tree and commit 8f0ab1e14139 ("powerpc/corenet: Enable CLK_QORIQ")
from the clk tree.

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

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

diff --cc arch/powerpc/configs/corenet32_smp_defconfig
index 51866f170684,cce62e934e0c..000000000000
--- a/arch/powerpc/configs/corenet32_smp_defconfig
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@@ -138,10 -143,11 +138,11 @@@ CONFIG_RTC_DRV_DS1307=
  CONFIG_RTC_DRV_DS1374=y
  CONFIG_RTC_DRV_DS3232=y
  CONFIG_UIO=y
 -CONFIG_STAGING=y
 -CONFIG_MEMORY=y
  CONFIG_VIRT_DRIVERS=y
  CONFIG_FSL_HV_MANAGER=y
 +CONFIG_STAGING=y
 +CONFIG_FSL_CORENET_CF=y
+ CONFIG_CLK_QORIQ=y
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

Content of type "application/pgp-signature" skipped