linux-next: manual merge of the mvebu tree with the arm-soc tree

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!feeds.phibee-telecom.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the mvebu tree with the arm-soc tree
Date	Thu, 14 Apr 2016 01:30:03 +0200
Message-ID	<rnCor-IX-21@gated-at.bofh.it> (permalink)
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1460590160; bh=JM+BMRmV7SVuhoUWz//wqjCwfjDzV/ypjErbX7WCcgE=; h=Date:From:To:Cc:Subject:From; b=K0GGi2fZCM1cOs6V9521MnHEj/5Bxzuzat1tqHKU+BvM0avFm0Xm8rtzygN+RO0lm 2nHtelYvmGLLuO5sxOvxCvrDl2wKiZQpAeRePUrMZAbFwqqHgrIhJ0JHJxZsimcebB CydB/Cd4SOPdFkSdqOObNqm1SDrOLjD9AfjUaRbo=
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	41
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Romain Perier <romain.perier@free-electrons.com>, Lee Jones <lee.jones@linaro.org>, Maxime Coquelin <maxime.coquelin@st.com>
X-Original-Date	Thu, 14 Apr 2016 09:29:20 +1000
X-Original-Message-ID	<20160414092920.41fb4ebe@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1378338

Show key headers only | View raw

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in:

  arch/arm/configs/multi_v7_defconfig

between commit:

  6d54fb8a08a7 ("ARM: multi_v7_defconfig: Enable ST's HW Random Number Generator")

from the arm-soc tree and commit:

  fe767240934f ("ARM: configs: Enabling the new Marvell's cryptographic engine driver for multi_v7_defconfig")

from the mvebu 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/arm/configs/multi_v7_defconfig
index 811b41823baa,392e970b60c7..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -837,8 -829,7 +837,9 @@@ CONFIG_LOCKUP_DETECTOR=
  CONFIG_CRYPTO_DEV_TEGRA_AES=y
  CONFIG_CPUFREQ_DT=y
  CONFIG_KEYSTONE_IRQ=y
 +CONFIG_HW_RANDOM=y
 +CONFIG_HW_RANDOM_ST=y
+ CONFIG_CRYPTO_DEV_MARVELL_CESA=m
  CONFIG_CRYPTO_DEV_SUN4I_SS=m
  CONFIG_CRYPTO_DEV_ROCKCHIP=m
  CONFIG_ARM_CRYPTO=y

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

Thread

linux-next: manual merge of the mvebu tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-04-14 01:30 +0200

csiph-web