HardenedBSD/src 34ab832contrib/binutils Makefile.in, contrib/terminus ter-u32n.bdf ter-u32b.bdf

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)
DeltaFile
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+52,834-0contrib/terminus/ter-u32n.bdf
+52,834-0contrib/terminus/ter-u32b.bdf
+0-49,485contrib/binutils/Makefile.in
+47,418-0contrib/terminus/ter-u28b.bdf
+47,418-0contrib/terminus/ter-u28n.bdf
+272,094-49,91725,491 files not shown
+3,013,181-3,285,38525,497 files

HardenedBSD/src 8a2b1d6sys/gnu/dts/arm tegra124-nyan-big-emc.dtsi dra7-l4.dtsi, sys/gnu/dts/arm64/qcom sdm845.dtsi sc7180.dtsi

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
DeltaFile
+0-6,651sys/gnu/dts/arm/tegra124-nyan-big-emc.dtsi
+0-4,651sys/gnu/dts/arm/dra7-l4.dtsi
+0-4,599sys/gnu/dts/arm64/qcom/sdm845.dtsi
+0-3,589sys/gnu/dts/arm64/qcom/sc7180.dtsi
+0-3,340sys/gnu/dts/arm64/renesas/r8a77951.dtsi
+0-2,982sys/gnu/dts/arm64/renesas/r8a77960.dtsi
+0-25,8123,654 files not shown
+191-927,6753,660 files

HardenedBSD/src 7c84a74sys/gnu/dts/arm tegra124-nyan-big-emc.dtsi dra7-l4.dtsi, sys/gnu/dts/arm64/qcom sdm845.dtsi sc7180.dtsi

Remove the old dts imported tree.

The new one is in sys/contrib/device-tree
DeltaFile
+0-6,651sys/gnu/dts/arm/tegra124-nyan-big-emc.dtsi
+0-4,651sys/gnu/dts/arm/dra7-l4.dtsi
+0-4,599sys/gnu/dts/arm64/qcom/sdm845.dtsi
+0-3,589sys/gnu/dts/arm64/qcom/sc7180.dtsi
+0-3,340sys/gnu/dts/arm64/renesas/r8a77951.dtsi
+0-2,982sys/gnu/dts/arm64/renesas/r8a77960.dtsi
+0-25,8123,627 files not shown
+0-927,6313,633 files

HardenedBSD/src c7ce6b0contrib/libstdc++ configure, lib/clang/liblldb LLDBWrapLua.cpp

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit
DeltaFile
+0-111,817contrib/libstdc++/configure
+72,183-0lib/clang/liblldb/LLDBWrapLua.cpp
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+31,726-39,305share/ctypedef/ja_JP.eucJP.src
+59,521-0sys/contrib/dev/iwm/iwm-9000-34.fw.uu
+59,517-0sys/contrib/dev/iwm/iwm-9260-34.fw.uu
+294,537-151,55460,534 files not shown
+10,288,584-10,879,88160,540 files

HardenedBSD/src f86c9ebcontrib/llvm-project/llvm/lib/Analysis/models/inliner saved_model.pbtxt, contrib/sqlite3 sqlite3.c

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)
DeltaFile
+95,073-589share/man/man5/src.conf.5
+35,376-0sys/contrib/openzfs/include/sys/u8_textprep_data.h
+32,634-0contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+27,826-0sys/contrib/openzfs/module/zstd/lib/zstd.c
+9,980-9,250contrib/sqlite3/sqlite3.c
+10,609-0sys/contrib/openzfs/module/zfs/arc.c
+211,498-9,83918,438 files not shown
+1,674,079-664,95318,444 files

HardenedBSD/src 440cec3 (r364173)sbin/ifconfig sfp.c, sys/dev/usb/misc cp2112.c

MFH

Sponsored by:   Rubicon Communications, LLC (netgate.com)
DeltaFile
+1,459-0sys/dev/usb/misc/cp2112.c
+1,173-0sys/gnu/dts/arm64/mediatek/mt8173-elm.dtsi
+85-929sbin/ifconfig/sfp.c
+885-78sys/gnu/dts/arm64/qcom/sc7180.dtsi
+768-0sys/gnu/dts/arm/exynos4210-i9100.dts
+767-0sys/gnu/dts/arm/at91-sama5d2_icp.dts
+5,137-1,0071,018 files not shown
+39,821-10,5281,024 files

