]> git.michaelhowe.org Git - packages/o/openafs.git/commit
In cases where conflicts exist between 1.3.64 and the Debian sources
authorSam Hartman <hartmans@debian.org>
Mon, 17 May 2004 06:43:07 +0000 (06:43 +0000)
committerSam Hartman <hartmans@debian.org>
Mon, 17 May 2004 06:43:07 +0000 (06:43 +0000)
commitf82288ac9294f9f28e53cbbfb30aa29bb1090752
treecf22bc10074dcdcbe6dd3cdd5bc9de14e1065c71
parent7cbacb7236b9f1e57d660094fc4bf49071c7d921
In cases where conflicts exist between 1.3.64 and the Debian sources
and where the conflict stems from old patches that have been applied
upstream that make rcsids incompatible, use the upstream sources
directly.
319 files changed:
src/afs/.cvsignore
src/afs/AIX/osi_config.c
src/afs/AIX/osi_file.c
src/afs/AIX/osi_groups.c
src/afs/AIX/osi_inode.c
src/afs/AIX/osi_machdep.h
src/afs/AIX/osi_misc.c
src/afs/AIX/osi_prototypes.h
src/afs/AIX/osi_sleep.c
src/afs/AIX/osi_timeout.c
src/afs/AIX/osi_vfs.h
src/afs/AIX/osi_vfsops.c
src/afs/AIX/osi_vm.c
src/afs/AIX/osi_vnodeops.c
src/afs/DARWIN/osi_file.c
src/afs/DARWIN/osi_groups.c
src/afs/DARWIN/osi_inode.c
src/afs/DARWIN/osi_inode.h
src/afs/DARWIN/osi_machdep.h
src/afs/DARWIN/osi_misc.c
src/afs/DARWIN/osi_module.c
src/afs/DARWIN/osi_prototypes.h
src/afs/DARWIN/osi_sleep.c
src/afs/DARWIN/osi_vfsops.c
src/afs/DARWIN/osi_vm.c
src/afs/DARWIN/osi_vnodeops.c
src/afs/DOC/afs_rwlocks
src/afs/DUX/osi_file.c
src/afs/DUX/osi_groups.c
src/afs/DUX/osi_inode.c
src/afs/DUX/osi_inode.h
src/afs/DUX/osi_misc.c
src/afs/DUX/osi_sleep.c
src/afs/DUX/osi_vfsops.c
src/afs/DUX/osi_vm.c
src/afs/DUX/osi_vnodeops.c
src/afs/FBSD/osi_file.c
src/afs/FBSD/osi_groups.c
src/afs/FBSD/osi_inode.c
src/afs/FBSD/osi_inode.h
src/afs/FBSD/osi_machdep.h
src/afs/FBSD/osi_misc.c
src/afs/FBSD/osi_module.c
src/afs/FBSD/osi_prototypes.h
src/afs/FBSD/osi_sleep.c
src/afs/FBSD/osi_vfsops.c
src/afs/FBSD/osi_vm.c
src/afs/FBSD/osi_vnodeops.c
src/afs/HPUX/osi_debug.c
src/afs/HPUX/osi_file.c
src/afs/HPUX/osi_groups.c
src/afs/HPUX/osi_inode.c
src/afs/HPUX/osi_inode.h
src/afs/HPUX/osi_machdep.h
src/afs/HPUX/osi_misc.c
src/afs/HPUX/osi_sleep.c
src/afs/HPUX/osi_vfs.h
src/afs/HPUX/osi_vfsops.c
src/afs/HPUX/osi_vm.c
src/afs/HPUX/osi_vnodeops.c
src/afs/IRIX/osi_file.c
src/afs/IRIX/osi_groups.c
src/afs/IRIX/osi_idbg.c
src/afs/IRIX/osi_inode.c
src/afs/IRIX/osi_inode.h
src/afs/IRIX/osi_machdep.h
src/afs/IRIX/osi_misc.c
src/afs/IRIX/osi_sleep.c
src/afs/IRIX/osi_vfs.h
src/afs/IRIX/osi_vfsops.c
src/afs/IRIX/osi_vm.c
src/afs/IRIX/osi_vnodeops.c
src/afs/LINUX/osi_alloc.c
src/afs/LINUX/osi_cred.c
src/afs/LINUX/osi_file.c
src/afs/LINUX/osi_groups.c
src/afs/LINUX/osi_inode.c
src/afs/LINUX/osi_machdep.h
src/afs/LINUX/osi_misc.c
src/afs/LINUX/osi_module.c
src/afs/LINUX/osi_prototypes.h
src/afs/LINUX/osi_sleep.c
src/afs/LINUX/osi_sysctl.c
src/afs/LINUX/osi_vfs.hin
src/afs/LINUX/osi_vfsops.c
src/afs/LINUX/osi_vm.c
src/afs/LINUX/osi_vnodeops.c
src/afs/Makefile.am
src/afs/Makefile.in
src/afs/SOLARIS/osi_file.c
src/afs/SOLARIS/osi_groups.c
src/afs/SOLARIS/osi_inode.c
src/afs/SOLARIS/osi_inode.h
src/afs/SOLARIS/osi_machdep.h
src/afs/SOLARIS/osi_prototypes.h
src/afs/SOLARIS/osi_sleep.c
src/afs/SOLARIS/osi_vfsops.c
src/afs/SOLARIS/osi_vm.c
src/afs/SOLARIS/osi_vnodeops.c
src/afs/SUNOS/osi_inode.h
src/afs/UKERNEL/afs_usrops.c
src/afs/UKERNEL/afs_usrops.h
src/afs/UKERNEL/afsincludes.h
src/afs/UKERNEL/osi_groups.c
src/afs/UKERNEL/osi_machdep.h
src/afs/UKERNEL/osi_vfsops.c
src/afs/UKERNEL/osi_vm.c
src/afs/UKERNEL/osi_vnodeops.c
src/afs/UKERNEL/sysincludes.h
src/afs/VNOPS/afs_vnop_access.c
src/afs/VNOPS/afs_vnop_attrs.c
src/afs/VNOPS/afs_vnop_create.c
src/afs/VNOPS/afs_vnop_dirops.c
src/afs/VNOPS/afs_vnop_fid.c
src/afs/VNOPS/afs_vnop_flock.c
src/afs/VNOPS/afs_vnop_link.c
src/afs/VNOPS/afs_vnop_lookup.c
src/afs/VNOPS/afs_vnop_open.c
src/afs/VNOPS/afs_vnop_read.c
src/afs/VNOPS/afs_vnop_readdir.c
src/afs/VNOPS/afs_vnop_remove.c
src/afs/VNOPS/afs_vnop_rename.c
src/afs/VNOPS/afs_vnop_strategy.c
src/afs/VNOPS/afs_vnop_symlink.c
src/afs/VNOPS/afs_vnop_write.c
src/afs/afs.h
src/afs/afs_analyze.c
src/afs/afs_axscache.c
src/afs/afs_axscache.h
src/afs/afs_buffer.c
src/afs/afs_call.c
src/afs/afs_callback.c
src/afs/afs_cbqueue.c
src/afs/afs_cbqueue.h
src/afs/afs_cell.c
src/afs/afs_chunk.c
src/afs/afs_chunkops.h
src/afs/afs_conn.c
src/afs/afs_daemons.c
src/afs/afs_dcache.c
src/afs/afs_dynroot.c
src/afs/afs_exporter.c
src/afs/afs_init.c
src/afs/afs_lock.c
src/afs/afs_mariner.c
src/afs/afs_memcache.c
src/afs/afs_nfsclnt.c
src/afs/afs_nfsdisp.c
src/afs/afs_osi.c
src/afs/afs_osi.h
src/afs/afs_osi_alloc.c
src/afs/afs_osi_pag.c
src/afs/afs_osi_uio.c
src/afs/afs_osi_vget.c
src/afs/afs_osidnlc.c
src/afs/afs_osidnlc.h
src/afs/afs_pioctl.c
src/afs/afs_prototypes.h
src/afs/afs_segments.c
src/afs/afs_server.c
src/afs/afs_stat.c
src/afs/afs_stats.h
src/afs/afs_trace.et
src/afs/afs_user.c
src/afs/afs_util.c
src/afs/afs_util.h
src/afs/afs_vcache.c
src/afs/afs_volume.c
src/afs/afsincludes.h
src/afs/exporter.h
src/afs/lock.h
src/afs/longc_procs.h
src/afs/nfsclient.h
src/afs/sysincludes.h
src/afs/voldefs.h
src/afs/volerrors.h
src/gtx/Makefile.in
src/gtx/X11windows.c
src/gtx/cb_test.c
src/gtx/curses_test.c
src/gtx/curseswindows.c
src/gtx/dumbwindows.c
src/gtx/frame.c
src/gtx/gtxX11win.h
src/gtx/gtxcurseswin.h
src/gtx/gtxdumbwin.h
src/gtx/gtxframe.h
src/gtx/gtxkeymap.h
src/gtx/gtxlightobj.h
src/gtx/gtxobjdict.h
src/gtx/gtxobjects.h
src/gtx/gtxtest.c
src/gtx/gtxtextcb.h
src/gtx/gtxtextobj.h
src/gtx/gtxwindows.h
src/gtx/input.c
src/gtx/keymap.c
src/gtx/lightobject.c
src/gtx/objdict.c
src/gtx/object_test.c
src/gtx/objects.c
src/gtx/screen_test.c
src/gtx/textcb.c
src/gtx/textobject.c
src/gtx/windows.c
src/uss/Makefile.in
src/uss/grammar.y
src/uss/sample.template
src/uss/uss.c
src/uss/uss_acl.c
src/uss/uss_acl.h
src/uss/uss_common.c
src/uss/uss_common.h
src/uss/uss_fs.c
src/uss/uss_fs.h
src/uss/uss_kauth.c
src/uss/uss_kauth.h
src/uss/uss_procs.c
src/uss/uss_procs.h
src/uss/uss_ptserver.c
src/uss/uss_ptserver.h
src/uss/uss_vol.c
src/uss/uss_vol.h
src/venus/.cvsignore
src/venus/Makefile.in
src/venus/cacheout.c
src/venus/cmdebug.c
src/venus/fs.c
src/venus/fstrace.c
src/venus/gcpags.c
src/venus/kdump.c
src/venus/livesys.c
src/venus/test/Makefile.in
src/venus/test/fulltest.c
src/venus/test/getinitparams.c
src/venus/test/idtest.c
src/venus/test/owntest.c
src/venus/twiddle.c
src/venus/up.c
src/venus/whatfid.c
src/vlserver/Makefile.in
src/vlserver/NTMakefile
src/vlserver/cnvldb.c
src/vlserver/cnvldb.h
src/vlserver/sascnvldb.c
src/vlserver/vlclient.c
src/vlserver/vlclient.h
src/vlserver/vldb_check.c
src/vlserver/vlprocs.c
src/vlserver/vlserver.c
src/vlserver/vlserver.p.h
src/vlserver/vlutils.c
src/vol/Makefile.in
src/vol/NTMakefile
src/vol/clone.c
src/vol/common.c
src/vol/devname.c
src/vol/fs_conv_411.c
src/vol/fssync.c
src/vol/fssync.h
src/vol/fstab.c
src/vol/gi.c
src/vol/ihandle.c
src/vol/ihandle.h
src/vol/listinodes.c
src/vol/namei_ops.c
src/vol/namei_ops.h
src/vol/nfs.h
src/vol/ntops.c
src/vol/ntops.h
src/vol/nuke.c
src/vol/partition.c
src/vol/partition.h
src/vol/physio.c
src/vol/purge.c
src/vol/salvage.h
src/vol/test/Makefile.in
src/vol/test/NTMakefile
src/vol/test/ilist_nt.c
src/vol/test/listVicepx.c
src/vol/test/listVicepx.h
src/vol/test/ltlist.c
src/vol/test/nicreate.c
src/vol/test/nilist.c
src/vol/test/nincdec.c
src/vol/test/nino.c
src/vol/test/nsubr.c
src/vol/test/testpart.c
src/vol/test/updateDirInode.c
src/vol/test/utilities.c
src/vol/viceinode.h
src/vol/vnode.c
src/vol/vnode.h
src/vol/vol-info.c
src/vol/vol-salvage.c
src/vol/voldefs.h
src/vol/volinodes.h
src/vol/volume.c
src/vol/volume.h
src/vol/vutil.c
src/vol/xfs_size_check.c
src/volser/Makefile.in
src/volser/NTMakefile
src/volser/common.c
src/volser/dump.h
src/volser/dumpstuff.c
src/volser/lockdata.h
src/volser/lockprocs.c
src/volser/physio.c
src/volser/restorevol.c
src/volser/vol.h
src/volser/volint.xg
src/volser/volmain.c
src/volser/volprocs.c
src/volser/volser.p.h
src/volser/voltrans.c
src/volser/vos.c
src/volser/vsprocs.c
src/volser/vsutils.c