From: Michael Neuling <mikey@neuling.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Kent Yoder <key@linux.vnet.ibm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
anton@samba.org, Seth Jennings <sjenning@linux.vnet.ibm.com>,
Herbert Xu <herbert@gondor.apana.org.au>
Subject: CRYPTO_DEV_NX merge problem (Re: linux-next: Tree for July 31)
Date: Tue, 31 Jul 2012 15:58:58 +1000 [thread overview]
Message-ID: <31974.1343714338@neuling.org> (raw)
In-Reply-To: <20120731152614.de6ebe9e0d4b8fc6645b793a@canb.auug.org.au>
> Please do not add anything to linux-next included branches/series that is
> destined for v3.7 until after v3.6-rc1 is released.
Looks like there is a merge conflict between:
commit 1b074ac867a2bd08a6f12f0feed7d91e06941723
Author: Seth Jennings <sjenning@linux.vnet.ibm.com>
Subject: powerpc/crypto: rework Kconfig
and
commit fd297b3a7302ab866306f53c1fd1e97b083fe83e
Author: Anton Blanchard <anton@samba.org>
powerpc: Enable pseries hardware RNG and crypto modules
Seth made CRYPTO_DEV_NX a bool and Anton set it as a module.
Hence I get this with a pseries_defconfig
arch/powerpc/configs/pseries_defconfig:372:warning: symbol value 'm' invalid for CRYPTO_DEV_NX
Seth: any reason this can stay as a tristate?
Mikey
next prev parent reply other threads:[~2012-07-31 5:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-31 5:26 linux-next: Tree for July 31 Stephen Rothwell
2012-07-31 5:58 ` Michael Neuling [this message]
2012-07-31 13:30 ` CRYPTO_DEV_NX merge problem (Re: linux-next: Tree for July 31) Seth Jennings
2012-07-31 22:00 ` Michael Neuling
2012-07-31 22:08 ` Michael Neuling
2012-07-31 22:15 ` Benjamin Herrenschmidt
2012-07-31 17:22 ` linux-next: Tree for July 31 (media/radio-tea5777) Randy Dunlap
2012-07-31 19:56 ` Mauro Carvalho Chehab
2012-07-31 20:15 ` Randy Dunlap
2012-08-01 8:22 ` Hans de Goede
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=31974.1343714338@neuling.org \
--to=mikey@neuling.org \
--cc=anton@samba.org \
--cc=benh@kernel.crashing.org \
--cc=herbert@gondor.apana.org.au \
--cc=key@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=sjenning@linux.vnet.ibm.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;
as well as URLs for NNTP newsgroup(s).