From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Jan 2017 17:27:50 +0000 (-0800)
Subject: Merge branch 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=203f80f1c4187b2d5b3a282586fa6cc6d9503d4b;p=linux-beck.git

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

Pull swiotlb fix from Konrad Rzeszutek Wilk:
 "A tiny fix to make sure that page-sized mappings are page-aligned (and
  not say straddle two pages). This is important for some drivers (such
  as NVME)"

* 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: ensure that page-sized mappings are page-aligned
---

203f80f1c4187b2d5b3a282586fa6cc6d9503d4b