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/freebsd/12-stable/master' into hardened/12-stable/master

Conflicts:
        lib/libc/sys/procctl.2 (unresolved)
        sys/arm64/arm64/elf_machdep.c (unresolved)
        sys/x86/include/specialreg.h (unresolved)

MFC r358430, r359934-r359936, r359939, r359969, r360093

r358430:
dts: Update our copy for arm, arm64 and riscv dts to Linux 5.5

r359934:
dts: Import DTS from Linux 5.6

r359935:
allwinner: aw_thermal: Cope with DTS changes

The upstream DTS now include the thermal device node and the SID
calibration entry.
Update our driver to cope with this change and remove the DTB
overlays that aren't needed anymore.

X-MFC-With:     r359934

r359936:

    [27 lines not shown]

MFC r358430, r359934-r359936, r359939, r359969, r360093

r358430:
dts: Update our copy for arm, arm64 and riscv dts to Linux 5.5

r359934:
dts: Import DTS from Linux 5.6

r359935:
allwinner: aw_thermal: Cope with DTS changes

The upstream DTS now include the thermal device node and the SID
calibration entry.
Update our driver to cope with this change and remove the DTB
overlays that aren't needed anymore.

X-MFC-With:     r359934

r359936:

    [27 lines not shown]

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

Conflicts:
        lib/clang/llvm.build.mk (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        share/mk/src.opts.mk (unresolved)

Merge remote-tracking branch 'tor/freebsd/12-stable/master' into hardened/12-stable/master

Conflicts:
        sys/conf/newvers.sh (unresolved)
        sys/x86/x86/cpu_machdep.c (unresolved)

MFC r355187:

Import DTS files from Linux 5.4

MFC r355187:

Import DTS files from Linux 5.4

Merge ^/head r358400 through r358465.

Merge ^/head r358400 through r358465.

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

* freebsd/current/master:
  sy_call_t and systrace_args_func_t need to be visible to userspace.
  Do not load dtraceall.ko if dtrace.ko is already loaded.
  Fix standalone builds of systrace.ko after r357912.
  Clear systrace_args_func when systrace probes are disabled.
  Add a blocking counter KPI.
  Add Denverton UART PCI ID
  DTS: Update the device-tree files to Linux 5.5

dts: Update our copy for arm, arm64 and riscv dts to Linux 5.5

MFC after:      2 months

dts: Update our copy for arm, arm64 and riscv dts to Linux 5.5

MFC after:      2 months

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

Conflicts:
        gnu/lib/libgcc/Makefile (deleted)
        share/man/man5/src.conf.5 (unresolved)
        usr.bin/clang/lld/Makefile (unresolved)
        usr.sbin/rpc.statd/Makefile (unresolved)

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

* freebsd/current/master:
  Fix two races while handling nfsuserd daemon start/stop.
  Implement the ofw_bus_get_node method in the imx_gpio driver so that ofw_gpiobus can find its fdt metadata and instantiate child devices.
  Clarify name of Pau Casals (it's Catalonian) Get correct birthday (from Wikipedia).
  arm64: rockchip: rk3328: Add TSADC clocks
  arm64: rockchip: tsadc: Do not free the sysctl context is it wasn't created
  Import devicetree files from Linux 5.4
  Fix use-after-free in case of L2ARC prefetch failure.

Import DTS files from Linux 5.4

MFC after:      2 months

Import DTS files from Linux 5.4

MFC after:      2 months