[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnumach] 01/03: Merge branch 'master' into master-1.5
|
From: |
Samuel Thibault |
|
Subject: |
[gnumach] 01/03: Merge branch 'master' into master-1.5 |
|
Date: |
Tue, 28 Jul 2015 19:32:08 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository gnumach.
commit b0efac8e56387efa9ab96547a543c4334c72a8c7
Merge: 009d376 fd436a1
Author: Samuel Thibault <address@hidden>
Date: Tue Jul 28 18:47:24 2015 +0000
Merge branch 'master' into master-1.5
Conflicts:
debian/changelog
ChangeLog | 92 +++++++++++++
Makefile.am | 2 +-
Makefile.in | 2 +-
configure | 20 +--
debian/changelog | 14 +-
device/net_io.c | 2 +-
doc/mach.info | 240 ++++++++++++++++-----------------
doc/mach.info-1 | 32 ++---
doc/mach.info-2 | 6 +-
doc/mach.texi | 13 +-
doc/stamp-vti | 8 +-
doc/version.texi | 8 +-
i386/i386at/immc.c | 2 +-
include/mach/mach_host.defs | 2 +-
kern/bootstrap.c | 3 +-
kern/printf.c | 29 +++-
kern/printf.h | 2 +-
kern/queue.h | 31 ++++-
linux/dev/include/asm-i386/string.h | 36 ++---
linux/dev/include/linux/fs.h | 2 +-
linux/src/include/asm-i386/bitops.h | 22 +--
linux/src/include/asm-i386/io.h | 12 +-
linux/src/include/asm-i386/segment.h | 8 ++
linux/src/include/asm-i386/semaphore.h | 6 +-
linux/src/include/linux/string.h | 8 ++
version.m4 | 2 +-
vm/vm_kern.c | 3 +-
vm/vm_map.c | 15 +++
vm/vm_map.h | 1 +
vm/vm_object.c | 10 --
vm/vm_pageout.c | 2 +-
vm/vm_user.c | 27 +++-
32 files changed, 423 insertions(+), 239 deletions(-)
diff --cc debian/changelog
index d188119,e7fed67..5bf1d12
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
- gnumach (2:1.5+git20150704-1) experimental; urgency=medium
++gnumach (2:1.5+git20150711-1) experimental; urgency=medium
+
+ * Bump version number to 1.5 according to upstream release.
+
+ -- Samuel Thibault <address@hidden> Tue, 07 Jul 2015 20:54:04 +0000
+
+ gnumach (2:1.4+git20150711-1) unstable; urgency=medium
+
+ * New upstream snapshot, fixes a pageout issue.
+
+ -- Samuel Thibault <address@hidden> Sat, 11 Jul 2015 12:16:52 +0000
+
+ gnumach (2:1.4+git20150709-1) unstable; urgency=medium
+
+ * New upstream snapshot.
+
+ -- Samuel Thibault <address@hidden> Thu, 09 Jul 2015 12:23:39 +0000
+
gnumach (2:1.4+git20150704-1) unstable; urgency=medium
* New upstream snapshot.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/gnumach.git