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: Thu, 22 Sep 2011 16:45:13 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jiri Kosina <jkosina@...e.cz>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Nicolas Pitre <nicolas.pitre@...aro.org>,
Arnd Bergmann <arnd@...db.de>,
"Justin P. Mattock" <justinmattock@...il.com>
Subject: linux-next: manual merge of the trivial tree with the arm-soc tree
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-nuc93x/time.c between commit 6adc1e7ff19d ("ARM:
mach-nuc93x: delete") from the arm-soc tree and commit 699324871fcc
("treewide: remove extra semicolons from various parts of the kernel")
from the trivial tree.
The former removed the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists