Commit: ad233aca21509d337c78d32a50d2116cd6943031 - linux_sh (git)

Commit MetaInfo

• Revision: ad233aca21509d337c78d32a50d2116cd6943031 (tree)
• Time: 2016-01-30 08:19:42
• Author: Linus Torvalds <torvalds@linu...>
• Commiter: Linus Torvalds

Log Message

Merge branch 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

Pull swiotlb patchlet from Konrad Rzeszutek Wilk:

"One trivial patch.

Another patch (from Fengguang) is already in your tree courtesy of
Andrew Morton - but I would prefer not to rebase my tree. Hence the
diff is very small"

* 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:

swiotlb: Make linux/swiotlb.h standalone includible
MAINTAINERS: add git URL for swiotlb

Change Summary

• modified: include/linux/swiotlb.h

Incremental Difference

--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -1,10 +1,13 @@
 #ifndef __LINUX_SWIOTLB_H
 #define __LINUX_SWIOTLB_H
 
+#include <linux/dma-direction.h>
+#include <linux/init.h>
 #include <linux/types.h>
 
 struct device;
 struct dma_attrs;
+struct page;
 struct scatterlist;
 
 extern int swiotlb_force;