Merge branch 'stable/for-linus-4.10' of...
Merge branch 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb Pull swiotlb fixes from Konrad Rzeszutek Wilk: "This has one fix to make i915 work when using Xen SWIOTLB, and a feature from Geert to aid in debugging of devices that can't do DMA outside the 32-bit address space. The feature from Geert is on top of v4.10 merge window commit (specifically you pulling my previous branch), as his changes were dependent on the Documentation/ movement patches. I figured it would just easier than me trying than to cherry-pick the Documentation patches to satisfy git. The patches have been soaking since 12/20, albeit I updated the last patch due to linux-next catching an compiler error and adding an Tested-and-Reported-by tag" * 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb: swiotlb: Export swiotlb_max_segment to users swiotlb: Add swiotlb=noforce debug option swiotlb: Convert swiotlb_force from int to enu...
Showing
- Documentation/admin-guide/kernel-parameters.txt 2 additions, 1 deletionDocumentation/admin-guide/kernel-parameters.txt
- arch/arm64/mm/dma-mapping.c 2 additions, 1 deletionarch/arm64/mm/dma-mapping.c
- arch/arm64/mm/init.c 2 additions, 1 deletionarch/arm64/mm/init.c
- arch/x86/kernel/pci-swiotlb.c 2 additions, 4 deletionsarch/x86/kernel/pci-swiotlb.c
- arch/x86/xen/pci-swiotlb-xen.c 1 addition, 1 deletionarch/x86/xen/pci-swiotlb-xen.c
- drivers/gpu/drm/i915/i915_gem.c 1 addition, 10 deletionsdrivers/gpu/drm/i915/i915_gem.c
- drivers/xen/swiotlb-xen.c 6 additions, 2 deletionsdrivers/xen/swiotlb-xen.c
- include/linux/swiotlb.h 10 additions, 1 deletioninclude/linux/swiotlb.h
- include/trace/events/swiotlb.h 10 additions, 7 deletionsinclude/trace/events/swiotlb.h
- lib/swiotlb.c 46 additions, 6 deletionslib/swiotlb.c
Please register or sign in to comment