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 ed4c04csys/contrib/device-tree/src/arm64/nvidia tegra234.dtsi, sys/contrib/device-tree/src/arm64/qcom sm8550.dtsi sc8280xp.dtsi

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+5,148-0sys/contrib/device-tree/src/arm64/qcom/sm8550.dtsi
+3,099-359sys/contrib/device-tree/src/arm64/qcom/sc8280xp.dtsi
+3,403-0sys/contrib/device-tree/src/arm64/rockchip/rk3588s-pinctrl.dtsi
+2,152-623sys/contrib/device-tree/src/arm64/nvidia/tegra234.dtsi
+2,721-0sys/contrib/device-tree/src/arm64/qcom/sm6115.dtsi
+1,699-871sys/contrib/device-tree/src/arm64/qcom/sm8350.dtsi
+18,222-1,8534,887 files not shown
+300,051-50,5214,893 files

HardenedBSD/src 52887f0sys/contrib/device-tree/src/arm64/nvidia tegra234.dtsi, sys/contrib/device-tree/src/arm64/qcom sm8550.dtsi sc8280xp.dtsi

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+5,148-0sys/contrib/device-tree/src/arm64/qcom/sm8550.dtsi
+3,099-359sys/contrib/device-tree/src/arm64/qcom/sc8280xp.dtsi
+3,403-0sys/contrib/device-tree/src/arm64/rockchip/rk3588s-pinctrl.dtsi
+2,152-623sys/contrib/device-tree/src/arm64/nvidia/tegra234.dtsi
+2,721-0sys/contrib/device-tree/src/arm64/qcom/sm6115.dtsi
+1,699-871sys/contrib/device-tree/src/arm64/qcom/sm8350.dtsi
+18,222-1,8534,887 files not shown
+300,051-50,5214,893 files

HardenedBSD/src 8bab661sys/contrib/device-tree/src/arm qcom-apq8060-dragonboard.dts, sys/contrib/device-tree/src/arm64/apple t600x-pmgr.dtsi

Import device-tree files from Linux 6.2

Sponsored by:   Beckhoff Automation GmbH & Co. KG
DeltaFile
+2,012-0sys/contrib/device-tree/src/arm64/apple/t600x-pmgr.dtsi
+859-891sys/contrib/device-tree/src/arm/qcom-apq8060-dragonboard.dts
+1,425-0sys/contrib/device-tree/src/arm64/qcom/sm6115.dtsi
+1,396-0sys/contrib/device-tree/src/arm64/qcom/sm6375.dtsi
+813-393sys/contrib/device-tree/src/arm64/qcom/sm8250.dtsi
+1,198-0sys/contrib/device-tree/src/arm64/qcom/msm8976.dtsi
+7,703-1,2842,048 files not shown
+84,972-15,5852,054 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 d5b0e70sys/contrib/device-tree/src/arm qcom-msm8974.dtsi omap3xxx-clocks.dtsi, sys/contrib/device-tree/src/arm64/freescale imx8mp-verdin.dtsi

Import device-tree files from Linux 5.19

Sponsored by:   Beckhoff Automation GmbH & Co. KG
DeltaFile
+1,601-1,405sys/contrib/device-tree/src/arm/qcom-msm8974.dtsi
+2,522-12sys/contrib/device-tree/src/arm64/qcom/sm8450.dtsi
+1,046-918sys/contrib/device-tree/src/arm/omap3xxx-clocks.dtsi
+1,380-0sys/contrib/device-tree/src/arm64/freescale/imx8mp-verdin.dtsi
+547-685sys/contrib/device-tree/src/arm/qcom-msm8974-lge-nexus5-hammerhead.dts
+1,045-0sys/contrib/device-tree/src/arm64/mediatek/mt8195.dtsi
+8,141-3,0201,298 files not shown
+70,804-9,5471,304 files

HardenedBSD/src 5aeb963contrib/sqlite3 sqlite3.c, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json other.json

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+5,556-3,450contrib/sqlite3/sqlite3.c
+8,287-0sys/contrib/openzfs/cmd/ztest.c
+0-8,221sys/contrib/openzfs/cmd/ztest/ztest.c
+4,219-3,950sys/contrib/device-tree/src/arm/tegra30-ouya.dts
+6,576-1,135lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+113-6,855lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+24,751-23,6119,387 files not shown
+738,363-247,4629,393 files

HardenedBSD/src 1a3ea9asys/contrib/device-tree/src/arm tegra30-ouya.dts tegra30-pegatron-chagall.dts, sys/contrib/device-tree/src/arm64/nvidia tegra194-p3509-0000.dtsi

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

Conflicts:
        lib/libc/gen/arc4random.c (unresolved)
DeltaFile
+4,219-3,950sys/contrib/device-tree/src/arm/tegra30-ouya.dts
+4,299-15sys/contrib/device-tree/src/arm64/qcom/sc7280.dtsi
+3,120-0sys/contrib/device-tree/src/arm64/rockchip/rk3568-pinctrl.dtsi
+2,861-0sys/contrib/device-tree/src/arm/tegra30-pegatron-chagall.dts
+1,686-342sys/contrib/device-tree/src/arm/aspeed-bmc-ibm-everest.dts
+1,873-11sys/contrib/device-tree/src/arm64/nvidia/tegra194-p3509-0000.dtsi
+18,058-4,3183,741 files not shown
+300,972-27,0783,747 files

