[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 25/25: Merge branch 'dde-upstream' into dde
From: |
Samuel Thibault |
Subject: |
[hurd] 25/25: Merge branch 'dde-upstream' into dde |
Date: |
Tue, 27 May 2014 08:32:04 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch dde
in repository hurd.
commit 0d80a6004d09880c05602e9b26db94c4b9084495
Merge: deb7a47 7f581f1
Author: Samuel Thibault <address@hidden>
Date: Sun May 25 14:59:41 2014 +0000
Merge branch 'dde-upstream' into dde
Conflicts:
boot-proxy-exc/Makefile
eth-filter.multi-thread/Makefile
eth-filter/Makefile
eth-filter/filter.c
eth-multiplexer/Makefile
eth-multiplexer/device_impl.c
eth-multiplexer/multiplexer.c
eth-multiplexer/notify_impl.c
libmachdev/device.defs
proc_proxy/Makefile
devnode/Makefile | 7 +-
devnode/devnode.c | 36 ++++---
devnode/mig-mutate.h | 25 +++++
libmachdev/Makefile | 6 +-
libmachdev/block.c | 1 +
libmachdev/ds_routines.c | 244 ++++++++++++++-------------------------------
libmachdev/ds_routines.h | 2 +
libmachdev/mig-decls.h | 44 ++++++++
libmachdev/mig-mutate.h | 32 ++++++
libmachdev/net.c | 18 ++--
libmachdev/trivfs_server.c | 34 ++++---
11 files changed, 232 insertions(+), 217 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] 18/25: libmachdev: fix device_open, (continued)
- [hurd] 18/25: libmachdev: fix device_open, Samuel Thibault, 2014/05/27
- [hurd] 12/25: eth-filter: fix argp_program_version, remove argp_program_bug_address, Samuel Thibault, 2014/05/27
- [hurd] 17/25: eth-multiplexer: improve the demuxer function, Samuel Thibault, 2014/05/27
- [hurd] 19/25: libmachdev: remove mach_device_deallocate, Samuel Thibault, 2014/05/27
- [hurd] 20/25: libmachdev: make the two port buckets clearly distinct, Samuel Thibault, 2014/05/27
- [hurd] 21/25: libmachdev: drop unused declarations, Samuel Thibault, 2014/05/27
- [hurd] 14/25: devnode: improve the demuxer function, Samuel Thibault, 2014/05/27
- [hurd] 24/25: Merge remote-tracking branch 'incubator/dde' into dde-upstream, Samuel Thibault, 2014/05/27
- [hurd] 03/25: Drop DIST_FILES from Makefile, Samuel Thibault, 2014/05/27
- [hurd] 22/25: libmachdev: add missing includes, Samuel Thibault, 2014/05/27
- [hurd] 25/25: Merge branch 'dde-upstream' into dde,
Samuel Thibault <=
- [hurd] 23/25: libmachdev: add, fix and use declaration for create_device_port, Samuel Thibault, 2014/05/27
- [hurd] 08/25: libmachdev: fix receiver lookups, Samuel Thibault, 2014/05/27
- [hurd] 05/25: eth-multiplexer: fix receiver lookups, Samuel Thibault, 2014/05/27
- [hurd] 13/25: eth-multiplexer: fix argp_program_version, remove argp_program_bug_address, Samuel Thibault, 2014/05/27
- [hurd] 15/25: libmachdev: improve the demuxer functions, Samuel Thibault, 2014/05/27
- [hurd] 16/25: eth-filter: improve the demuxer function, Samuel Thibault, 2014/05/27
- [hurd] 10/25: devnode: remove the ourdevice hack, Samuel Thibault, 2014/05/27
- [hurd] 04/25: eth-filter: fix receiver lookups, Samuel Thibault, 2014/05/27
- [hurd] 01/25: libports: fix notify_port_t receiver lookups, Samuel Thibault, 2014/05/27