| 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: <20110809125623.e25f685fd20c787fcf58fcfc@canb.auug.org.au>
Date: Tue, 9 Aug 2011 12:56:23 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Paul Gortmaker <paul.gortmaker@...driver.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Vinod Koul <vinod.koul@...el.com>
Subject: linux-next: manual merge of the moduleh tree with the slave-dma
tree
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
include/linux/dmaengine.h between commit 90b44f8ffdf6 ("dmaengine: add
helper function for slave_single") from the slave-dma tree and commit
0719989d364d ("linux/dmaengine.h needs bitmap.h and asm/page.h") from the
moduleh tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
Vinod, that slave-dma tree patch should probably remove the bare "struct
scallerlist;" since it now includes scatterlist,h.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc include/linux/dmaengine.h
index 0d738c9,1ceff5a..0000000
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@@ -24,7 -24,8 +24,9 @@@
#include <linux/device.h>
#include <linux/uio.h>
#include <linux/dma-direction.h>
+#include <linux/scatterlist.h>
+ #include <linux/bitmap.h>
+ #include <asm/page.h>
struct scatterlist;
--
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