HardenedBSD/src 6d5a643contrib/llvm-project/libcxx/include regex, contrib/llvm-project/libcxx/src locale.cpp

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

Conflicts:
        cddl/lib/libnvpair/Makefile (unresolved)
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+20,997-20,920contrib/llvm-project/llvm/lib/Support/UnicodeNameToCodepointGenerated.cpp
+8,621-6,629contrib/xz/ChangeLog
+4,499-5,385contrib/llvm-project/libcxx/src/locale.cpp
+3,748-4,889contrib/llvm-project/libcxx/include/regex
+7,713-0contrib/unbound/util/configparser.c
+7,627-0contrib/unbound/util/configlexer.c
+53,205-37,82315,239 files not shown
+1,349,003-1,091,48015,245 files

HardenedBSD/src 48b7635contrib/unbound/util configparser.c configlexer.c, sys/contrib/device-tree/src/arm tegra124-nyan-big-emc.dtsi tegra30-ouya.dts

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/hbsdcontrol-v2
DeltaFile
+7,713-0contrib/unbound/util/configparser.c
+7,627-0contrib/unbound/util/configlexer.c
+0-6,694sys/contrib/device-tree/src/arm/tegra124-nyan-big-emc.dtsi
+6,694-0sys/contrib/device-tree/src/arm/nvidia/tegra124-nyan-big-emc.dtsi
+0-4,795sys/contrib/device-tree/src/arm/tegra30-ouya.dts
+4,795-0sys/contrib/device-tree/src/arm/nvidia/tegra30-ouya.dts
+26,829-11,4896,649 files not shown
+808,220-750,5096,655 files

HardenedBSD/src 1cb6c44sys/contrib/device-tree/src/arm tegra124-nyan-big-emc.dtsi tegra30-ouya.dts, sys/contrib/device-tree/src/arm/nvidia tegra124-nyan-big-emc.dtsi tegra30-ouya.dts

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-6,694sys/contrib/device-tree/src/arm/tegra124-nyan-big-emc.dtsi
+6,694-0sys/contrib/device-tree/src/arm/nvidia/tegra124-nyan-big-emc.dtsi
+4,795-0sys/contrib/device-tree/src/arm/nvidia/tegra30-ouya.dts
+0-4,795sys/contrib/device-tree/src/arm/tegra30-ouya.dts
+4,606-0sys/contrib/device-tree/src/arm/ti/omap/dra7-l4.dtsi
+0-4,606sys/contrib/device-tree/src/arm/dra7-l4.dtsi
+16,095-16,0956,259 files not shown
+782,356-745,8046,265 files

HardenedBSD/src f126890sys/contrib/device-tree/src/arm tegra124-nyan-big-emc.dtsi tegra30-ouya.dts, sys/contrib/device-tree/src/arm/nvidia tegra124-nyan-big-emc.dtsi tegra30-ouya.dts

Import device-tree files from Linux 6.5

Sponsored by:   Beckhoff Automation GmbH & Co. KG
DeltaFile
+0-6,694sys/contrib/device-tree/src/arm/tegra124-nyan-big-emc.dtsi
+6,694-0sys/contrib/device-tree/src/arm/nvidia/tegra124-nyan-big-emc.dtsi
+0-4,795sys/contrib/device-tree/src/arm/tegra30-ouya.dts
+4,795-0sys/contrib/device-tree/src/arm/nvidia/tegra30-ouya.dts
+4,606-0sys/contrib/device-tree/src/arm/ti/omap/dra7-l4.dtsi
+0-4,606sys/contrib/device-tree/src/arm/dra7-l4.dtsi
+16,095-16,0956,248 files not shown
+782,298-745,7016,254 files

