linux-kernel - Re: linux-next: manual merge of the samsung tree with the arm-soc and at91 trees

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <555C3BB4.2000802@atmel.com>
Date:	Wed, 20 May 2015 09:45:56 +0200
From:	Nicolas Ferre <nicolas.ferre@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Kukjin Kim <kgene.kim@...sung.com>,
	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>,
	Geert Uytterhoeven <geert+renesas@...der.be>,
	Masahiro Yamada <yamada.masahiro@...ionext.com>,
	Lee Jones <lee.jones@...aro.org>,
	Maxime Coquelin <maxime.coquelin@...com>,
	"Baruch Siach" <baruch@...s.co.il>,
	Krzysztof Kozlowski <k.kozlowski.k@...il.com>,
	Javier Martinez Canillas <javier.martinez@...labora.co.uk>
Subject: Re: linux-next: manual merge of the samsung tree with the arm-soc
 and at91 trees

Le 20/05/2015 02:27, Stephen Rothwell a écrit :
> Hi Kukjin,
> 
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/configs/multi_v7_defconfig between various commits from the
> arm-soc and at91 trees and various commits from the samsung tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

AT91 part seems okay. Thanks,
-- 
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/