From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Jan 2017 20:17:07 +0000 (-0800)
Subject: Merge branch 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.10-rc6~14
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=2b4321503e62523e701405163a034875e92d68cf;hp=-c

Merge branch 'stable/for-linus-4.10' of git://git./linux/kernel/git/konrad/swiotlb

Pull swiotlb fix from Konrad Rzeszutek Wilk:
 "An ARM fix in the Xen SWIOTLB - mainly the translation of physical to
  bus addresses was done just a tad too late"

* 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb-xen: update dev_addr after swapping pages
---

2b4321503e62523e701405163a034875e92d68cf