From: Herbert Xu <herbert@gondor•apana.org.au>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Linus Walleij <linus.walleij@linaro•org>,
Andreas Westin <andreas.westin@stericsson•com>,
Lee Jones <lee.jones@linaro•org>, Arnd Bergmann <arnd@arndb•de>
Subject: Re: linux-next: manual merge of the crypto tree with Linus' tree
Date: Mon, 7 May 2012 14:20:17 +1000 [thread overview]
Message-ID: <20120507042017.GC25039@gondor.apana.org.au> (raw)
In-Reply-To: <20120507123100.09a614d4f4eb1bfc14e64351@canb.auug.org.au>
On Mon, May 07, 2012 at 12:31:00PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
>
> Today's linux-next merge of the crypto tree got a conflict in
> arch/arm/mach-ux500/devices-common.c between commit 3510ec672319 ("ARM:
> ux500: remove intermediary add_platform_device* functions") from Linus'
> tree and commit 3ba812f4d0be ("mach-ux500: crypto - core support for
> CRYP/HASH module") from the crypto tree.
>
> I can't easily resolve this, sorry. This crypto patch needs to be
> revised on top of v3.4-rc1.
>
> I have use the crypto tree from next-20120504 for today.
OK I'll fix it up. Thanks,
--
Email: Herbert Xu <herbert@gondor•apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
next prev parent reply other threads:[~2012-05-07 4:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-07 2:31 linux-next: manual merge of the crypto tree with Linus' tree Stephen Rothwell
2012-05-07 4:20 ` Herbert Xu [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 1:52 Stephen Rothwell
2021-06-15 1:39 Stephen Rothwell
2020-09-21 2:36 Stephen Rothwell
2020-05-11 3:23 Stephen Rothwell
2019-11-05 2:23 Stephen Rothwell
2019-08-23 3:08 Stephen Rothwell
2019-08-23 3:25 ` Nick Desaulniers
2019-06-11 2:07 Stephen Rothwell
2019-06-03 0:52 Stephen Rothwell
2014-05-09 2:07 Stephen Rothwell
2014-05-09 12:51 ` Herbert Xu
2014-04-17 2:57 Stephen Rothwell
2014-04-17 2:49 Stephen Rothwell
2012-05-07 2:11 Stephen Rothwell
2012-05-07 4:16 ` Herbert Xu
2012-05-07 8:09 ` Arnd Bergmann
2012-05-07 9:04 ` Herbert Xu
2012-05-07 11:02 ` Linus Walleij
2010-04-14 1:48 Stephen Rothwell
2010-04-14 3:14 ` Herbert Xu
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=20120507042017.GC25039@gondor.apana.org.au \
--to=herbert@gondor$(echo .)apana.org.au \
--cc=andreas.westin@stericsson$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=lee.jones@linaro$(echo .)org \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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