Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+3
+3
include/linux/swiotlb.h
··· 1 1 #ifndef __LINUX_SWIOTLB_H 2 2 #define __LINUX_SWIOTLB_H 3 3 4 + #include <linux/dma-direction.h> 5 + #include <linux/init.h> 4 6 #include <linux/types.h> 5 7 6 8 struct device; 7 9 struct dma_attrs; 10 + struct page; 8 11 struct scatterlist; 9 12 10 13 extern int swiotlb_force;