From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Nicolas Ferre <nicolas.ferre@atmel.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: linux-next: manual merge of the at91 tree with the arm-soc tree
Date: Wed, 20 May 2015 10:08:51 +1000 [thread overview]
Message-ID: <20150520100851.2e485c02@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1884 bytes --]
Hi Nicolas,
Today's linux-next merge of the at91 tree got a conflict in
arch/arm/configs/multi_v7_defconfig between commit 7b57472fb6cb ("ARM:
multi_v7_defconfig: enable asm and NEON accelerated crypto modules")
from the arm-soc tree and commit 822cfdfb9511 ("ARM:
multi_v7_defconfig: Add Atmel SAMA5 family") from the at91 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/arm/configs/multi_v7_defconfig
index 492f6289a29e,cf56d4072a90..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -272,9 -278,9 +283,10 @@@ CONFIG_I2C_DAVINCI=
CONFIG_I2C_MUX=y
CONFIG_I2C_MUX_PCA954x=y
CONFIG_I2C_MUX_PINCTRL=y
+ CONFIG_I2C_AT91=m
CONFIG_I2C_CADENCE=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_DIGICOLOR=m
CONFIG_I2C_GPIO=m
CONFIG_I2C_EXYNOS5=y
CONFIG_I2C_MV64XXX=y
@@@ -514,8 -523,9 +530,10 @@@ CONFIG_RTC_DRV_TPS6586X=
CONFIG_RTC_DRV_TPS65910=y
CONFIG_RTC_DRV_S35390A=m
CONFIG_RTC_DRV_EM3027=y
+CONFIG_RTC_DRV_DIGICOLOR=m
CONFIG_RTC_DRV_PL031=y
+ CONFIG_RTC_DRV_AT91RM9200=m
+ CONFIG_RTC_DRV_AT91SAM9=m
CONFIG_RTC_DRV_VT8500=y
CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_SUNXI=y
@@@ -599,14 -613,6 +622,17 @@@ CONFIG_LOCKUP_DETECTOR=
CONFIG_CRYPTO_DEV_TEGRA_AES=y
CONFIG_CPUFREQ_DT=y
CONFIG_KEYSTONE_IRQ=y
+CONFIG_ARM_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_SHA1_ARM_NEON=m
+CONFIG_CRYPTO_SHA1_ARM_CE=m
+CONFIG_CRYPTO_SHA2_ARM_CE=m
+CONFIG_CRYPTO_SHA256_ARM=m
+CONFIG_CRYPTO_SHA512_ARM=m
+CONFIG_CRYPTO_AES_ARM=m
+CONFIG_CRYPTO_AES_ARM_BS=m
+CONFIG_CRYPTO_AES_ARM_CE=m
+CONFIG_CRYPTO_GHASH_ARM_CE=m
+ CONFIG_CRYPTO_DEV_ATMEL_AES=m
+ CONFIG_CRYPTO_DEV_ATMEL_TDES=m
+ CONFIG_CRYPTO_DEV_ATMEL_SHA=m
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-05-20 0:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-20 0:08 Stephen Rothwell [this message]
2015-05-20 7:41 ` linux-next: manual merge of the at91 tree with the arm-soc tree Nicolas Ferre
-- strict thread matches above, loose matches on Subject: below --
2017-06-04 23:48 Stephen Rothwell
2017-04-19 22:38 Stephen Rothwell
2017-04-20 14:50 ` Nicolas.Ferre
2015-07-30 22:38 Stephen Rothwell
2015-07-31 7:09 ` Nicolas Ferre
2011-11-24 1:16 Stephen Rothwell
2011-11-24 9:56 ` Jamie Iles
2011-11-24 10:47 ` Nicolas Ferre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150520100851.2e485c02@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alexandre.belloni@free-electrons.com \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).