From c8550b86f0f18ee1c5f450bdf5ad333716b09d83 Mon Sep 17 00:00:00 2001
From: Nguyen Anh Quynh <aquynh@gmail.com>
Date: Sat, 21 Jan 2017 11:02:17 +0800
Subject: [PATCH] fix conflicts

---
 qemu/include/qemu-common.h | 1 -
 qemu/util/oslib-posix.c    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/qemu/include/qemu-common.h b/qemu/include/qemu-common.h
index 195dccf2..135a48f3 100644
--- a/qemu/include/qemu-common.h
+++ b/qemu/include/qemu-common.h
@@ -36,7 +36,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <assert.h>
-#include <signal.h>
 #include "glib_compat.h"
 
 #ifdef _WIN32
diff --git a/qemu/util/oslib-posix.c b/qemu/util/oslib-posix.c
index 09f337b8..b688ae6b 100644
--- a/qemu/util/oslib-posix.c
+++ b/qemu/util/oslib-posix.c
@@ -40,7 +40,6 @@
 #define HUGETLBFS_MAGIC       0x958458f6
 
 #include "unicorn/platform.h"
-
 #include "config-host.h"
 #include "sysemu/sysemu.h"
 #include <sys/mman.h>