HardenedBSD/src 576c0d6sbin/ifconfig sfp.c, sys/dev/usb/misc cp2112.c

MFH

Sponsored by:   Rubicon Communications, LLC (netgate.com)
DeltaFile
+1,459-0sys/dev/usb/misc/cp2112.c
+1,173-0sys/gnu/dts/arm64/mediatek/mt8173-elm.dtsi
+85-929sbin/ifconfig/sfp.c
+885-78sys/gnu/dts/arm64/qcom/sc7180.dtsi
+768-0sys/gnu/dts/arm/exynos4210-i9100.dts
+767-0sys/gnu/dts/arm/at91-sama5d2_icp.dts
+5,137-1,0071,018 files not shown
+39,821-10,5281,024 files

HardenedBSD/src e383ec7 (r363987)sys/dev/usb/misc cp2112.c, sys/gnu/dts/arm exynos4210-i9100.dts at91-sama5d2_icp.dts

Merge ^/head r363739 through r363986.
DeltaFile
+1,381-0sys/dev/usb/misc/cp2112.c
+1,173-0sys/gnu/dts/arm64/mediatek/mt8173-elm.dtsi
+885-78sys/gnu/dts/arm64/qcom/sc7180.dtsi
+768-0sys/gnu/dts/arm/exynos4210-i9100.dts
+767-0sys/gnu/dts/arm/at91-sama5d2_icp.dts
+731-0sys/gnu/dts/arm/am5729-beagleboneai.dts
+5,705-78850 files not shown
+34,663-8,318856 files

HardenedBSD/src d2e3fe2sys/dev/usb/misc cp2112.c, sys/gnu/dts/arm exynos4210-i9100.dts at91-sama5d2_icp.dts

Merge ^/head r363739 through r363986.
DeltaFile
+1,381-0sys/dev/usb/misc/cp2112.c
+1,173-0sys/gnu/dts/arm64/mediatek/mt8173-elm.dtsi
+885-78sys/gnu/dts/arm64/qcom/sc7180.dtsi
+768-0sys/gnu/dts/arm/exynos4210-i9100.dts
+767-0sys/gnu/dts/arm/at91-sama5d2_icp.dts
+731-0sys/gnu/dts/arm/am5729-beagleboneai.dts
+5,705-78850 files not shown
+34,663-8,318856 files

HardenedBSD/src 319f322sys/gnu/dts/arm exynos4210-i9100.dts at91-sama5d2_icp.dts, sys/gnu/dts/arm64/mediatek mt8173-elm.dtsi

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]
DeltaFile
+1,173-0sys/gnu/dts/arm64/mediatek/mt8173-elm.dtsi
+885-78sys/gnu/dts/arm64/qcom/sc7180.dtsi
+768-0sys/gnu/dts/arm/exynos4210-i9100.dts
+767-0sys/gnu/dts/arm/at91-sama5d2_icp.dts
+731-0sys/gnu/dts/arm/am5729-beagleboneai.dts
+637-29sys/gnu/dts/arm/stm32mp15-pinctrl.dtsi
+4,961-107583 files not shown
+28,823-6,373589 files

HardenedBSD/src d6502e7 (r363853)sys/gnu/dts/arm exynos4210-i9100.dts at91-sama5d2_icp.dts, sys/gnu/dts/arm64/mediatek mt8173-elm.dtsi

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

MFC after:      2 months
DeltaFile
+1,173-0sys/gnu/dts/arm64/mediatek/mt8173-elm.dtsi
+885-78sys/gnu/dts/arm64/qcom/sc7180.dtsi
+768-0sys/gnu/dts/arm/exynos4210-i9100.dts
+767-0sys/gnu/dts/arm/at91-sama5d2_icp.dts
+731-0sys/gnu/dts/arm/am5729-beagleboneai.dts
+637-29sys/gnu/dts/arm/stm32mp15-pinctrl.dtsi
+4,961-107565 files not shown
+28,596-6,240571 files

HardenedBSD/src 817d895sys/gnu/dts/arm exynos4210-i9100.dts at91-sama5d2_icp.dts, sys/gnu/dts/arm64/mediatek mt8173-elm.dtsi

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

