| commit | c14024dbb156c8392908aaa822097d27c6af8ec8 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@fb.com> | Fri Jan 27 11:56:06 2017 -0700 |
| committer | Jens Axboe <axboe@fb.com> | Fri Jan 27 11:56:06 2017 -0700 |
| tree | 02f6ffa664b16bd76750c05f62708a518de2acdc | |
| parent | 08965c2eba135bdfb6e86cf25308e01421c7e0ce [diff] | |
| parent | 3b4f18843e511193e7eb616710e838f5852e661d [diff] |
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.