[gnumach] 02/02: Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository gnumach.

commit 614b3e7e201d73fc8ab64ce8926811d60e8eb947
Merge: fcc6185 eff7ef8
Author: Samuel Thibault <address@hidden>
Date:   Fri Jul 25 17:34:51 2014 +0000

    Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach
    
    Conflicts:
        debian/changelog
        debian/patches/series

 debian/changelog                                                     | 3 ++-
 debian/patches/{git-xen-memory-clobber.patch => git-xen_races.patch} | 0
 debian/patches/series                                                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 790fdc9,ed2fce6..fdcca95
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,10 @@@
 -gnumach (2:1.4-11) UNRELEASED; urgency=medium
 +gnumach (2:1.4-11) unstable; urgency=medium
  
 +  * patches/git-halt.patch: Add ACPI powerdown support.
-   * patches/git-xen-memory-clobber.patch: Add missing memory clobbers.
+   * patches/git-xen_races.patch: New patch to fix race conditions, notably in
+     disk writes.
  
 - -- Samuel Thibault <address@hidden>  Thu, 29 May 2014 13:27:29 +0200
 + -- Samuel Thibault <address@hidden>  Fri, 25 Jul 2014 17:05:41 +0000
  
  gnumach (2:1.4-10) unstable; urgency=medium
  
diff --cc debian/patches/series
index c8fa6d0,d59ca6c..af4cf3f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -20,5 -20,4 +20,5 @@@ git-device_translatable.patc
  git-device_translatable2.patch
  git-mach_debug.patch
  git-mach_debug2.patch
 +git-halt.patch
- git-xen-memory-clobber.patch
+ git-xen_races.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/gnumach.git