HardenedBSD/hardenedbsd a906febsys/vm vm_unix.c

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-5sys/vm/vm_unix.c
+0-51 files

HardenedBSD/hardenedbsd 887d9e4lib/libcasper/services/cap_sysctl cap_sysctl.c cap_sysctl.3, lib/libcasper/services/cap_sysctl/tests sysctl_test.c

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master

Conflicts:
        sys/vm/vm_unix.c (unresolved)

HardenedBSD/hardenedbsd 6eb0550sys/amd64/vmm vmm.c vmm_dev.c, sys/amd64/vmm/amd svm.c

Merge remote-tracking branch 'origin/hardened/11-stable/master' into 
hardened/11-stable/unstable

* origin/hardened/11-stable/master:
  MFC: r346714: Add accessor function for vm->maxcpus
  MFC: r346717: Make bhyve SMBIOS table topology aware

HardenedBSD/hardenedbsd b3639absys/amd64/vmm vmm.c vmm_dev.c, sys/amd64/vmm/amd svm.c

Merge branch 'freebsd/11-stable/master' into hardened/11-stable/master

* freebsd/11-stable/master:
  MFC: r346714: Add accessor function for vm->maxcpus
  MFC: r346717: Make bhyve SMBIOS table topology aware

HardenedBSD/hardenedbsd 26e8a3alibexec/bootpd bootpd.c, sys/conf files.amd64

Merge remote-tracking branch 'origin/hardened/current/master' into 
hardened/current/unstable

* origin/hardened/current/master:
  Correctly align usage: output
  Add an AESNI-optimized version of the CCM/CBC cryptographic and authentication code.  
The primary client of this is probably going to be ZFS encryption.

HardenedBSD/hardenedbsd 3b3da06libexec/bootpd bootpd.c, sys/conf files.amd64

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  Correctly align usage: output
  Add an AESNI-optimized version of the CCM/CBC cryptographic and authentication code.  
The primary client of this is probably going to be ZFS encryption.

HardenedBSD/hardenedbsd ed66cf9sys/amd64/vmm vmm.c vmm_dev.c, sys/amd64/vmm/amd svm.c

MFC: r346714: Add accessor function for vm->maxcpus

Replace most VM_MAXCPU constant useses with an accessor function to
vm->maxcpus which for now is initialized and kept at the value of
VM_MAXCPUS.

This is a rework of Fabian Freyer (fabian.freyer_physik.tu-berlin.de)
work from D10070 to adjust it for the cpu topology changes that
occured in r332298

Approved by:           re (kib)

HardenedBSD/hardenedbsd 4616fcdlibexec/bootpd bootpd.c

Correctly align usage: output

HardenedBSD/hardenedbsd fa58253usr.sbin/bhyve smbiostbl.c bhyverun.h

MFC: r346717: Make bhyve SMBIOS table topology aware

When the CPU Topology was added to bhyve in r332298 the SMBIOS table was
missed, this table passes topology information to the system and was still
using the old concept of each vCPU is a socket with 1 core and 1 thread.
This code did not even try to use the old sysctl information to adjust
this data.

Correct that by building a proper SMBios table, mapping the > 254 cases to
0 per the SMBios 2.6 specification that is claimed by the structure.

Approved by:           re (kib)

HardenedBSD/hardenedbsd d0d13d2sys/conf files.amd64 files.i386, sys/crypto/aesni aesni_ccm.c aesni.c

Add an AESNI-optimized version of the CCM/CBC cryptographic and authentication
code.  The primary client of this is probably going to be ZFS encryption.

Reviewed by:    jhb, cem
Sponsored by:   iXsystems Inc, Kithrup Enterprises
Differential Revision:  https://reviews.freebsd.org/D19298

HardenedBSD/hardenedbsd dc066c1sys/dev/virtio/pci virtio_pci.c, sys/geom/nop g_nop.c

Merge remote-tracking branch 'origin/hardened/current/master' into 
hardened/current/unstable

