Build failure - quota2 merge problem?

[Paul Goyette <paul%whooppee.com@localhost>]

Sources updated just moments ago...

#   compile  makefs/ffs_bswap.lo
cc -O -I. -I/build/netbsd-local/tools/x86_64/amd64/include/nbinclude 
-I/build/netbsd-local/obj/amd64/tools/compat 
-I/build/netbsd-local/obj/amd64/tools/compat/include 
-I/build/netbsd-local/src/tools/makefs/../compat -DHAVE_NBTOOL_CONFIG_H=1 
-D_FILE_OFFSET_BITS=64 
-I/build/netbsd-local/src/tools/makefs/../../usr.sbin/makefs 
-I/build/netbsd-local/src/sbin/mknod -I/build/netbsd-local/src/usr.sbin/mtree 
-I/build/netbsd-local/src/sys/fs/cd9660 -c -o ffs_bswap.lo.o    
/build/netbsd-local/src/sys/ufs/ffs/ffs_bswap.c
/build/netbsd-local/src/sys/ufs/ffs/ffs_bswap.c: In function 'ffs_sb_swap':
/build/netbsd-local/src/sys/ufs/ffs/ffs_bswap.c:80: error: 'struct fs' has no 
member named 'fs_quota_magic'
/build/netbsd-local/src/sys/ufs/ffs/ffs_bswap.c:80: error: 'struct fs' has no 
member named 'fs_quota_magic'
/build/netbsd-local/src/sys/ufs/ffs/ffs_bswap.c:80: error: 'struct fs' has no 
member named 'fs_quota_magic'
<more>


-------------------------------------------------------------------------
| Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:       |
| Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com    |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer |                          | pgoyette at netbsd.org  |
-------------------------------------------------------------------------