| 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: <20101015115251.015b08d5.sfr@canb.auug.org.au>
Date: Fri, 15 Oct 2010 11:52:51 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Mark Brown <broonie@...nsource.wolfsonmicro.com>,
Liam Girdwood <lrg@...mlogic.co.uk>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Timur Tabi <timur@...escale.com>,
Kumar Gala <galak@...nel.crashing.org>
Subject: linux-next: manual merge of the sound-asoc tree with Linus' tree
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
arch/powerpc/platforms/85xx/p1022_ds.c between commit
dc1c41f450a5f201f1d8c19aef32319f3b84c273 ("powerpc/85xx: Fix compile
issue with p1022_ds due to lmb rename to memblock") from Linus' tree and
commit 2c184cd393d1410bb43ac656a6480849fe886b1d ("powerpc/85xx: add DIU
support to the Freecale P1022DS reference board") from the sound-asoc
tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc arch/powerpc/platforms/85xx/p1022_ds.c
index 2b390d1,e984d4e..0000000
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@@ -19,8 -18,9 +18,9 @@@
#include <linux/pci.h>
#include <linux/of_platform.h>
-#include <linux/lmb.h>
#include <linux/memblock.h>
+
+ #include <asm/div64.h>
#include <asm/mpic.h>
#include <asm/swiotlb.h>
--
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/
Powered by blists - more mailing lists