Merge tag 'for-linus-4.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Oct 2016 02:52:24 +0000 (19:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Oct 2016 02:52:24 +0000 (19:52 -0700)
commitaa34e07e457ed13b44d680b5b605e3e5a585f611
tree0c46cb911f52cb0f19082bf925758d7f1f4527c7
parent0d7317598214134d73da59990b846481a9527a00
parentc251f15c7dbf2cb72e7b2b282020b41f4e4d3665
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
arch/x86/xen/enlighten.c
drivers/xen/xenbus/xenbus_dev_frontend.c