[hurd] 01/09: Merge branch 'dde-upstream' into dde

[Samuel Thibault]

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

sthibault pushed a commit to branch dde
in repository hurd.

commit e8cb512161dbe0a8e441a563a8200ab823aee3d3
Merge: 122bfb6 c36a3a2
Author: Samuel Thibault <address@hidden>
Date:   Sat Jul 27 20:37:12 2013 +0000

    Merge branch 'dde-upstream' into dde
    
    Conflicts:
        INSTALL
        Makeconf
        Makefile
        NEWS
        aclocal.m4
        auth/Makefile
        auth/auth.c
        boot-proxy-exc/Makefile
        boot-proxy-exc/boot.c
        boot-proxy-exc/mach_impl.c
        boot-proxy-exc/mach_proxy.c
        boot-proxy-exc/ux.c
        boot/Makefile
        boot/boot.c
        boot/mach_proxy.c
        boot/ux.c
        bsdfsck/Makefile
        config.guess
        config.make.in
        config.sub
        config/Makefile
        configure.ac
        console-client/Makefile
        console-client/console.c
        console-client/driver.c
        console-client/driver.h
        console-client/generic-speaker.c
        console-client/kbd-repeat.c
        console-client/ncursesw.c
        console-client/pc-kbd.c
        console-client/pc-mouse.c
        console-client/timer.c
        console-client/trans.c
        console-client/trans.h
        console-client/vga-support.c
        console-client/vga.c
        console/Makefile
        console/console.c
        console/display.c
        console/input.c
        console/pager.c
        console/priv.h
        daemons/console-run.c
        daemons/runsystem.sh
        defpager/backing.c
        doc/Makefile
        doc/gpl.texinfo
        doc/hurd.texi
        eth-filter.multi-thread/Makefile
        eth-filter.multi-thread/filter.c
        eth-filter.multi-thread/msg_queue.c
        eth-filter/Makefile
        eth-filter/filter.c
        eth-multiplexer/Makefile
        eth-multiplexer/multiplexer.c
        eth-multiplexer/netfs_impl.c
        eth-multiplexer/vdev.c
        exec/Makefile
        exec/elfcore.c
        exec/exec.c
        exec/hashexec.c
        exec/priv.h
        ext2fs/Makefile
        ext2fs/balloc.c
        ext2fs/bitmap.c
        ext2fs/dir.c
        ext2fs/ext2fs.c
        ext2fs/ext2fs.h
        ext2fs/ialloc.c
        ext2fs/inode.c
        ext2fs/msg.c
        ext2fs/pager.c
        ext2fs/pokel.c
        ext2fs/storeinfo.c
        ext2fs/truncate.c
        fatfs/Makefile
        fatfs/dir.c
        fatfs/fat.c
        fatfs/fatfs.h
        fatfs/inode.c
        fatfs/main.c
        fatfs/pager.c
        fatfs/virt-inode.c
        ftpfs/Makefile
        ftpfs/ccache.c
        ftpfs/ccache.h
        ftpfs/conn.c
        ftpfs/dir.c
        ftpfs/fs.c
        ftpfs/ftpfs.c
        ftpfs/ftpfs.h
        ftpfs/ncache.c
        ftpfs/netfs.c
        ftpfs/node.c
        hostmux/Makefile
        hostmux/hostmux-xinl.c
        hostmux/hostmux.c
        hostmux/hostmux.h
        hostmux/mux.c
        hostmux/node.c
        hostmux/stubs.c
        hurd.boot
        hurd/Makefile
        hurd/hurd_types.defs
        hurd/hurd_types.h
        hurd/io.defs
        hurd/io_reply.defs
        hurd/io_request.defs
        hurd/shared.h
        include/Makefile
        init/init.c
        isofs/Makefile
        isofs/inode.c
        isofs/lookup.c
        isofs/main.c
        isofs/pager.c
        libcons/Makefile
        libcons/cons-switch.c
        libcons/cons.h
        libcons/dir-changed.c
        libcons/file-changed.c
        libcons/init-init.c
        libcons/vcons-close.c
        libcons/vcons-input.c
        libcons/vcons-move-mouse.c
        libcons/vcons-open.c
        libcons/vcons-scrollback.c
        libdirmgt/Makefile
        libdiskfs/Makefile
        libdiskfs/boot-start.c
        libdiskfs/dead-name.c
        libdiskfs/dir-chg.c
        libdiskfs/dir-init.c
        libdiskfs/dir-link.c
        libdiskfs/dir-lookup.c
        libdiskfs/dir-mkdir.c
        libdiskfs/dir-mkfile.c
        libdiskfs/dir-readdir.c
        libdiskfs/dir-rename.c
        libdiskfs/dir-renamed.c
        libdiskfs/dir-rmdir.c
        libdiskfs/dir-unlink.c
        libdiskfs/disk-pager.c
        libdiskfs/diskfs-pager.h
        libdiskfs/diskfs.h
        libdiskfs/extern-inline.c
        libdiskfs/file-access.c
        libdiskfs/file-chg.c
        libdiskfs/file-exec.c
        libdiskfs/file-get-fs-opts.c
        libdiskfs/file-get-trans.c
        libdiskfs/file-get-transcntl.c
        libdiskfs/file-getcontrol.c
        libdiskfs/file-getfh.c
        libdiskfs/file-lock-stat.c
        libdiskfs/file-lock.c
        libdiskfs/file-reparent.c
        libdiskfs/file-set-trans.c
        libdiskfs/file-sync.c
        libdiskfs/file-syncfs.c
        libdiskfs/fsys-getroot.c
        libdiskfs/fsys-options.c
        libdiskfs/fsys-syncfs.c
        libdiskfs/ifsock.c
        libdiskfs/init-first.c
        libdiskfs/init-init.c
        libdiskfs/init-startup.c
        libdiskfs/io-duplicate.c
        libdiskfs/io-get-conch.c
        libdiskfs/io-identity.c
        libdiskfs/io-map-cntl.c
        libdiskfs/io-map.c
        libdiskfs/io-modes-get.c
        libdiskfs/io-modes-off.c
        libdiskfs/io-modes-on.c
        libdiskfs/io-modes-set.c
        libdiskfs/io-owner-get.c
        libdiskfs/io-owner-mod.c
        libdiskfs/io-prenotify.c
        libdiskfs/io-read.c
        libdiskfs/io-readable.c
        libdiskfs/io-reauthenticate.c
        libdiskfs/io-rel-conch.c
        libdiskfs/io-restrict-auth.c
        libdiskfs/io-revoke.c
        libdiskfs/io-seek.c
        libdiskfs/io-select.c
        libdiskfs/io-sigio.c
        libdiskfs/io-stat.c
        libdiskfs/io-write.c
        libdiskfs/lookup.c
        libdiskfs/name-cache.c
        libdiskfs/node-create.c
        libdiskfs/node-drop.c
        libdiskfs/node-make.c
        libdiskfs/node-nput.c
        libdiskfs/node-nputl.c
        libdiskfs/node-nref.c
        libdiskfs/node-nrefl.c
        libdiskfs/node-nrele.c
        libdiskfs/node-nrelel.c
        libdiskfs/peropen-rele.c
        libdiskfs/priv.h
        libdiskfs/shutdown.c
        libdiskfs/sync-interval.c
        libfshelp/Makefile
        libfshelp/fetch-root.c
        libfshelp/fshelp.h
        libfshelp/get-identity.c
        libfshelp/lock-acquire.c
        libfshelp/lock-init.c
        libfshelp/locks.h
        libfshelp/set-active.c
        libfshelp/start-translator-long.c
        libfshelp/trans.h
        libfshelp/transbox-init.c
        libftpconn/Makefile
        libftpconn/ftpconn.h
        libftpconn/priv.h
        libftpconn/xinl.c
        libihash/Makefile
        libihash/ihash.c
        libiohelp/Makefile
        libiohelp/get_conch.c
        libiohelp/handle_io_release_conch.c
        libiohelp/initialize_conch.c
        libiohelp/iohelp.h
        libiohelp/iouser-dup.c
        libiohelp/iouser-free.c
        libiohelp/iouser-reauth.c
        libiohelp/iouser-restrict.c
        libiohelp/return-buffer.c
        libiohelp/shared.c
        libiohelp/verify_user_conch.c
        libnetfs/Makefile
        libnetfs/dir-lookup.c
        libnetfs/dir-mkdir.c
        libnetfs/dir-mkfile.c
        libnetfs/dir-readdir.c
        libnetfs/dir-rmdir.c
        libnetfs/dir-unlink.c
        libnetfs/drop-node.c
        libnetfs/file-chauthor.c
        libnetfs/file-check-access.c
        libnetfs/file-chflags.c
        libnetfs/file-chmod.c
        libnetfs/file-chown.c
        libnetfs/file-exec.c
        libnetfs/file-get-fs-options.c
        libnetfs/file-get-storage-info.c
        libnetfs/file-get-translator.c
        libnetfs/file-lock-stat.c
        libnetfs/file-lock.c
        libnetfs/file-reparent.c
        libnetfs/file-set-size.c
        libnetfs/file-set-translator.c
        libnetfs/file-statfs.c
        libnetfs/file-sync.c
        libnetfs/file-syncfs.c
        libnetfs/file-utimes.c
        libnetfs/fsys-get-options.c
        libnetfs/fsys-getroot.c
        libnetfs/fsys-set-options.c
        libnetfs/init-init.c
        libnetfs/io-clear-some-openmodes.c
        libnetfs/io-duplicate.c
        libnetfs/io-get-openmodes.c
        libnetfs/io-get-owner.c
        libnetfs/io-identity.c
        libnetfs/io-mod-owner.c
        libnetfs/io-read.c
        libnetfs/io-readable.c
        libnetfs/io-reauthenticate.c
        libnetfs/io-restrict-auth.c
        libnetfs/io-revoke.c
        libnetfs/io-seek.c
        libnetfs/io-select.c
        libnetfs/io-set-all-openmodes.c
        libnetfs/io-set-some-openmodes.c
        libnetfs/io-stat.c
        libnetfs/io-write.c
        libnetfs/make-node.c
        libnetfs/netfs.h
        libnetfs/nput.c
        libnetfs/nref.c
        libnetfs/nrele.c
        libnetfs/priv.h
        libnetfs/release-peropen.c
        libnetfs/shutdown.c
        libpager/Makefile
        libpager/chg-compl.c
        libpager/clean.c
        libpager/data-request.c
        libpager/data-return.c
        libpager/data-unlock.c
        libpager/inhibit-term.c
        libpager/lock-completed.c
        libpager/lock-object.c
        libpager/mark-error.c
        libpager/no-senders.c
        libpager/object-init.c
        libpager/object-terminate.c
        libpager/offer-page.c
        libpager/pager-attr.c
        libpager/pager-create.c
        libpager/pager-shutdown.c
        libpager/priv.h
        libpager/seqnos.c
        libpipe/Makefile
        libpipe/dgram.c
        libpipe/pipe-funcs.c
        libpipe/pipe.c
        libpipe/pipe.h
        libpipe/pq-funcs.c
        libpipe/pq.c
        libpipe/pq.h
        libpipe/seqpack.c
        libpipe/stream.c
        libports/Makefile
        libports/begin-rpc.c
        libports/bucket-iterate.c
        libports/claim-right.c
        libports/class-iterate.c
        libports/complete-deallocate.c
        libports/count-bucket.c
        libports/count-class.c
        libports/create-bucket.c
        libports/create-internal.c
        libports/destroy-right.c
        libports/enable-bucket.c
        libports/enable-class.c
        libports/end-rpc.c
        libports/get-right.c
        libports/import-port.c
        libports/inhibit-all-rpcs.c
        libports/inhibit-bucket-rpcs.c
        libports/inhibit-class-rpcs.c
        libports/inhibit-port-rpcs.c
        libports/init.c
        libports/interrupt-notified-rpcs.c
        libports/interrupt-on-notify.c
        libports/interrupt-operation.c
        libports/interrupt-rpcs.c
        libports/interrupted.c
        libports/lookup-port.c
        libports/manage-multithread.c
        libports/no-senders.c
        libports/port-deref-weak.c
        libports/port-deref.c
        libports/port-ref-weak.c
        libports/port-ref.c
        libports/ports.h
        libports/reallocate-from-external.c
        libports/reallocate-port.c
        libports/resume-all-rpcs.c
        libports/resume-bucket-rpcs.c
        libports/resume-class-rpcs.c
        libports/resume-port-rpcs.c
        libports/stubs.c
        libports/transfer-right.c
        libps/Makefile
        libps/procstat.c
        libps/ps.h
        libshouldbeinlibc/Makefile
        libshouldbeinlibc/exec-reauth.c
        libshouldbeinlibc/idvec-funcs.c
        libshouldbeinlibc/idvec-impgids.c
        libshouldbeinlibc/idvec-rep.c
        libshouldbeinlibc/idvec-verify.c
        libshouldbeinlibc/idvec.c
        libshouldbeinlibc/idvec.h
        libshouldbeinlibc/maptime-funcs.c
        libshouldbeinlibc/maptime.h
        libshouldbeinlibc/portxlate.c
        libshouldbeinlibc/timefmt.c
        libshouldbeinlibc/ugids-verify-auth.c
        libshouldbeinlibc/ugids-xinl.c
        libshouldbeinlibc/ugids.h
        libstore/Makefile
        libstore/gunzip.c
        libstore/part.c
        libstore/store.h
        libstore/unzipstore.c
        libstore/xinl.c
        libthreads/Makefile
        libthreads/cprocs.c
        libthreads/rwlock.c
        libthreads/rwlock.h
        libthreads/stack.c
        libtreefs/Makefile
        libtreefs/dir-lookup.c
        libtreefs/fsys-getroot.c
        libtreefs/fsys-hooks.c
        libtreefs/fsys.c
        libtreefs/mig-decls.h
        libtreefs/trans-help.c
        libtreefs/trans-start.c
        libtreefs/treefs.h
        libtrivfs/Makefile
        libtrivfs/cntl-create.c
        libtrivfs/dyn-classes.c
        libtrivfs/io-reauthenticate.c
        libtrivfs/io-restrict-auth.c
        libtrivfs/io-select.c
        libtrivfs/protid-clean.c
        libtrivfs/protid-dup.c
        libtrivfs/trivfs.h
        mach-defpager/Makefile
        mach-defpager/default_pager.c
        mach-defpager/kalloc.c
        mach-defpager/main.c
        mach-defpager/setup.c
        mach-defpager/wiring.c
        nfs/Makefile
        nfs/cache.c
        nfs/main.c
        nfs/mount.c
        nfs/name-cache.c
        nfs/nfs.h
        nfs/ops.c
        nfs/rpc.c
        nfsd/Makefile
        nfsd/cache.c
        nfsd/loop.c
        nfsd/main.c
        nfsd/nfsd.h
        pfinet/Makefile
        pfinet/ethernet.c
        pfinet/glue-include/asm/spinlock.h
        pfinet/glue-include/linux/interrupt.h
        pfinet/glue-include/linux/ipv6.h
        pfinet/glue-include/linux/poll.h
        pfinet/glue-include/linux/sched.h
        pfinet/glue-include/linux/socket.h
        pfinet/glue-include/linux/timer.h
        pfinet/glue-include/linux/wait.h
        pfinet/iioctl-ops.c
        pfinet/io-ops.c
        pfinet/kmem_cache.c
        pfinet/linux-src/include/linux/in6.h
        pfinet/linux-src/include/linux/ipv6.h
        pfinet/linux-src/include/linux/netdevice.h
        pfinet/linux-src/include/linux/sysctl.h
        pfinet/linux-src/include/net/ipv6.h
        pfinet/linux-src/include/net/sock.h
        pfinet/linux-src/net/core/dev.c
        pfinet/linux-src/net/ipv4/tcp_ipv4.c
        pfinet/linux-src/net/ipv4/udp.c
        pfinet/linux-src/net/ipv6/af_inet6.c
        pfinet/linux-src/net/ipv6/ipv6_sockglue.c
        pfinet/linux-src/net/ipv6/tcp_ipv6.c
        pfinet/linux-src/net/ipv6/udp_ipv6.c
        pfinet/main.c
        pfinet/options.c
        pfinet/pfinet-ops.c
        pfinet/pfinet.h
        pfinet/sched.c
        pfinet/socket-ops.c
        pfinet/socket.c
        pfinet/timer-emul.c
        pfinet/tunnel.c
        pflocal/Makefile
        pflocal/connq.c
        pflocal/connq.h
        pflocal/io.c
        pflocal/sock.c
        pflocal/sock.h
        pflocal/socket.c
        pflocal/sserver.c
        proc/Makefile
        proc/info.c
        proc/main.c
        proc/mgt.c
        proc/msg.c
        proc/proc.h
        proc/stubs.c
        proc/wait.c
        proc_proxy/Makefile
        release/Makefile
        storeio/Makefile
        storeio/dev.c
        storeio/dev.h
        storeio/io.c
        storeio/open.c
        storeio/open.h
        storeio/pager.c
        storeio/storeio.c
        sutils/MAKEDEV.sh
        sutils/Makefile
        sutils/clookup.c
        tasks
        term/Makefile
        term/devio.c
        term/hurdio.c
        term/main.c
        term/munge.c
        term/ptyio.c
        term/term.h
        term/users.c
        tmpfs/Makefile
        tmpfs/dir.c
        tmpfs/node.c
        tmpfs/tmpfs.c
        tmpfs/tmpfs.h
        trans/Makefile
        trans/fakeroot.c
        trans/fifo.c
        trans/firmlink.c
        trans/hello-mt.c
        trans/new-fifo.c
        trans/null.c
        trans/streamio.c
        ufs-fsck/Makefile
        ufs/Makefile
        ufs/alloc.c
        ufs/dir.c
        ufs/hyper.c
        ufs/inode.c
        ufs/main.c
        ufs/pager.c
        ufs/pokeloc.c
        ufs/sizes.c
        ufs/ufs.h
        usermux/Makefile
        usermux/mux.c
        usermux/node.c
        usermux/usermux.h
        utils/Makefile
        utils/fakeauth.c
        utils/ps.c
        utils/rpctrace.c
        utils/vmstat.c
        utils/x.c

 .gitignore |  103 ++++++++----------------------------------------------------
 1 file changed, 13 insertions(+), 90 deletions(-)

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