FYI, the fix was incomplete. I fixed remaining ones in 7270b8992214.

LGTM

In D38835#884575, @ngie wrote:

I followed a different import process than what’s described in FreeBSD-UPGRADE because it was much simpler for me to use rsync -av —-delete to update the contents than multiple calls to find/tar/comm.

LGTM

In D36868#836880, @kib wrote:

Please, upload patches with context. git show -U 9999999 or git diff -U 999999999

In D36868#836858, @hselasky wrote:

I think you should use "1000000000ULL" to always get unsigned results, but I'm not an expert. Else code looks good.

LGTM

LGTM

This commit breaks non-VIMAGE kernel build. Try MINIMAL kernel for example.

/usr/src/sys/netpfil/ipfw/ip_dn_io.c:674:4: error: 'continue' statement not in loop statement
                        continue;
                        ^
1 error generated.

LGTM