Remove a remaining conflict.

diff --git a/master/xen-unstable-netchannel2 b/master/xen-unstable-netchannel2
index 877bed6aa1319fa95937d92d28379def4e1d301d..f37a9c6d10a2939efcc3c0be353eab06b625cc81 100644 (file)
--- a/master/xen-unstable-netchannel2
+++ b/master/xen-unstable-netchannel2
@@ -2,6 +2,19 @@
     Backport netchannel 2 support from xen-unstable
     20284,20283,20282,20281,20280,20278,20277.
 
+diff --git a/Config.mk b/Config.mk
+index 37392b7..5ecf067 100644
+--- a/Config.mk
++++ b/Config.mk
+@@ -1,7 +1,7 @@
+ # -*- mode: Makefile; -*-
+ 
+ # A debug build of Xen and tools?
+-debug ?= n
++debug ?= y
+ 
+ XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/ \
+                          -e s/i86pc/x86_32/ -e s/amd64/x86_64/)
 diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
 index bdd1cc0..bc50e65 100644
 --- a/tools/hotplug/Linux/Makefile
@@ -1079,7 +1092,7 @@ index 4b74189..4edb5ad 100644
                      for dev_num, dev_info in sxprs:
 diff --git a/tools/python/xen/xend/server/netif2.py b/tools/python/xen/xend/server/netif2.py
 new file mode 100644
-index 0000000..a098c13
+index 0000000..6dd528b
 --- /dev/null
 +++ b/tools/python/xen/xend/server/netif2.py
 @@ -0,0 +1,163 @@
@@ -1292,7 +1305,7 @@ index 78601fe..b07590c 100644
  def configure_hvm(config_image, vals):
      """Create the config for HVM devices.
 diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
-index a460bc8..a1779f7 100644
+index a460bc8..e600e1f 100644
 --- a/tools/python/xen/xm/main.py
 +++ b/tools/python/xen/xm/main.py
 @@ -180,6 +180,15 @@ SUBCOMMAND_HELP = {
@@ -1368,7 +1381,7 @@ index a460bc8..a1779f7 100644
      "network-new": xm_network_new,
      "network-del": xm_network_del,
 diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
-index 42652ca..1c7bbb8 100644
+index 42652ca..6f76fbc 100644
 --- a/xen/arch/x86/hvm/hvm.c
 +++ b/xen/arch/x86/hvm/hvm.c
 @@ -1926,10 +1926,26 @@ enum hvm_intblk hvm_interrupt_blocked(struct vcpu *v, struct hvm_intack intack)
@@ -1399,12 +1412,10 @@ index 42652ca..1c7bbb8 100644
          return -ENOSYS; /* all other commands need auditing */
      return do_grant_table_op(cmd, uop, count);
  }
-@@ -1981,6 +1997,18 @@ static hvm_hypercall_t *hvm_hypercall32_table[NR_hypercalls] = {
+@@ -1981,6 +1997,15 @@ static hvm_hypercall_t *hvm_hypercall32_table[NR_hypercalls] = {
  
  #else /* defined(__x86_64__) */
  
-+<<<<<<< HEAD
-+=======
 +static long hvm_grant_table_op_compat32(unsigned int cmd,
 +                                        XEN_GUEST_HANDLE(void) uop,
 +                                        unsigned int count)
@@ -1414,7 +1425,6 @@ index 42652ca..1c7bbb8 100644
 +    return compat_grant_table_op(cmd, uop, count);
 +}
 +
-+>>>>>>> 5dfa1be... Introduce a grant_entry_v2 structure.
  static long hvm_memory_op_compat32(int cmd, XEN_GUEST_HANDLE(void) arg)
  {
      long rc = compat_memory_op(cmd, arg);
@@ -1585,7 +1595,7 @@ index 5f0dc2d..cd4f1cd 100644
              domain_crash(current->domain);
              break;
 diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
-index 5306354..40fc183 100644
+index 5306354..28c2de7 100644
 --- a/xen/common/grant_table.c
 +++ b/xen/common/grant_table.c
 @@ -104,9 +104,24 @@ static unsigned inline int max_nr_maptrack_frames(void)