MFC after:      2 months
DeltaFile
+1,173-0sys/gnu/dts/arm64/mediatek/mt8173-elm.dtsi
+885-78sys/gnu/dts/arm64/qcom/sc7180.dtsi
+768-0sys/gnu/dts/arm/exynos4210-i9100.dts
+767-0sys/gnu/dts/arm/at91-sama5d2_icp.dts
+731-0sys/gnu/dts/arm/am5729-beagleboneai.dts
+637-29sys/gnu/dts/arm/stm32mp15-pinctrl.dtsi
+4,961-107565 files not shown
+28,596-6,240571 files

HardenedBSD/src dd034b6contrib/sqlite3 sqlite3.c, contrib/subversion/subversion/libsvn_subr/utf8proc utf8proc_data.c

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

Conflicts:
        Makefile.inc1 (unresolved)
        lib/csu/amd64/Makefile (unresolved)
        lib/csu/i386/Makefile (unresolved)
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+31,726-39,305share/ctypedef/ja_JP.eucJP.src
+11,659-6,934contrib/sqlite3/sqlite3.c
+7,544-7,544contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
+9,480-0sys/dev/ice/ice_hw_autogen.h
+8,000-0sys/dev/ice/ice_lib.c
+5,910-1,341sys/netinet/tcp_stacks/rack.c
+74,319-55,1245,522 files not shown
+530,662-214,3455,528 files

HardenedBSD/src bae4655sys/gnu/dts/arm tegra124-nyan-big-emc.dtsi, sys/gnu/dts/arm64/qcom msm8996.dtsi

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)
DeltaFile
+6,250-1,623sys/gnu/dts/arm/tegra124-nyan-big-emc.dtsi
+3,339-0sys/gnu/dts/arm64/renesas/r8a77951.dtsi
+0-3,266sys/gnu/dts/arm64/renesas/r8a7795.dtsi
+1,571-1,655sys/gnu/dts/arm64/qcom/msm8996.dtsi
+2,972-0sys/gnu/dts/arm64/renesas/r8a77960.dtsi
+0-2,911sys/gnu/dts/arm64/renesas/r8a7796.dtsi
+14,132-9,4551,002 files not shown
+79,901-28,4541,008 files

HardenedBSD/src 39be8aa (r362408)sys/gnu/dts/arm tegra124-nyan-big-emc.dtsi, sys/gnu/dts/arm64/qcom msm8996.dtsi

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]
DeltaFile
+6,250-1,623sys/gnu/dts/arm/tegra124-nyan-big-emc.dtsi
+3,339-0sys/gnu/dts/arm64/renesas/r8a77951.dtsi
+0-3,266sys/gnu/dts/arm64/renesas/r8a7795.dtsi
+1,571-1,655sys/gnu/dts/arm64/qcom/msm8996.dtsi
+2,972-0sys/gnu/dts/arm64/renesas/r8a77960.dtsi
+0-2,911sys/gnu/dts/arm64/renesas/r8a7796.dtsi
+14,132-9,455954 files not shown
+78,444-28,167960 files

HardenedBSD/src ed93743sys/gnu/dts/arm tegra124-nyan-big-emc.dtsi, sys/gnu/dts/arm64/qcom msm8996.dtsi

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]
DeltaFile
+6,250-1,623sys/gnu/dts/arm/tegra124-nyan-big-emc.dtsi
+3,339-0sys/gnu/dts/arm64/renesas/r8a77951.dtsi
+0-3,266sys/gnu/dts/arm64/renesas/r8a7795.dtsi
+1,571-1,655sys/gnu/dts/arm64/qcom/msm8996.dtsi
+2,972-0sys/gnu/dts/arm64/renesas/r8a77960.dtsi
+0-2,911sys/gnu/dts/arm64/renesas/r8a7796.dtsi
+14,132-9,455954 files not shown
+78,444-28,167960 files

HardenedBSD/src 7bd80ffcontrib/apr configure, contrib/sqlite3 sqlite3.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/tmpfs_extattr
DeltaFile
+7,544-7,544contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
+2,937-1,772contrib/sqlite3/sqlite3.c
+3,099-779contrib/subversion/subversion/libsvn_client/conflicts.c
+2,691-1,104contrib/apr/configure
+1,769-798contrib/subversion/configure
+621-1,654sys/contrib/edk2/Include/Library/BaseLib.h
+18,661-13,6511,617 files not shown
+98,710-45,7421,623 files

