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]

Date:	Wed, 20 May 2015 11:16:46 +0200
From:	Alexandre Belloni <alexandre.belloni@...e-electrons.com>
To:	Krzysztof Kozlowski <k.kozlowski@...sung.com>
Cc:	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,
	Nicolas Ferre <nicolas.ferre@...el.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	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>,
	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

On 20/05/2015 at 09:35:36 +0900, Krzysztof Kozlowski wrote :
> 2015-05-20 9:27 GMT+09:00 Stephen Rothwell <sfr@...b.auug.org.au>:
> > 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).
> 
> Hi,
> 
> Thanks for the merge.
> 
> The parts coming from samsung-soc related to manually toggling stuff
> (by me and Javier) look fine. The rest (coming from Kukjin's
> savedefconfig) I don't know - too much of them.
> 

Hum, last time I asked, we were not supposed to do a savedefconfig on
multi_v7...

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
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/