From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 3 Oct 2016 13:34:21 +0000 (-0400)
Subject: Merge branch 'uek4/4.7-xen-backport' into topic/uek-4.1/xen
X-Git-Tag: v4.1.12-92~60^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=64a29ce0fb20dd1193bc0599b9fd664fc48c8b0a;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'uek4/4.7-xen-backport' into topic/uek-4.1/xen

* uek4/4.7-xen-backport:
  xenbus: simplify xenbus_dev_request_and_reply()
  xenbus: don't bail early from xenbus_dev_request_and_reply()
  xenbus: don't BUG() on user mode induced condition
  xen-pciback: return proper values during BAR sizing
  x86/xen: avoid m2p lookup when setting early page table entries
  xen/pciback: Fix conf_space read/write overlap check.
  x86/xen: fix upper bound of pmd loop in xen_cleanhighmap()
  xen/balloon: Fix declared-but-not-defined warning
  xen-blkfront: fix resume issues after a migration
  xen-blkfront: don't call talk_to_blkback when already connected to blkback
  xen: use same main loop for counting and remapping pages
  Xen: don't warn about 2-byte wchar_t in efi
  xen/gntdev: reduce copy batch size to 16

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
OraBug: 23585393
---

64a29ce0fb20dd1193bc0599b9fd664fc48c8b0a