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: Mon, 7 Nov 2011 11:04:03 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Ralf Baechle <ralf@...ux-mips.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Yong Zhang <yong.zhang0@...il.com>,
David Daney <david.daney@...ium.com>
Subject: linux-next: manual merge of the mips tree with Linus' tree
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
arch/mips/kernel/perf_event.c between commit e5dcb58aa510 ("MIPS: perf:
Reorganize contents of perf support files") from Linus' tree and commit
6e8722f887b2 ("MIPS: irq: Remove IRQF_DISABLED") from the mips tree.
The former moved the code that the latter modified and it appeasr to have
been fixed up in its new position. So I just used the version of this
file that is in Linus' tree.
--
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