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/xenbus.c | 125 ++++++++++
console/xencons_ring.c | 6 +-
fbfront.c | 125 ++++++++--
gntmap.c | 2 +-
include/blkfront.h | 5 -
include/console.h | 5 +
include/lib.h | 27 +--
include/tpm_tis.h | 6 -
include/tpmfront.h | 5 -
lib/sys.c | 429 ++++++++--------------------------
lib/xs.c | 64 +++--
netfront.c | 64 ++++-
tpm_tis.c | 120 ++++++----
tpmfront.c | 100 +++++---
xenbus/xenbus.c | 1 +
20 files changed, 664 insertions(+), 520 deletions(-)