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
| ||
|
Date: Fri, 11 Jan 2013 15:18:28 +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,
Romain Naour <romain.naour@...nwide.fr>,
Stephen Warren <swarren@...dia.com>
Subject: linux-next: manual merge of the samsung tree with the arm-soc tree
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/plat-samsung/time.c between various commits from the arm-soc
tree and commit 0e4a0a6e970e ("ARM: SAMSUNG: Remove unused
plat-samsung/time.c") from the samsung tree.
The latter removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists