From: Michael Neuling <mikey@neuling.org>
To: Seth Jennings <sjenning@linux.vnet.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
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, Herbert Xu <herbert@gondor.apana.org.au>
Subject: Re: CRYPTO_DEV_NX merge problem (Re: linux-next: Tree for July 31)
Date: Wed, 01 Aug 2012 08:00:18 +1000 [thread overview]
Message-ID: <19970.1343772018@neuling.org> (raw)
In-Reply-To: <5017DE06.3000103@linux.vnet.ibm.com>
Seth Jennings <sjenning@linux.vnet.ibm.com> wrote:
> On 07/31/2012 12:58 AM, Michael Neuling wrote:
> >> 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?
>
> My patch converted CRYPTO_DEV_NX to a submenu access config
> and the functionality that used to be enabled by it is now
> enabled by CRYPTO_DEV_NX_ENCRYPT.
>
> The resolution is to change Anton's patch from
>
> +CONFIG_CRYPTO_DEV_NX=m
>
> to
>
> +CONFIG_CRYPTO_DEV_NX=y
> +CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
Seth,
OK. Please post the fix as a patch. Anton's patch is already in the
powerpc next tree so it won't be changed/rebased directly.
I'm not sure who can carry this, since the crypto tree doesn't have
Anton's change and the powerpc tree doesn't have Seth's change.
sfr: who normally carries it when we have a merge issue like this? You?
Mikey
next prev parent reply other threads:[~2012-07-31 22:00 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 ` CRYPTO_DEV_NX merge problem (Re: linux-next: Tree for July 31) Michael Neuling
2012-07-31 13:30 ` Seth Jennings
2012-07-31 22:00 ` Michael Neuling [this message]
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=19970.1343772018@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).