HardenedBSD/src 7bb5c83sys/gnu/dts/arm imx6qdl-pico.dtsi, sys/gnu/dts/arm64/freescale imx8mp-pinfunc.h imx8mp.dtsi

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

* freebsd/current/master:
  Makefile.inc1: remove stale dependency cleanup from 2018
  dts: patch the am33xx dts for upcoming clock support
  Import DTS files from Linux 5.7
  Also pass SKEIN_USE_ASM to the assembler, via AFLAGS
  librtld_db: Handle anonymous mappings below the first file mapping.
  skein_block_asm.S: use #ifdef not .ifdef, for Clang IAS
  zfsbootcfg: use vfs.root.mountfrom and update nextboot on every vdev
  Apply C SKEIN_LOOP setting only to skein_block.c
  Belatedly bump .Dd for r361783
  geom_label: Use provider aliasing to alias upstream geoms
  geom: Don't re-add duplicate aliases
DeltaFile
+1,097-0sys/gnu/dts/arm64/rockchip/rk3399-pinebook-pro.dts
+931-0sys/gnu/dts/arm64/freescale/imx8mp-pinfunc.h
+652-20sys/gnu/dts/arm64/qcom/sdm845.dtsi
+663-0sys/gnu/dts/arm64/mediatek/mt8516-pinfunc.h
+654-0sys/gnu/dts/arm64/freescale/imx8mp.dtsi
+617-0sys/gnu/dts/arm/imx6qdl-pico.dtsi
+4,614-20518 files not shown
+20,282-2,887524 files

HardenedBSD/src 62352ec (r361848)sys/gnu/dts/arm imx6qdl-pico.dtsi, sys/gnu/dts/arm64/freescale imx8mp-pinfunc.h imx8mp.dtsi

dts: Update our copy to be in sync with Linux 5.7

MFC after:      2 months
DeltaFile
+1,097-0sys/gnu/dts/arm64/rockchip/rk3399-pinebook-pro.dts
+931-0sys/gnu/dts/arm64/freescale/imx8mp-pinfunc.h
+652-20sys/gnu/dts/arm64/qcom/sdm845.dtsi
+663-0sys/gnu/dts/arm64/mediatek/mt8516-pinfunc.h
+654-0sys/gnu/dts/arm64/freescale/imx8mp.dtsi
+617-0sys/gnu/dts/arm/imx6qdl-pico.dtsi
+4,614-20508 files not shown
+20,113-2,832514 files

HardenedBSD/src e2f72casys/gnu/dts/arm imx6qdl-pico.dtsi, sys/gnu/dts/arm64/freescale imx8mp-pinfunc.h imx8mp.dtsi

dts: Update our copy to be in sync with Linux 5.7

MFC after:      2 months
DeltaFile
+1,097-0sys/gnu/dts/arm64/rockchip/rk3399-pinebook-pro.dts
+931-0sys/gnu/dts/arm64/freescale/imx8mp-pinfunc.h
+652-20sys/gnu/dts/arm64/qcom/sdm845.dtsi
+663-0sys/gnu/dts/arm64/mediatek/mt8516-pinfunc.h
+654-0sys/gnu/dts/arm64/freescale/imx8mp.dtsi
+617-0sys/gnu/dts/arm/imx6qdl-pico.dtsi
+4,614-20508 files not shown
+20,113-2,832514 files

HardenedBSD/src 369b257contrib/bsnmp/tests catch.hpp, lib/clang/liblldb LLDBWrapLua.cpp

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+71,334-0lib/clang/liblldb/LLDBWrapLua.cpp
+17,597-0contrib/bsnmp/tests/catch.hpp
+9,976-0lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+9,909-0lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+8,662-0lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+0-4,672secure/lib/libcrypto/amd64/sha256-mb-x86_64.S
+117,478-4,6724,240 files not shown
+355,626-132,0804,246 files

HardenedBSD/src c8bbb83sys/gnu/dts/arm64/qcom msm8996.dtsi sc7180.dtsi, sys/gnu/dts/arm64/renesas r8a7795.dtsi r8a77951.dtsi

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

