From: Will Deacon <will.deacon@arm•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Herbert Xu <herbert@gondor•hengli.com.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Russell King <rmk@arm•linux.org.uk>,
Dmitry Kasatkin <dmitry.kasatkin@nokia•com>
Subject: Re: linux-next: manual merge of the crypto tree with the arm tree
Date: Tue, 04 May 2010 10:13:12 +0100 [thread overview]
Message-ID: <1272964392.8533.1.camel@e102144-lin.cambridge.arm.com> (raw)
In-Reply-To: <20100504125355.810e6f54.sfr@canb.auug.org.au>
Hi Stephen,
On Tue, 2010-05-04 at 03:53 +0100, Stephen Rothwell wrote:
> Today's linux-next merge of the crypto tree got a conflict in
> arch/arm/mach-omap2/devices.c between commit
> 883413341e479d4e9f9c69def4884b4c6e1cef4e ("ARM: 6046/1: ARM: OMAP:
> register PMU IRQs during board initialisation") from the arm tree and
> commit ee5500c45c4860a84bba502c6d9ef5af6395dad6 ("crypto: omap - Updates
> omap sham device related platform code") from the crypto tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks for fixing this. Looks fine to me.
Will
next prev parent reply other threads:[~2010-05-04 9:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-04 2:53 linux-next: manual merge of the crypto tree with the arm tree Stephen Rothwell
2010-05-04 7:24 ` Dmitry Kasatkin
2010-05-04 13:03 ` Herbert Xu
2010-05-04 21:24 ` Stephen Rothwell
2010-05-04 9:13 ` Will Deacon [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-05-16 5:14 Stephen Rothwell
2012-05-16 7:26 ` Linus Walleij
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=1272964392.8533.1.camel@e102144-lin.cambridge.arm.com \
--to=will.deacon@arm$(echo .)com \
--cc=dmitry.kasatkin@nokia$(echo .)com \
--cc=herbert@gondor$(echo .)hengli.com.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--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