From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Oct 2016 02:52:24 +0000 (-0700)
Subject: Merge tag 'for-linus-4.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.9-rc3~40
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=aa34e07e457ed13b44d680b5b605e3e5a585f611

Merge tag 'for-linus-4.9-rc2-tag' of git://git./linux/kernel/git/xen/tip

Pull xen fixes from David Vrabel:

 - advertise control feature flags in xenstore

 - fix x86 build when XEN_PVHVM is disabled

* tag 'for-linus-4.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xenbus: check return value of xenbus_scanf()
  xenbus: prefer list_for_each()
  x86: xen: move cpu_up functions out of ifdef
  xenbus: advertise control feature flags
---

aa34e07e457ed13b44d680b5b605e3e5a585f611