HardenedBSD/src 6205c0ccontrib/sqlite3 shell.c sqlite3.c, contrib/xz ChangeLog

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+57,309-23,497sys/dev/bnxt/hsi_struct_def.h
+6,176-5,121contrib/xz/ChangeLog
+0-6,260sys/dev/cp/cpddk.c
+3,941-1,156contrib/sqlite3/shell.c
+3,365-1,532contrib/sqlite3/sqlite3.c
+0-4,338sys/dev/ce/tau32-ddk.c
+70,791-41,9045,321 files not shown
+286,050-103,2935,327 files

HardenedBSD/src fd3f374sys/contrib/device-tree/src/arm qcom-msm8974.dtsi omap3xxx-clocks.dtsi, sys/contrib/device-tree/src/arm64/freescale imx8mp-verdin.dtsi

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master
DeltaFile
+1,632-1,405sys/contrib/device-tree/src/arm/qcom-msm8974.dtsi
+2,576-32sys/contrib/device-tree/src/arm64/qcom/sm8450.dtsi
+2,147-0sys/contrib/device-tree/src/arm64/qcom/sc8280xp.dtsi
+1,046-918sys/contrib/device-tree/src/arm/omap3xxx-clocks.dtsi
+1,561-0sys/contrib/device-tree/src/arm/imxrt1170-pinfunc.h
+1,388-0sys/contrib/device-tree/src/arm64/freescale/imx8mp-verdin.dtsi
+10,350-2,3552,680 files not shown
+133,203-17,3882,686 files

HardenedBSD/src b97ee26sys/contrib/device-tree/src/arm imxrt1170-pinfunc.h imx7-colibri.dtsi, sys/contrib/device-tree/src/arm64/exynos exynosautov9.dtsi

Import device-tree files from Linux 6.0

Sponsored by:   Beckhoff Automation GmbH & Co. KG
DeltaFile
+2,147-0sys/contrib/device-tree/src/arm64/qcom/sc8280xp.dtsi
+1,561-0sys/contrib/device-tree/src/arm/imxrt1170-pinfunc.h
+1,158-12sys/contrib/device-tree/src/arm64/exynos/exynosautov9.dtsi
+1,030-0sys/contrib/device-tree/src/arm64/freescale/imx8mp-dhcom-som.dtsi
+959-0sys/contrib/device-tree/src/arm64/mediatek/mt8192-asurada.dtsi
+539-337sys/contrib/device-tree/src/arm/imx7-colibri.dtsi
+7,394-3491,702 files not shown
+60,962-7,6041,708 files

HardenedBSD/src d429ecacontrib/apr configure, contrib/apr-util configure

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+0-32,465contrib/apr/configure
+31,999-0contrib/arm-optimized-routines/math/test/traces/sincosf.txt
+0-30,335contrib/subversion/configure
+0-25,340contrib/apr-util/configure
+0-16,709contrib/subversion/subversion/libsvn_wc/wc_db.c
+16,000-0contrib/arm-optimized-routines/math/test/traces/exp.txt
+47,999-104,84910,834 files not shown
+702,320-1,092,88210,840 files

HardenedBSD/src 0a8ed79sys/contrib/device-tree/src/arm tegra30-ouya.dts aspeed-bmc-ibm-everest.dts, sys/contrib/device-tree/src/arm64/qcom sm8350.dtsi sm8250.dtsi

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

* freebsd/current/main:
  build.7: remove documentation of "make update"
  Import device-tree files from Linux 5.13
  Import device-tree files from Linux 5.12
  hz.9: update stathz for current usage
  Switch the order of the ID_AA64PFR1_EL1 fields
  fortune: correct documentation of default FORTUNE_PATH.
  Import devicetree files from Linux 5.11
