diff -Nru xen-4.6.0/debian/changelog xen-4.6.0/debian/changelog
--- xen-4.6.0/debian/changelog	2015-11-01 20:52:20.000000000 +0000
+++ xen-4.6.0/debian/changelog	2015-11-28 13:06:38.000000000 +0000
@@ -1,3 +1,13 @@
+xen (4.6.0-1+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 4.4.1-9+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Aug 2015 15:43:16 +0000]
+  * replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6
+  
+  [changes introduced in 4.6.0-1+rpi1 by Peter Michael Green]
+  * Use kernel 3.18 for now as I haven't dealt with 4.2 yet.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 28 Nov 2015 12:02:15 +0000
+
 xen (4.6.0-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru xen-4.6.0/debian/control.md5sum xen-4.6.0/debian/control.md5sum
--- xen-4.6.0/debian/control.md5sum	2015-11-01 20:50:00.000000000 +0000
+++ xen-4.6.0/debian/control.md5sum	2015-11-28 13:06:43.000000000 +0000
@@ -1,4 +1,4 @@
-f9c4be5a03ea0905f2a01d479c8206f2  debian/changelog
+436e87760caac2f93b3b082e2988ec90  debian/changelog
 dc7b5d9f0538e3180af4e9aff9b0bd57  debian/bin/gencontrol.py
 e8f2113c78600fc17eeae209c9fad062  debian/templates/control.main.in
 a15fa64ce6deead28d33c1581b14dba7  debian/templates/xen-hypervisor.postinst.in
diff -Nru xen-4.6.0/debian/patches/armv6.diff xen-4.6.0/debian/patches/armv6.diff
--- xen-4.6.0/debian/patches/armv6.diff	1970-01-01 00:00:00.000000000 +0000
+++ xen-4.6.0/debian/patches/armv6.diff	2015-11-28 13:01:32.000000000 +0000
@@ -0,0 +1,20 @@
+Description:  replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+Index: xen-4.6.0/tools/libxc/include/xenctrl.h
+===================================================================
+--- xen-4.6.0.orig/tools/libxc/include/xenctrl.h
++++ xen-4.6.0/tools/libxc/include/xenctrl.h
+@@ -78,9 +78,9 @@
+ #define xen_rmb() xen_barrier()
+ #define xen_wmb() xen_barrier()
+ #elif defined(__arm__)
+-#define xen_mb()   asm volatile ("dmb" : : : "memory")
+-#define xen_rmb()  asm volatile ("dmb" : : : "memory")
+-#define xen_wmb()  asm volatile ("dmb" : : : "memory")
++#define xen_mb()   asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory")
++#define xen_rmb()  asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory")
++#define xen_wmb()  asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory")
+ #elif defined(__aarch64__)
+ #define xen_mb()   asm volatile ("dmb sy" : : : "memory")
+ #define xen_rmb()  asm volatile ("dmb sy" : : : "memory")
diff -Nru xen-4.6.0/debian/patches/series xen-4.6.0/debian/patches/series
--- xen-4.6.0/debian/patches/series	2015-11-01 20:38:23.000000000 +0000
+++ xen-4.6.0/debian/patches/series	2015-11-28 12:58:47.000000000 +0000
@@ -32,3 +32,4 @@
 CVE-2015-7969.1.diff
 CVE-2015-7971.diff
 CVE-2015-7972.diff
+armv6.diff
diff -Nru xen-4.6.0/debian/rules.defs xen-4.6.0/debian/rules.defs
--- xen-4.6.0/debian/rules.defs	2015-11-01 20:38:20.000000000 +0000
+++ xen-4.6.0/debian/rules.defs	2015-11-28 13:04:50.000000000 +0000
@@ -1,4 +1,4 @@
-KERNELVERSION := 4.2.0-1
+KERNELVERSION := 3.18.0-trunk
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 TEMPLATES_DIR = debian/templates