]> git.michaelhowe.org Git - packages/o/openafs.git/commit
Merge conflicts and back out changes
authorSam Hartman <hartmans@debian.org>
Wed, 11 Jul 2001 04:03:31 +0000 (04:03 +0000)
committerSam Hartman <hartmans@debian.org>
Wed, 11 Jul 2001 04:03:31 +0000 (04:03 +0000)
commit956c087832a3d39031a92bb80eb1894cfde9459b
treed86b3fddb71d466f1893796a682dd91eb31bc244
parent40acb3569f620006e8bb14446f6c3f848c602add
Merge conflicts and back out changes
upstream has dealt with
39 files changed:
Makefile.in
aclocal.m4 [deleted file]
configure [deleted file]
configure.in
debian/patch.001_ptserver_lossage [deleted file]
debian/patch.002_disable_kernel_requirement [deleted file]
src/afs/LINUX/osi_cred.c
src/afs/LINUX/osi_file.c
src/afs/LINUX/osi_misc.c
src/afs/LINUX/osi_module.c
src/afs/LINUX/osi_vnodeops.c
src/afs/VNOPS/afs_vnop_lookup.c
src/afs/VNOPS/afs_vnop_readdir.c
src/afs/afs_call.c
src/afs/afs_daemons.c
src/afs/afs_osi.h
src/afs/afs_pioctl.c
src/config/afsconfig.h.in [deleted file]
src/config/param.i386_linux22.h
src/config/param.i386_linux24.h
src/config/param.ppc_linux22.h
src/config/param.ppc_linux22_usr.h
src/config/param.ppc_linux24.h
src/config/param.sparc64_linux22.h
src/config/param.sparc64_linux22_usr.h
src/config/param.sparc_linux22.h
src/config/param.sparc_linux22_usr.h
src/lwp/lwp.c
src/lwp/lwp.h
src/lwp/preempt.c
src/lwp/process.c
src/ptserver/pt_util.c
src/ptserver/ptserver.c
src/rx/rx.c
src/util/dirpath.c
src/venus/Makefile
src/venus/fstrace.c
src/vol/partition.c
src/volser/volmain.c