DeltaFile
+4,527-0sys/contrib/device-tree/src/arm/tegra30-ouya.dts
+2,332-0sys/contrib/device-tree/src/arm/aspeed-bmc-ibm-everest.dts
+2,122-0sys/contrib/device-tree/src/arm64/qcom/sm8350.dtsi
+1,757-330sys/contrib/device-tree/src/arm64/qcom/sm8250.dtsi
+1,510-2sys/contrib/device-tree/src/arm64/qcom/sm8150.dtsi
+1,135-0sys/contrib/device-tree/src/arm/nuvoton-npcm730-gbs.dts
+13,383-3322,391 files not shown
+153,131-14,2822,397 files

HardenedBSD/src 5def4c4sys/contrib/device-tree/src/arm tegra30-ouya.dts exynos4412-p4note.dtsi, sys/contrib/device-tree/src/arm64/qcom sm8250.dtsi sm8150.dtsi

Import device-tree files from Linux 5.11

Sponsored by:   Diablotin Systems
DeltaFile
+4,519-0sys/contrib/device-tree/src/arm/tegra30-ouya.dts
+1,402-27sys/contrib/device-tree/src/arm64/qcom/sm8250.dtsi
+1,132-0sys/contrib/device-tree/src/arm/exynos4412-p4note.dtsi
+1,052-0sys/contrib/device-tree/src/arm/nuvoton-npcm750-runbmc-olympus.dts
+951-16sys/contrib/device-tree/src/arm/nuvoton-common-npcm7xx.dtsi
+959-0sys/contrib/device-tree/src/arm64/qcom/sm8150.dtsi
+10,015-431,813 files not shown
+103,800-10,5011,819 files

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 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 123aebdsys/contrib/device-tree/src/arm tegra124-nyan-big-emc.dtsi dra7-l4.dtsi, sys/contrib/device-tree/src/arm64/qcom sdm845.dtsi sc7180.dtsi

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

* freebsd/current/main:
  riscv: fix kernel build
  Unify Intel CODEC naming.
  Add Intel Gemini Lake AHCI ID.
  arm: arm64: Directly use #include <dt-binding/...>
  arm64: Add the dts include directory to the includes dir
  loader: do not update palette in text mode (real fix)
  Import device tree files from Linux 5.9
DeltaFile
+6,651-0sys/contrib/device-tree/src/arm/tegra124-nyan-big-emc.dtsi
+5,116-0sys/contrib/device-tree/src/arm64/qcom/sdm845.dtsi
+4,647-0sys/contrib/device-tree/src/arm/dra7-l4.dtsi
+4,087-0sys/contrib/device-tree/src/arm64/qcom/sc7180.dtsi
+3,340-0sys/contrib/device-tree/src/arm64/renesas/r8a77951.dtsi
+2,982-0sys/contrib/device-tree/src/arm64/renesas/r8a77960.dtsi
+26,823-08,174 files not shown
+1,302,917-368,180 files

HardenedBSD/src c66ec88sys/contrib/device-tree/src/arm tegra124-nyan-big-emc.dtsi dra7-l4.dtsi, sys/contrib/device-tree/src/arm64/qcom sdm845.dtsi sc7180.dtsi

Add 'sys/contrib/device-tree/' from commit '5ee353c36d3c9c7f63df7c7671875e73fba70958'

git-subtree-dir: sys/contrib/device-tree
git-subtree-mainline: 94611a838866cba8d7366a3107724af98c75e953
git-subtree-split: 5ee353c36d3c9c7f63df7c7671875e73fba70958
DeltaFile
+6,651-0sys/contrib/device-tree/src/arm/tegra124-nyan-big-emc.dtsi
+5,116-0sys/contrib/device-tree/src/arm64/qcom/sdm845.dtsi
+4,647-0sys/contrib/device-tree/src/arm/dra7-l4.dtsi
+4,087-0sys/contrib/device-tree/src/arm64/qcom/sc7180.dtsi
+3,340-0sys/contrib/device-tree/src/arm64/renesas/r8a77951.dtsi
+2,982-0sys/contrib/device-tree/src/arm64/renesas/r8a77960.dtsi
+26,823-08,150 files not shown
+1,302,878-08,156 files