linux-kernel - Re: linux-next: manual merge of the crypto tree with the arm-soc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20140226215802.GA28350@gondor.apana.org.au>
Date:	Thu, 27 Feb 2014 05:58:03 +0800
From:	Herbert Xu <herbert@...dor.apana.org.au>
To:	Kumar Gala <galak@...eaurora.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the crypto tree with the arm-soc tree

On Wed, Feb 26, 2014 at 01:15:06PM -0600, Kumar Gala wrote:
> 
> On Feb 25, 2014, at 10:01 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> > Hi Herbert,
> > 
> > Today's linux-next merge of the crypto tree got a conflict in
> > drivers/char/hw_random/Kconfig between commit 2257ffbca73c ("hwrng: msm:
> > switch Kconfig to ARCH_QCOM depends") from the arm-soc tree and commit
> > f9bee046c915 ("hwrng: msm: switch Kconfig to ARCH_QCOM depends") from the
> > crypto tree.
> > 
> > Two version of the same patch ... I just kept the arm-soc version.
> 
> Herbert,
> 
> Was trying to keep all the ARCH_QCOM Kconfig updates together and via arm-soc.git

OK I have reverted this patch from cryptodev.

Thanks,
-- 
Email: Herbert Xu <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/