errors in the latest kernel update

[Dimitry Andric]

Aryeh M. Friedman wrote:
> /FreeBSD/FreeBSD-current/src/sys/ufs/ffs/ffs_softdep.c: In function
> 'initiate_write_inodeblock_ufs1':
> /FreeBSD/FreeBSD-current/src/sys/ufs/ffs/ffs_softdep.c:3877: error:
> expected expression before '<<' token
> /FreeBSD/FreeBSD-current/src/sys/ufs/ffs/ffs_softdep.c:3879: error:
> expected expression before '==' token

You have CVS merge conflicts.  Fix them first, before attempting to
compile again. :)