* origin/hardened/current/master:
  powerpc64/pmap: Reapply r334235 to OEA64 pmap, clearing HID0_RADIX
  virtio_pci(4): Fix typo in read_ivar method
  When using the destroy option to shut down a nop GEOM module, I/O operations already in 
its queue were not being properly drained. The GEOM framework does the queue draining, but 
the module needs to wait for the draining to happen. The waiting is done by adding a 
g_nop_providergone() function to wait for the I/O operations to finish up. This change is 
similar to change -r345758 made to the memory-disk driver.

HardenedBSD/hardenedbsd 733aa40sys/dev/virtio/pci virtio_pci.c, sys/geom/nop g_nop.c

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  powerpc64/pmap: Reapply r334235 to OEA64 pmap, clearing HID0_RADIX
  virtio_pci(4): Fix typo in read_ivar method
  When using the destroy option to shut down a nop GEOM module, I/O operations already in 
its queue were not being properly drained. The GEOM framework does the queue draining, but 
the module needs to wait for the draining to happen. The waiting is done by adding a 
g_nop_providergone() function to wait for the I/O operations to finish up. This change is 
similar to change -r345758 made to the memory-disk driver.

HardenedBSD/hardenedbsd b50a1f8contrib/zlib deflate.c zlib.h, sys/contrib/zlib deflate.c zlib.h

Merge remote-tracking branch 'origin/hardened/11-stable/master' into 
hardened/11-stable/unstable

* origin/hardened/11-stable/master:
  MFC r347244:
  MFC of 348074

HardenedBSD/hardenedbsd b8fe78acontrib/zlib deflate.c zlib.h, sys/contrib/zlib deflate.c zlib.h

Merge branch 'freebsd/11-stable/master' into hardened/11-stable/master

* freebsd/11-stable/master:
  MFC r347244:
  MFC of 348074

HardenedBSD/hardenedbsd adb9054sys/powerpc/aim moea64_native.c

powerpc64/pmap: Reapply r334235 to OEA64 pmap, clearing HID0_RADIX

This was lost in the re-merger of ISA3 MMU into moea64_native.

HardenedBSD/hardenedbsd 9b8705asbin/fsck_ffs dir.c

Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master:
  MFC of 348074
DeltaFile
+106-101sbin/fsck_ffs/dir.c
+106-1011 files

HardenedBSD/hardenedbsd 5b32304sys/dev/virtio/pci virtio_pci.c

virtio_pci(4): Fix typo in read_ivar method

Prior to this revision, vtpci's BUS_READ_IVAR method on VIRTIO_IVAR_SUBVENDOR
accidentally returned the PCI subdevice.

The typo seems to have been introduced with the original commit adding
VIRTIO_IVAR_{{SUB,}DEVICE,{SUB,}VENDOR} to virtio_pci.  The commit log and code
strongly suggest that the ivar was intended to return the subvendor rather than
the subdevice; it was likely just a copy/paste mistake.

Go ahead and rectify that.

HardenedBSD/hardenedbsd 59b235dcontrib/zlib deflate.c zlib.h, sys/contrib/zlib deflate.c zlib.h

MFC r347244:

Move contrib/zlib to sys/contrib/zlib so that we can use it in kernel.
This is a prerequisite of unifying kernel zlib instances.

Submitted by:   Yoshihiro Ota <ota at j.email.ne.jp>
Approved by:    re (kib)

HardenedBSD/hardenedbsd 5b110c1sys/dev/cxgbe t4_sge.c, sys/net if_lagg.c if_vlan.c

Merge remote-tracking branch 'origin/hardened/current/master' into 
hardened/current/unstable

* origin/hardened/current/master:
  Fix too loose assert in pmap_large_unmap().
  Add PG_PS_PDP_FRAME symbol.
  Disable intr_storm_threshold mechanism by default
  Restructure mbuf send tags to provide stronger guarantees.
  Add initial support for 'qSupported' to the debug server.
  HBSD: Enable NUMA by default on arm64
  Remove "struct ucred*" argument from vtruncbuf
  Add snd_hda(4) to GENERIC64 used by powerpc64.
  ficl pfopen: verify file
  Make options MD_ROOT_MEM default on PPC64

