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
| ||
|
Message-Id: <20130117145324.3f1f27fb5902b5a03135bf06@canb.auug.org.au>
Date: Thu, 17 Jan 2013 14:53:24 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Kukjin Kim <kgene.kim@...sung.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Stephen Warren <swarren@...dia.com>,
Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
<linux-arm-kernel@...ts.infradead.org>
Subject: Re: linux-next: manual merge of the samsung tree with the arm-soc
tree
Hi Kukjin,
On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the samsung tree got conflicts in
> many files with the arm-soc tree.
>
> I just dropped the samsung tree for today. Please have a look and try to
> fix this mess up, thanks.
Ping?
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists