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,
Henning Heinold <heinold@inf.fu-berlin.de>,
Varun Wadekar <vwadekar@nvidia.com>,
Olof Johansson <olof@lixom.net>,
Stephen Warren <swarren@nvidia.com>,
Colin Cross <ccross@android.com>
Subject: Re: linux-next: manual merge of the crypto tree with the tegra tree
Date: Mon, 23 Jan 2012 13:03:12 +1100 [thread overview]
Message-ID: <20120123020312.GA31912@gondor.apana.org.au> (raw)
In-Reply-To: <20120123120933.6d4c9cc7050fce2e9fbc9d3a@canb.auug.org.au>
On Mon, Jan 23, 2012 at 12:09:33PM +1100, Stephen Rothwell wrote:
> Hi Herbert,
>
> Today's linux-next merge of the crypto tree got a conflict in
> arch/arm/mach-tegra/fuse.c between commit b2609c7c7237 ("ARM: tegra:
> fuse: add functions to access chip revision") from the tegra tree and
> commit e87e06cd8cc0 ("arm: tegra: export tegra_chip_uid") from the crypto
> tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks!
> By the way, adding the EXPORT_SYMBOL() really now only needs export.h not
> module.h (assuming that the crypto tree has a recent enough base).
OK noted.
Cheers,
--
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-01-23 2:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-23 1:09 linux-next: manual merge of the crypto tree with the tegra tree Stephen Rothwell
2012-01-23 2:03 ` Herbert Xu [this message]
2012-01-23 4:24 ` Olof Johansson
2012-01-23 5:05 ` Stephen Rothwell
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=20120123020312.GA31912@gondor.apana.org.au \
--to=herbert@gondor.apana.org.au \
--cc=ccross@android.com \
--cc=heinold@inf.fu-berlin.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=swarren@nvidia.com \
--cc=vwadekar@nvidia.com \
/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