Skip to contentSkip to conversation

(swiotlb) stable/for-linus-4.9 for 4.10 merge window

GIT PULL Konrad Rzeszutek Wilk 1 participant 1 message Dec 12, 2016

lore
Share & tools
lore
#0 lore raw

Hey Linus!

Please git pull the following branch:

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git stable/for-linus-4.9

which has:
- Minor fixes (rate limiting), remove certain functions.
- Support for DMA_ATTR_SKIP_CPU_SYNC which is an optimization in the DMA API

That is it!

Regarding the name of the branch - I was initially thinking to send it to you for rc4 (in 4.9 time frame) but figured it may be just simpler to do it during merge window.

 arch/arm/xen/mm.c              |  1 -
 arch/x86/xen/pci-swiotlb-xen.c |  1 -
 drivers/xen/swiotlb-xen.c      | 27 +++++++-------
 include/linux/swiotlb.h        | 14 +++-----
 include/xen/swiotlb-xen.h      |  3 --
 lib/swiotlb.c                  | 81 +++++++++++++++++++++---------------------
 6 files changed, 57 insertions(+), 70 deletions(-)

Alexander Duyck (4):
swiotlb: Drop unused functions swiotlb_map_sg and swiotlb_unmap_sg
swiotlb-xen: Enforce return of DMA_ERROR_CODE in mapping function
swiotlb: Add support for DMA_ATTR_SKIP_CPU_SYNC
swiotlb: Minor fix-ups for DMA_ATTR_SKIP_CPU_SYNC support

Geert Uytterhoeven (1):
swiotlb: Rate-limit printing when running out of SW-IOMMU space