* freebsd/current/master:
  Remove bogus use of useracc() in (clock_)nanosleep.
  Centralize compatability translation macros.
  modules: dtb: allwinner: Remove non existant files
  allwinner: aw_thermal: Cope with DTS changes
  files: Add mmc_fdt_helpers for mmccam enabled config
  sysent: re-roll after r359930
  Mark closefrom(2) COMPAT12, reimplement in libc to wrap close_range
  Import DTS files from Linux 5.6
  arm: dwmmc: Use mmc_fdt_helpers
  Improve the TCP blackhole detection. The principle is to reduce the MSS in two steps and try each candidate two times. However, if two candidates are the same (which is the case in TCP/IPv6), this candidate was tested four times. This patch ensures that each candidate actually reduced the MSS and is only tested 2 times. This reduces the time window of missclassifying a temporary outage as an MTU issue.
  arm: allwinner: aw_mmc: Use the mmc_fdt_helper
  Those functions are here to help fdt mmc controller drivers to parse the dts to find the supported speeds and the regulators. Not all DTS have every settings properly defined so host controller will still have to add some caps themselves. It also add a mmc_fdt_gpio_setup function which will read the cd-gpios property and register it as the CD pin. If the pin support interrupts one will be registered and the cd_helper function will be called. If the pin doesn't support interrupts the internal taskqueue will poll for change and call the same cd_helper function. mmc_fdt_gpio_setup will also parse the wp-gpio property and MMC drivers can know the write-protect pin value by calling the mmc_fdt_gpio_get_readonly function.
  Make sonewconn() overflow messages have per-socket rate-limits and values.
DeltaFile
+0-3,339sys/gnu/dts/arm64/renesas/r8a7795.dtsi
+3,339-0sys/gnu/dts/arm64/renesas/r8a77951.dtsi
+1,571-1,659sys/gnu/dts/arm64/qcom/msm8996.dtsi
+2,972-0sys/gnu/dts/arm64/renesas/r8a77960.dtsi
+0-2,972sys/gnu/dts/arm64/renesas/r8a7796.dtsi
+2,187-0sys/gnu/dts/arm64/qcom/sc7180.dtsi
+10,069-7,970648 files not shown
+42,800-20,096654 files

HardenedBSD/src 211b4e4 (r359934)sys/gnu/dts/arm64/qcom msm8996.dtsi sc7180.dtsi, sys/gnu/dts/arm64/renesas r8a77951.dtsi r8a7795.dtsi

dts: Import DTS from Linux 5.6
DeltaFile
+3,339-0sys/gnu/dts/arm64/renesas/r8a77951.dtsi
+0-3,339sys/gnu/dts/arm64/renesas/r8a7795.dtsi
+1,571-1,659sys/gnu/dts/arm64/qcom/msm8996.dtsi
+0-2,972sys/gnu/dts/arm64/renesas/r8a7796.dtsi
+2,972-0sys/gnu/dts/arm64/renesas/r8a77960.dtsi
+2,187-0sys/gnu/dts/arm64/qcom/sc7180.dtsi
+10,069-7,970589 files not shown
+41,963-19,648595 files

HardenedBSD/src e3f3d28sys/gnu/dts/arm64/qcom msm8996.dtsi sc7180.dtsi, sys/gnu/dts/arm64/renesas r8a77951.dtsi r8a7795.dtsi

dts: Import DTS from Linux 5.6
DeltaFile
+3,339-0sys/gnu/dts/arm64/renesas/r8a77951.dtsi
+0-3,339sys/gnu/dts/arm64/renesas/r8a7795.dtsi
+1,571-1,659sys/gnu/dts/arm64/qcom/msm8996.dtsi
+2,972-0sys/gnu/dts/arm64/renesas/r8a77960.dtsi
+0-2,972sys/gnu/dts/arm64/renesas/r8a7796.dtsi
+2,187-0sys/gnu/dts/arm64/qcom/sc7180.dtsi
+10,069-7,970589 files not shown
+41,963-19,648595 files