HardenedBSD/src c9ccf3asys/contrib/device-tree/include/dt-bindings/pinctrl mt8186-pinfunc.h, sys/contrib/device-tree/src/arm64/freescale imx8mm-verdin.dtsi

Import device-tree files from Linux 5.18

Sponsored by:   Beckhoff Automation GmbH & Co. KG
DeltaFile
+1,824-0sys/contrib/device-tree/src/arm64/nvidia/tegra234-p3737-0000+p3701-0000.dts
+1,352-0sys/contrib/device-tree/src/arm64/qcom/sc7280-herobrine-herobrine-r0.dts
+1,326-0sys/contrib/device-tree/src/arm64/qcom/msm8953.dtsi
+1,264-0sys/contrib/device-tree/src/arm64/freescale/imx8mm-verdin.dtsi
+1,174-0sys/contrib/device-tree/include/dt-bindings/pinctrl/mt8186-pinfunc.h
+263-890sys/contrib/device-tree/src/arm64/qcom/sc7280-herobrine.dtsi
+7,203-8901,330 files not shown
+70,487-7,4071,336 files

HardenedBSD/src 354d767sys/contrib/device-tree/include/dt-bindings/pinctrl mt8135-pinfunc.h mt8183-pinfunc.h, sys/contrib/device-tree/src/arm aspeed-bmc-facebook-fuji.dts sama7g5-pinfunc.h

Import device-tree files from Linux 5.15

Sponsored by:   Beckhoff Automation GmbH & Co. KG
DeltaFile
+1,354-108sys/contrib/device-tree/src/arm64/qcom/sdm630.dtsi
+1,294-0sys/contrib/device-tree/include/dt-bindings/pinctrl/mt8135-pinfunc.h
+1,251-0sys/contrib/device-tree/src/arm/aspeed-bmc-facebook-fuji.dts
+1,120-0sys/contrib/device-tree/include/dt-bindings/pinctrl/mt8183-pinfunc.h
+956-0sys/contrib/device-tree/src/arm64/qcom/msm8996-sony-xperia-tone.dtsi
+923-0sys/contrib/device-tree/src/arm/sama7g5-pinfunc.h
+6,898-108808 files not shown
+48,868-4,664814 files

HardenedBSD/src 5956d97sys/contrib/device-tree/include/dt-bindings/pinctrl mt8365-pinfunc.h, sys/contrib/device-tree/src/arm aspeed-bmc-ibm-everest.dts

Import device-tree files from Linux 5.14
DeltaFile
+3,111-0sys/contrib/device-tree/src/arm64/rockchip/rk3568-pinctrl.dtsi
+1,853-90sys/contrib/device-tree/src/arm/aspeed-bmc-ibm-everest.dts
+1,171-0sys/contrib/device-tree/src/arm64/qcom/sc7280.dtsi
+1,019-0sys/contrib/device-tree/src/arm64/freescale/imx8mm-venice-gw7901.dts
+944-49sys/contrib/device-tree/src/arm64/qcom/msm8996.dtsi
+858-0sys/contrib/device-tree/include/dt-bindings/pinctrl/mt8365-pinfunc.h
+8,956-1391,049 files not shown
+47,529-3,3541,055 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 e0b09d1sys/contrib/device-tree/include/dt-bindings/pinctrl mt8192-pinfunc.h, sys/contrib/device-tree/src/arm64/freescale imx8mq-librem5.dtsi

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

* freebsd/current/main:
  arm64: Only check for freebsd,dts-version if we are booted in FDT mode.
  arm64: Check dtb version against the one we're expecting to find
  pf: Handle unmapped mbufs when computing checksums
  dts: Bump the freebsd branding version to 5.10
  Fix scripted installs on EFI systems after default mounting of the ESP.
  gpioc_detach: fix freeing of wrong pointers
  xen/netback: do not attempt to connect in the Initialised state
  Import devicetree files from Linux 5.10
DeltaFile
+1,572-1,596sys/contrib/device-tree/src/arm64/qcom/msm8916.dtsi
+1,402-0sys/contrib/device-tree/src/arm64/qcom/sc7180-trogdor.dtsi
+1,344-0sys/contrib/device-tree/include/dt-bindings/pinctrl/mt8192-pinfunc.h
+1,315-29sys/contrib/device-tree/src/arm64/renesas/r8a774e1.dtsi
+1,106-0sys/contrib/device-tree/src/arm64/freescale/imx8mq-librem5.dtsi
+1,048-11sys/contrib/device-tree/src/arm64/qcom/sm8250.dtsi
+7,787-1,6361,482 files not shown
+50,602-8,9991,488 files

HardenedBSD/src 6be3386sys/contrib/device-tree/include/dt-bindings/pinctrl mt8192-pinfunc.h, sys/contrib/device-tree/src/arm64/freescale imx8mq-librem5.dtsi

Update DTS files from Linux v5.10
DeltaFile
+1,572-1,596sys/contrib/device-tree/src/arm64/qcom/msm8916.dtsi
+1,402-0sys/contrib/device-tree/src/arm64/qcom/sc7180-trogdor.dtsi
+1,344-0sys/contrib/device-tree/include/dt-bindings/pinctrl/mt8192-pinfunc.h
+1,315-29sys/contrib/device-tree/src/arm64/renesas/r8a774e1.dtsi
+1,106-0sys/contrib/device-tree/src/arm64/freescale/imx8mq-librem5.dtsi
+1,048-11sys/contrib/device-tree/src/arm64/qcom/sm8250.dtsi
+7,787-1,6361,474 files not shown
+50,508-8,9881,480 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