BSD Commit Log Search

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)
        tools/build/options/WITH_OFED_EXTRA (deleted)

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

* freebsd/current/main:
  lualoader: use floor division to get correct type
  cat: Fix potential memory leak
  Add 'tmp' to the list of FILESYSTEMS dependencies.  Some scripts that depend on FILESYSTEMS run mktemp(1).  For systems that have read-only root this is broken until memory disk based /tmp is instantiated.  At least 'os-release' and 'motd' are subject to this problem.
  Revert 97ec6eba653a07.  There shouldn't be a dependency of 'tmp' on remote filesystems.  Discussed this with Brooks and he can't find evidence that provoked the change in 2005.  If anything gets broken I will fix it in a different way, not via rc sequence change.
  cat: capsicumize it
  Extract the logic from pmap_kextract
  Remove the old dts imported tree.
  Switch to the new device-tree vendor tree
  gpiokeys: Use the new device-tree vendor include
  arm64: Directly use #include <dt-binding/...>
  Re-apply f81b2b9a8abd to the new device-tree import
  Revert upstream commit 27c90e5e48d0

Remove the old dts imported tree.

The new one is in sys/contrib/device-tree

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        share/mk/src.opts.mk (unresolved)
        share/mk/sys.mk (unresolved)

MFH

Sponsored by:   Rubicon Communications, LLC (netgate.com)

MFH

Sponsored by:   Rubicon Communications, LLC (netgate.com)

Merge ^/head r363739 through r363986.

Merge ^/head r363739 through r363986.

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

* freebsd/current/master:
  devinfo: add man page links
  devinfo: fix memory leak on error paths
  Remove unneeded cast to struct iommu_domain *.
  Add a few macroses for conversion between DMAR unit, domain, ctx and IOMMU unit, domain, ctx.
  rms: fix typo: bitmamp -> bitmap
  mmccam: Hold the periph during init
  mmcam: Use a static length sbuf buffer
  mmccam: mmc_xpt: We're only interested about losing the device
  cache: factor away failed vexec handling
  cache: assorted tidy ups
  cache: factor away lockless dot lookup and add missing stat + sdt probe
  vfs: add vfs_op_thread_enter/exit _crit variants
  cache: add missing numcache detrement on insertion failure
  rms: add a comment explaining performance deficiencies of write locking
  Remove extra memset() left after r342388.
  Import DTS from Linux 5.8

    [4 lines not shown]

Import DTS files for arm, arm64, riscv from Linux 5.8

MFC after:      2 months

Import DTS files for arm, arm64, riscv from Linux 5.8

MFC after:      2 months