Failed in applying to current master (
apply log)
Config.mk | 2 -
arch/x86/testbuild/all-no | 2 -
arch/x86/testbuild/all-yes | 2 -
arch/x86/testbuild/newxen-yes | 2 -
blkfront.c | 92 ++++++--
console/console.c | 2 +-
console/xenbus.c | 112 +++++++++
console/xencons_ring.c | 6 +-
fbfront.c | 127 ++++++++--
gntmap.c | 2 +-
include/blkfront.h | 5 -
include/console.h | 7 +-
include/lib.h | 29 +--
include/netfront.h | 3 +-
include/tpm_tis.h | 6 -
include/tpmfront.h | 5 -
lib/sys.c | 424 ++++++++--------------------------
lib/xs.c | 65 ++++--
netfront.c | 65 +++++-
tpm_tis.c | 121 ++++++----
tpmfront.c | 100 +++++---
xenbus/xenbus.c | 1 +
22 files changed, 649 insertions(+), 531 deletions(-)