the bitrig sync20160316 branch has been updated by mathieu with 3 new commits:
commit f796dc4cdba9beddb6e09dfb4b810684e666f86c diff: https://github.com/bitrig/bitrig/commit/f796dc4 author: Mathieu Masson <[email protected]> date: Thu Mar 10 14:58:29 2016 +0100 Fix merge error. M sys/kern/init_main.c commit 42c2a2f7568a2285aac8861472badf385dcb4594 diff: https://github.com/bitrig/bitrig/commit/42c2a2f author: Mathieu Masson <[email protected]> date: Thu Mar 10 14:50:32 2016 +0100 udf: Fix merge. Missing variable declaration. ok marco M sys/isofs/udf/udf_vnops.c commit c306bdd3c5360c1376783b1efb648e74d99446ce diff: https://github.com/bitrig/bitrig/commit/c306bdd author: Mathieu Masson <[email protected]> date: Thu Mar 10 14:43:31 2016 +0100 udf: Fix merge. Our version of udf_readatoffset takes a size_t so make it so in the callers. ok marco. M sys/isofs/udf/udf_subr.c