HardenedBSD/hardenedbsd e21ef45sys/dev/cxgbe t4_sge.c, sys/net if_lagg.c if_vlan.c

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  Fix too loose assert in pmap_large_unmap().
  Add PG_PS_PDP_FRAME symbol.
  Disable intr_storm_threshold mechanism by default
  Restructure mbuf send tags to provide stronger guarantees.
  Add initial support for 'qSupported' to the debug server.
  Remove "struct ucred*" argument from vtruncbuf
  Add snd_hda(4) to GENERIC64 used by powerpc64.
  ficl pfopen: verify file
  Make options MD_ROOT_MEM default on PPC64

HardenedBSD/hardenedbsd 4468da1sbin/fsck_ffs dir.c

MFC of 348074

Rewrite fsck_readdir() and dircheck() for clarity and correctness.

Approved by: re (gjb)
DeltaFile
+106-101sbin/fsck_ffs/dir.c
+106-1011 files

HardenedBSD/hardenedbsd 13da854sys/geom/nop g_nop.c

When using the destroy option to shut down a nop GEOM module, I/O
operations already in its queue were not being properly drained.
The GEOM framework does the queue draining, but the module needs
to wait for the draining to happen. The waiting is done by adding
a g_nop_providergone() function to wait for the I/O operations to
finish up. This change is similar to change -r345758 made to the
memory-disk driver.

Submitted by: Chuck Silvers
Tested by:    Chuck Silvers
MFC after:    1 week
Sponsored by: Netflix
DeltaFile
+25-13sys/geom/nop/g_nop.c
+25-131 files

HardenedBSD/hardenedbsd 1c40a21sys/amd64/amd64 pmap.c

Fix too loose assert in pmap_large_unmap().

The upper bound for the valid address from the large map used
LARGEMAP_MAX_ADDRESS instead of LARGEMAP_MIN_ADDRESS.  Provide a
function-like macro for proper upper value.

Noted by:       markj
Reviewed by:    alc, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D20386

HardenedBSD/hardenedbsd eb64ceesys/amd64/include pmap.h

Add PG_PS_PDP_FRAME symbol.

Similar to PG_FRAME and PG_PS_FRAME, it denotes the mask of the
physical address component of 1G superpage PDP entry.

Reviewed by:    alc, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D20386

HardenedBSD/hardenedbsd 312da29sbin/fsck_ffs dir.c

MFC of 348074

Rewrite fsck_readdir() and dircheck() for clarity and correctness.
DeltaFile
+106-101sbin/fsck_ffs/dir.c
+106-1011 files

HardenedBSD/hardenedbsd 7aa3f66sys/kern kern_intr.c

Disable intr_storm_threshold mechanism by default

The ixl.4 manual page has documented that the threshold falsely detects
interrupt storms on 40Gbit NICs as long ago as 2015, and we have seen
similar false positives with the ioat(4) DMA device (which can push GB/s).

For example, synthetic load can be generated with tools/tools/ioat
'ioatcontrol 0 200 8192 1 1000' (allocate 200x8kB buffers, generate an
interrupt for each one, and do this for 1000 milliseconds).  With
storm-detection disabled, the Broadwell-EP version of this device is capable
of generating ~350k real interrupts per second.

The following historical context comes from jhb@: Originally, the threshold
worked around incorrect routing of PCI INTx interrupts on single-CPU systems
which would end up in a hard hang during boot.  Since the threshold was
added, our PCI interrupt routing was improved, most PCI interrupts use
edge-triggered MSI instead of level-triggered INTx, and typical systems have
multiple CPUs available to service interrupts.

On the off chance that the threshold is useful in the future, it remains
available as a tunable and sysctl.

Reviewed by:    jhb
Sponsored by:   Dell EMC Isilon
Differential Revision:  https://reviews.freebsd.org/D20401

HardenedBSD/hardenedbsd 5518ae8sys/dev/cxgbe t4_sge.c, sys/net if_lagg.c if_vlan.c

Restructure mbuf send tags to provide stronger guarantees.

