Merge

diff --cc SPECS/xen.spec
index e0c0d1365e143f77d66c5d4b737570513577d616,85100ef26ff645fd96b74af0857d764150cff186..2d44d55552b42d51d71972dd5804c588224bfdd2
--- 1/SPECS/xen.spec
--- 2/SPECS/xen.spec
+++ b/SPECS/xen.spec
@@@ -812,12 -739,46 +739,52 @@@ rm -rf %{buildroot
  %endif
  
  %changelog
+ * Thu Mar 13 2015 George Dunlap <george.dunlap@eu.citrix.com> - 4.4.1-9.el6.centos
+  - Fix issue with blktap that left 'zombie' tapdisk processes around
+  - Pass readwrite flag to blktap to make it possible to mount disk images
+    from read-only files.
+ 
+ * Thu Mar 12 2015 George Dunlap <george.dunlap@eu.citrix.com> - 4.4.1-8.el6.centos
+  - Import xsa-119
+ 
+ * Thu Mar  5 2015 George Dunlap <george.dunlap@eu.citrix.com> - 4.4.1-7.el6.centos
+  - Import xsa-123
+ 
+ * Thu Mar  5 2015 George Dunlap <george.dunlap@eu.citrix.com> - 4.4.1-6.el6.centos
+  - Import xsa-121, xsa-122
+ 
+ * Wed Jan  7 2015 George Dunlap <george.dunlap@eu.citrix.com> - 4.4.1-5.el6.centos
+  - Import xsa-116
+ 
+ * Mon Dec 15 2014 George Dunlap <george.dunlap@eu.citrix.com> - 4.4.1-4.el6.centos
+  - Disabled xend by default
+  - Revert 'choose qdisk first' change
+ 
+ * Thu Dec 11 2014 George Dunlap <george.dunlap@eu.citrix.com> - 4.4.1-3.el6.centos
+  - Backported qdisk persistent grant fix
+  - Backported fixes to use tapdisk with HVM guests
+  - Backported XSAs 107,109-114
+  - Backported fixes to migration, cpupools
+  - Remove blktapctl initscripts as it\'s no longer available in 4.4
+  - Removed custom xenconsoled and xenstored initscripts in favor of xencommons
+ 
+ * Wed Oct 22 2014 George Dunlap <george.dunlap@eu.citrix.com> - 4.4.1-2.el6.centos
+  - Updated to blktap 2.5 v0.9.2
+ 
+ * Wed Oct 15 2014 George Dunlap <george.dunlap@eu.citrix.com> - 4.4.1-1.el6.centos
+  - Removed patches which were reflected upstream
+  - Took advantage of --with-system-seabios config option to remove seabios patch
+  - Included polarssl (now required for pvgrub)
+ 
+ * Wed Oct 15 2014 George Dunlap <george.dunlap@eu.citrix.com> - 4.2.5-36.el6.centos
+  - Port system over to git patchqueue.
+ 
 +* Mon Oct 20 2014 Johnny Hughes <johnny@centos.org> - 4.2.5-37.el6.centos
 +- shifted /etc/sysconfig/xen-kernel to centos-xen-release instead of xen
 +
 +* Thu Oct 9 2014 Johnny Hughes <johnny@centos.org> -  4.2.5-36.el6.centos
 +- added /etc/sysconfig/xen-kernel for auto grub install options
 +
  * Wed Oct 8 2014 George Dunlap <george.dunlap@eu.citrix.com> - 4.2.5-35.el6.centos
   - Remove %{ix86} and ia64 build targets to build with the community build system