linux-kernel - Re: linux-next: manual merge of the at91 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: <555C3AAC.40101@atmel.com>
Date:	Wed, 20 May 2015 09:41:32 +0200
From:	Nicolas Ferre <nicolas.ferre@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	"Alexandre Belloni" <alexandre.belloni@...e-electrons.com>,
	Ard Biesheuvel <ard.biesheuvel@...aro.org>
Subject: Re: linux-next: manual merge of the at91 tree with the arm-soc tree

Le 20/05/2015 02:08, Stephen Rothwell a écrit :
> Hi Nicolas,
> 
> Today's linux-next merge of the at91 tree got a conflict in
> arch/arm/configs/multi_v7_defconfig between commit 7b57472fb6cb ("ARM:
> multi_v7_defconfig: enable asm and NEON accelerated crypto modules")
> from the arm-soc tree and commit 822cfdfb9511 ("ARM:
> multi_v7_defconfig: Add Atmel SAMA5 family") from the at91 tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix seems perfect: thanks Stephen.

Bye,
-- 
Nicolas Ferre
--
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/