- Perform ifp mismatch checks (to determine if a send tag is allocated
  for a different ifp than the one the packet is being output on), in
  ip_output() and ip6_output().  This avoids sending packets with send
  tags to ifnet drivers that don't support send tags.

  Since we are now checking for ifp mismatches before invoking
  if_output, we can now try to allocate a new tag before invoking
  if_output sending the original packet on the new tag if allocation
  succeeds.

  To avoid code duplication for the fragment and unfragmented cases,
  add ip_output_send() and ip6_output_send() as wrappers around
  if_output and nd6_output_ifp, respectively.  All of the logic for
  setting send tags and dealing with send tag-related errors is done
  in these wrapper functions.

  For pseudo interfaces that wrap other network interfaces (vlan and
  lagg), wrapper send tags are now allocated so that ip*_output see
  the wrapper ifp as the ifp in the send tag.  The if_transmit
  routines rewrite the send tags after performing an ifp mismatch
  check.  If an ifp mismatch is detected, the transmit routines fail
  with EAGAIN.


    [54 lines not shown]

HardenedBSD/hardenedbsd 3b83b74usr.sbin/bhyve gdb.c

Add initial support for 'qSupported' to the debug server.

This doesn't recognize any features yet, but does parse the features
string.  It advertises an arbitrary packet size of 4k.

Reviewed by:    markj, Scott Phillips <d.scott.phillips at intel.com>
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D20308
DeltaFile
+64-1usr.sbin/bhyve/gdb.c
+64-11 files

HardenedBSD/hardenedbsd 77a7a80sys/compat/linuxkpi/common/include/linux uaccess.h interrupt.h, sys/compat/linuxkpi/common/src linux_tasklet.c linux_compat.c

Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master:
  MFC r347596: LinuxKPI: Add context member to ww_mutex and bump FreeBSD version.
  MFC r347891: LinuxKPI: Add in_task macro.
  MFC r347843: LinuxKPI: Add group_leader member to struct task_struct.
  MFC r347852: LinuxKPI: Updates to tasklets for Linux 5.0.
  MFC r347837: LinuxKPI: Update access_ok macro for v5.0.

HardenedBSD/hardenedbsd f7324c7sys/arm64/conf HARDENEDBSD

HBSD: Enable NUMA by default on arm64

The ThunderX2 requires NUMA support in the kernel. FreeBSD isn't
confident that enabling NUMA for arm64 won't introduce regressions[1],
so let's punish our users by making them guinea pigs. We'll work with
upstream FreeBSD to coordinate and fix any reports we receive.

[1]: https://twitter.com/ed_maste/status/1132022760031555589

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>

HardenedBSD/hardenedbsd 6798617sys/fs/ext2fs ext2_inode.c, sys/fs/fuse fuse_io.c fuse_vnops.c

Remove "struct ucred*" argument from vtruncbuf

vtruncbuf takes a "struct ucred*" argument. AFAICT, it's been unused ever
since that function was first added in r34611. Remove it.  Also, remove some
"struct ucred" arguments from fuse and nfs functions that were only used by
vtruncbuf.

Reviewed by:    cem
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D20377

HardenedBSD/hardenedbsd 48ad08csys/powerpc/conf GENERIC64

Add snd_hda(4) to GENERIC64 used by powerpc64.

amd64 also has snd_hda(4) in GENERIC.

Approved by:    jhibbits (src committer), linimon (mentor)

HardenedBSD/hardenedbsd 60c18c4stand ficl.mk, stand/ficl loader.c

ficl pfopen: verify file

If the file is verified - do not allow write
otherwise do not allow read.

Add O_ACCMODE to stand.h

Reviewed by:    stevek, mindal_semihalf.com
MFC after:      3 days
Sponsored by:   Juniper Networks
Differential Revision:  https://reviews.freebsd.org/D20387

HardenedBSD/hardenedbsd 8035d20stand/common module.c, sys/arm/allwinner/clkng aw_clk_frac.c

Merge remote-tracking branch 'origin/hardened/current/master' into 
hardened/current/unstable

