Failed in applying to current master (
apply log)
xen/common/efi/runtime.c | 2 +-
xen/common/rangeset.c | 6 +++---
xen/common/spinlock.c | 8 ++++----
xen/common/stop_machine.c | 4 ++--
xen/common/tasklet.c | 5 +++--
xen/common/timer.c | 4 ++--
xen/include/xen/rangeset.h | 4 ++--
xen/include/xen/serial.h | 30 +++++++++++++++---------------
xen/include/xen/sort.h | 4 ++--
xen/include/xen/spinlock.h | 2 +-
xen/include/xen/stop_machine.h | 2 +-
xen/include/xen/tasklet.h | 7 ++++---
xen/include/xen/timer.h | 4 ++--
xen/include/xen/vmap.h | 6 +++---
xen/include/xen/xmalloc.h | 2 +-
15 files changed, 46 insertions(+), 44 deletions(-)