Merge tag 'for-linus-4.10-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull xen fixes and cleanups from Juergen Gross:

 - small fixes for xenbus driver

 - one fix for xen dom0 boot on huge system

 - small cleanups

* tag 'for-linus-4.10-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  Xen: ARM: Zero reserved fields of xatp before making hypervisor call
  xen: events: Replace BUG() with BUG_ON()
  xen: remove stale xs_input_avail() from header
  xen: return xenstore command failures via response instead of rc
  xen: xenbus driver must not accept invalid transaction ids
  xen/evtchn: use rb_entry()
  xen/setup: Don't relocate p2m over existing one

diff --combined drivers/xen/events/events_fifo.c
index c03f9c86c7e37d580032d1553e829a6f14ef2014,71224abdd9f9d94cdf62efa074a5945ac0ffd048..3c41470c7fc4f123b845bc611bb6ea1d48aabc92
--- 1/drivers/xen/events/events_fifo.c
--- 2/drivers/xen/events/events_fifo.c
+++ b/drivers/xen/events/events_fifo.c
@@@ -369,8 -369,7 +369,7 @@@ static void evtchn_fifo_resume(void
                }
  
                ret = init_control_block(cpu, control_block);
-               if (ret < 0)
-                       BUG();
+               BUG_ON(ret < 0);
        }
  
        /*
@@@ -445,7 -444,7 +444,7 @@@ int __init xen_evtchn_fifo_init(void
        evtchn_ops = &evtchn_ops_fifo;
  
        cpuhp_setup_state_nocalls(CPUHP_XEN_EVTCHN_PREPARE,
 -                                "CPUHP_XEN_EVTCHN_PREPARE",
 +                                "xen/evtchn:prepare",
                                  xen_evtchn_cpu_prepare, xen_evtchn_cpu_dead);
  out:
        put_cpu();