* origin/hardened/current/master: (56 commits)
  HBSD: Resolve merge conflict
  Fix FC-Tape bugs caused in part by r345008.
  Fix a corner case in demotion of kernel mappings.
  Modernize the MAKE_JUST_KERNELS hint in the top-level makefile.
  nanobsd: exclude .git (and .hg) in the same places we exclude .svn
  Restore IPV6_NEXTHOP option support that seem was partially broken since r286195.
  Add `missing` and `or-flush` options to "ipfw table <NAME> create" command to simplify 
firewall reloading.
  Correct the argument passed to g_eli_algo2str()
  amdgpio: small formatting cleanup
  amdgpio: fix reading status of input pins
  amdgpio: remove new line symbols from pin names
  Remove kgzip and kgzldr.
  cryptodeflate: Drop z_stream zbuf.state->dummy from SDT probe.
  bectl(8): Add a test for jail/unjail of numeric BE names
  Display CPU model in dmesg on mips targets
  Make uniqueifier match the module definition.
  jail_getid(3): validate jid string input
  Add support for writing to guest memory in the debug server.
  Add a constant for the LS config MSR on AMD CPUs.
  Initialize a variable to fix build with GCC.
  ...

HardenedBSD/hardenedbsd 6c1b864sys/conf newvers.sh

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-17sys/conf/newvers.sh
+0-171 files

HardenedBSD/hardenedbsd e9598a3stand/common module.c, sys/arm/allwinner/clkng aw_clk_frac.c

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master

Conflicts:
        sys/conf/newvers.sh (unresolved)

HardenedBSD/hardenedbsd 14d12a5sys/powerpc/conf GENERIC64

Make options MD_ROOT_MEM default on PPC64

Having this option enabled by default on PowerPC64 kernels makes
booting ISO images much easier when on PowerNV.

With it, the ISO may simply be given to the -i flag of kexec.
Better yet, the ISO may be loop mounted on PetitBoot and its
kernel may be used to load itself.

Without this option, booting ISOs on remote PPC64 machines usually
involve preparing a separate kernel, with this option enabled.

HardenedBSD/hardenedbsd c96cb1bsys/dev/isp isp.c isp_freebsd.c

Fix FC-Tape bugs caused in part by r345008.

The point of r345008 was to reset the Command Reference Number (CRN)
in some situations where a device stayed in the topology, but had
changed somehow.

This can include moving from a switch connection to a direct
connection or vice versa, or a device that temporarily goes away
and comes back.  (e.g. moving to a different switch port)

There were a couple of bugs in that change:
- We were reporting that a device had not changed whenever the
  Establish Image Pair bit was not set.  That is not quite correct.
  Instead, if the Establish Image Pair bit stays the same (set or
  not), the device hasn't changed in that way.

- We weren't setting PRLI Word0 in the port database when a new
  device arrived, so comparisons with the old value for the
  Establish Image Pair bit weren't really possible.  So, make sure
  PRLI Word0 is set in the port database for new devices.

- We were resetting the CRN whenever the Establish Image Pair bit
  was set for a device, even when the device had stayed the same
  and the value of the bit hadn't changed.  Now, only reset the
  CRN for devices that have changed, not devices that sayed the

    [31 lines not shown]

HardenedBSD/hardenedbsd b4ed659sys/amd64/amd64 pmap.c, sys/i386/i386 pmap.c

Fix a corner case in demotion of kernel mappings.

It is possible for the kernel mapping to be created with superpage by
directly installing pde using pmap_enter_2mpage() without filling the
corresponding page table page.  This can happen e.g. if the range is
already backed by reservation and vm_fault_soft_fast() conditions are
satisfied, which was observed on the pipe_map.

In this case, demotion must fill the page obtained from the pmap
radix, same as if the page is newly allocated.  Use PG_PROMOTED bit as
an indicator that the page is valid, instead of the wire count of the
page table page.

Since the PG_PROMOTED bit is set on pde when we leave TLB entries for
4k pages around, which in particular means that the ptes were filled,
it provides more correct indicator.  Note that pmap_protect_pde()
clears PG_PROMOTED, which handles the case when protection was changed
on the superpage without adjusting ptes.