HardenedBSD/src 70f001fcontrib/gcc ChangeLog-2004 ChangeLog-2003, contrib/libstdc++ configure

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)
DeltaFile
+0-111,817contrib/libstdc++/configure
+0-47,880contrib/gcc/ChangeLog-2004
+0-37,862contrib/gcc/ChangeLog-2003
+0-35,988contrib/gcc/ChangeLog-2002
+0-35,909contrib/gcc/ChangeLog-2005
+0-33,645contrib/gcc/ChangeLog-2001
+0-303,10113,209 files not shown
+569,809-3,319,09613,215 files

HardenedBSD/src 3757b01contrib/ntp CommitLog, contrib/ntp/ntpd ntp_parser.c ntp_keyword.h

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)
DeltaFile
+3,435-12contrib/ntp/CommitLog
+1,498-1,346contrib/ntp/ntpd/ntp_parser.c
+1,126-1,537sys/arm64/rockchip/clk/rk3399_cru.c
+65-2,394sys/gnu/dts/arm64/amlogic/meson-g12a.dtsi
+2,435-0sys/gnu/dts/arm64/amlogic/meson-g12-common.dtsi
+1,076-1,022contrib/ntp/ntpd/ntp_keyword.h
+9,635-6,311776 files not shown
+51,052-15,309782 files

HardenedBSD/src 22e68f4 (r358636)sys/gnu/dts/arm aspeed-g6-pinctrl.dtsi aspeed-bmc-opp-mihawk.dts, sys/gnu/dts/arm64/amlogic meson-g12a.dtsi meson-g12-common.dtsi

MFC r355187:

Import DTS files from Linux 5.4
DeltaFile
+65-2,394sys/gnu/dts/arm64/amlogic/meson-g12a.dtsi
+2,435-0sys/gnu/dts/arm64/amlogic/meson-g12-common.dtsi
+1,154-0sys/gnu/dts/arm/aspeed-g6-pinctrl.dtsi
+918-0sys/gnu/dts/arm/aspeed-bmc-opp-mihawk.dts
+841-0sys/gnu/dts/arm64/marvell/armada-3720-turris-mox.dts
+758-0sys/gnu/dts/arm64/freescale/imx8mn.dtsi
+6,171-2,394454 files not shown
+29,880-7,317460 files

HardenedBSD/src e69486asys/gnu/dts/arm aspeed-g6-pinctrl.dtsi aspeed-bmc-opp-mihawk.dts, sys/gnu/dts/arm64/amlogic meson-g12a.dtsi meson-g12-common.dtsi

MFC r355187:

Import DTS files from Linux 5.4
DeltaFile
+65-2,394sys/gnu/dts/arm64/amlogic/meson-g12a.dtsi
+2,435-0sys/gnu/dts/arm64/amlogic/meson-g12-common.dtsi
+1,154-0sys/gnu/dts/arm/aspeed-g6-pinctrl.dtsi
+918-0sys/gnu/dts/arm/aspeed-bmc-opp-mihawk.dts
+841-0sys/gnu/dts/arm64/marvell/armada-3720-turris-mox.dts
+758-0sys/gnu/dts/arm64/freescale/imx8mn.dtsi
+6,171-2,394454 files not shown
+29,880-7,317460 files

HardenedBSD/src 91019ea (r358466)contrib/gcc ChangeLog-2004 ChangeLog-2003

Merge ^/head r358400 through r358465.
DeltaFile
+0-47,880contrib/gcc/ChangeLog-2004
+0-37,862contrib/gcc/ChangeLog-2003
+0-35,988contrib/gcc/ChangeLog-2002
+0-35,909contrib/gcc/ChangeLog-2005
+0-33,645contrib/gcc/ChangeLog-2001
+0-32,124contrib/gcc/ChangeLog-2000
+0-223,4082,423 files not shown
+39,039-1,813,7352,429 files

HardenedBSD/src de05408contrib/gcc ChangeLog-2004 ChangeLog-2003

Merge ^/head r358400 through r358465.
DeltaFile
+0-47,880contrib/gcc/ChangeLog-2004
+0-37,862contrib/gcc/ChangeLog-2003
+0-35,988contrib/gcc/ChangeLog-2002
+0-35,909contrib/gcc/ChangeLog-2005
+0-33,645contrib/gcc/ChangeLog-2001
+0-32,124contrib/gcc/ChangeLog-2000
+0-223,4082,423 files not shown
+39,039-1,813,7352,429 files