From: Jens Axboe <axboe@fb.com>
Date: Fri, 27 Jan 2017 18:56:06 +0000 (-0700)
Subject: Merge branch 'stable/for-jens-4.10' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c14024dbb156c8392908aaa822097d27c6af8ec8;p=linux-beck.git

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

Konrad writes:

Please pull in your 'for-linus' branch two little fixes for Xen
block front:

One fix is for handling the XEN_PAGE_SIZE != PAGE_SIZE (4KB vs 64KB
on ARM for example) mishandling while the other is fixing
the accounting for the configuration changes.
---

c14024dbb156c8392908aaa822097d27c6af8ec8