Reported by:    pho
In collaboration with:  alc
Tested by:      alc, pho
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D20380

HardenedBSD/hardenedbsd 04fe9b5sys/compat/linuxkpi/common/include/linux ww_mutex.h, sys/sys param.h

MFC r347596:
LinuxKPI: Add context member to ww_mutex and bump FreeBSD version.

This patch is part of https://reviews.freebsd.org/D19565.

Reviewed by:    hps
Approved by:    imp (mentor), hps

HardenedBSD/hardenedbsd edfa7b9sys/compat/linuxkpi/common/include/linux preempt.h

MFC r347891:
LinuxKPI: Add in_task macro.

This patch is part of D19565

Reviewed by:    hps, bwidawsk
Approved by:    imp (mentor), hps
Obtained from:  bwidawsk

HardenedBSD/hardenedbsd 9497bb6sys/compat/linuxkpi/common/include/linux sched.h, sys/compat/linuxkpi/common/src linux_current.c

MFC r347843:
LinuxKPI: Add group_leader member to struct task_struct.

Assign self as group leader at creation to act as the only member of a
new process group.
Bump FreeBSD version.
This patch is part of D19565

Reviewed by:    hps
Approved by:    imp (mentor), hps

HardenedBSD/hardenedbsd 3c61ff2sys/compat/linuxkpi/common/include/linux interrupt.h, sys/compat/linuxkpi/common/src linux_tasklet.c

MFC r347852:
LinuxKPI: Updates to tasklets for Linux 5.0.

DRM drivers expect tasklets to have a counter for enable/disable calls.
Also, add a few more tasklet locking functions.
MFC also includes powerpc build fix from r347889.

This patch is part of D19565

Reviewed by:    hps
Approved by:    imp (mentor), hps

HardenedBSD/hardenedbsd 5748afashare/man/man9 DRIVER_MODULE.9, sys/modules Makefile

Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master:
  MFC r348002: Typo.
  MFC r346598: Enable Mellanox drivers (modules) on AArch64

HardenedBSD/hardenedbsd d44ad5e. Makefile

Modernize the MAKE_JUST_KERNELS hint in the top-level makefile.

It doesn't make sense to limit to -j12 anymore, build scalability
is better than it used to be.  Fold the hint into the description
of the universe target.

Reviewed by:    imp
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D20342
DeltaFile
+2-7Makefile
+2-71 files

HardenedBSD/hardenedbsd 663b428sys/compat/linuxkpi/common/include/linux uaccess.h, sys/compat/linuxkpi/common/src linux_compat.c

MFC r347837:
LinuxKPI: Update access_ok macro for v5.0.

Check LINUXKPI_VERSION macro for backwards compatibility.
It's recommended to update any drivers that depend on the older KPI
so we can deprecate < 5.0 code as we update to newer Linux version.
This patch is part of D19565

Reviewed by:    hps
Approved by:    imp (mentor), hps

HardenedBSD/hardenedbsd f633702tools/tools/nanobsd/dhcpd common, tools/tools/nanobsd/pcengines common.conf

nanobsd: exclude .git (and .hg) in the same places we exclude .svn

Allow support of other VCSes.  Note that two other nanobsd files already
had a similar case, excluding .git and .hg in addition to CVS and .svn.

Sponsored by:   The FreeBSD Foundation

HardenedBSD/hardenedbsd 4ca2a74share/man/man9 DRIVER_MODULE.9

MFC r348002:
Typo.

HardenedBSD/hardenedbsd ca44489sys/modules Makefile

MFC r346598: Enable Mellanox drivers (modules) on AArch64

PR:            237055
Submitted by:   Greg V <greg at unrelenting.technology>
DeltaFile
+17-19sys/modules/Makefile
+17-191 files

HardenedBSD/hardenedbsd ae744d4share/man/man5 src.conf.5, tools/build/mk OptionalObsoleteFiles.inc

HBSD: Resolve merge conflicts

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>