Oliver Pinter (2):
      HBSD: Revert "HBSD: Fixup freebsd-version output"
      Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

Oliver Pinter + (8):
      Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master
      Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master
      Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master
      Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master
      Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master
      Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master
      Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master
      Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

ae (1):
      MFC r341798:   Use correct size for IPv4 address in gethostbyaddr().   When u_long is 8 bytes, it returns EINVAL and 'ipfw -N show' doesn't work.

araujo (1):
      MFC r340707:

avos (1):
      MFC r342124: Add new USB id in rtwn_usb(4) (RTL8812AU)

brooks (1):
      MFC r342125:

cy (1):
      MFC r342150:

emaste (1):
      MFC r342227: bootpd: validate hardware type

eugen (1):
      MFC r342071: ng_bpf.4: fix EXAMPLES: do not activate promiscuous mode

hiren (1):
      MFC r342127 Revert r331567 CC Cubic: fix underflow for cubic_cwnd()

hselasky (1):
      MFC r341844: Don't register IOCTLs with capsicum when there is no valid file descriptor. This fixes tcpdump when using mlx5_X devices.

jkim (1):
      MFC:	r340090, r342056

kib (2):
      MFC r341810: Free bootstacks after AP startup.
      MFC r342144: Document new required MI behaviour of pmap_enter(9) for CoW.

markj (8):
      MFC r341821: Fix the PAE kernel gcc build.
      MFC r341807: Use inline tests for individual PTE bits in the RISC-V pmap.
      MFC r341808: Remove an unused malloc(9) type.
      MFC r341594, r341601: mlx4en(4) and ixl(4) have netdump support.
      MFC r340402, r340914 (by alc), r341602 (by alc), r341766 (by alc): Allow allocations across meta boundaries.
      MFC r341837, r342192: Use Capsicum helpers in ping(8).
      MFC r341595: Clamp the INPCB port hash tables to IPPORT_MAX + 1 chains.
      Revert r342219.

mav (1):
      MFC r339909: Allow changing lagg(4) MTU.

shurd (1):
      MFC r341824:

sobomax (2):
      MFC r341253: panic() should not apply \n.
      MFC r341257: improve speed of empty block detection.