Merge branch 'upstream' into bug/module-name

diff --cc src/libafs/MakefileProto.LINUX.in
index 50a7312120426d2464c4fbae4bc25ef38f28eb50,e201bf9aab34dc85d3143938787484d78a35849f..08fef8b04c2b30cdbafe86d5fa2cd6f0619716bc
--- 1/src/libafs/MakefileProto.LINUX.in
--- 2/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@@ -249,13 -252,13 +250,13 @@@ libafs.bm: $(LIBAFS_BM
        echo BM Build Complete
  
  <linux26 linux_26 umlinux26>
 -${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: libafs.ko
 -      cp libafs.ko $@
 +${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: openafs.ko
 +      cp openafs.ko $@
  
  .FORCE:
 -libafs.ko: .FORCE
 +openafs.ko: .FORCE
        env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common
-       env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_PATH} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules
+       env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_BUILD} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules
          
  <all -linux26 -linux_26 -umlinux26>
  ${LIBAFS}: $(AFSAOBJS) $(AFSNONFSOBJS)