HardenedBSD/src afe7362 — sys/contrib/device-tree/src/arm/aspeed aspeed-bmc-ibm-fuji.dts, sys/contrib/device-tree/src/arm64/qcom x1e80100.dtsi
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
HardenedBSD/src 705fc7f — sys/contrib/device-tree/src/arm/aspeed aspeed-bmc-ibm-fuji.dts, sys/contrib/device-tree/src/arm64/qcom x1e80100.dtsi
Merge branch 'freebsd/current/main' into hardened/current/master
HardenedBSD/src b2d2a78 — sys/contrib/device-tree/src/arm/aspeed aspeed-bmc-ibm-fuji.dts aspeed-bmc-ibm-blueridge.dts, sys/contrib/device-tree/src/arm/nvidia tegra114-asus-tf701t.dts
Import device-tree files from Linux 6.12
HardenedBSD/src fb09733 — contrib/ncurses/misc terminfo.src, contrib/unbound configure~ configure
Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi
Conflicts:
share/man/man5/src.conf.5 (unresolved)
| Delta | File | |
|---|---|---|
| +91,515 | -0 | sys/dev/bnxt/bnxt_en/hsi_struct_def.h |
| +0 | -78,381 | sys/dev/bnxt/hsi_struct_def.h |
| +26,616 | -0 | contrib/unbound/configure~ |
| +9,508 | -8,602 | contrib/xz/ChangeLog |
| +7,476 | -5,132 | contrib/unbound/configure |
| +5,330 | -4,740 | contrib/ncurses/misc/terminfo.src |
| +140,445 | -96,855 | 7,018 files not shown |
| +517,509 | -231,700 | 7,024 files |
HardenedBSD/src df19d26 — sys/contrib/device-tree/src/arm/aspeed aspeed-bmc-ibm-everest.dts, sys/contrib/device-tree/src/arm64/nvidia tegra234-p3737-0000+p3701-0000.dts tegra234-p3701.dtsi
Merge branch 'freebsd/current/main' into hardened/current/master
HardenedBSD/src aa1a8ff — sys/contrib/device-tree/src/arm/aspeed aspeed-bmc-ibm-everest.dts ibm-power10-quad.dtsi, sys/contrib/device-tree/src/arm/samsung exynos4212-tab3.dtsi
Import device-tree files from Linux 6.6 Sponsored by: Beckhoff Automation GmbH & Co. KG
HardenedBSD/src ed4c04c — sys/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
| Delta | File | |
|---|---|---|
| +5,148 | -0 | sys/contrib/device-tree/src/arm64/qcom/sm8550.dtsi |
| +3,099 | -359 | sys/contrib/device-tree/src/arm64/qcom/sc8280xp.dtsi |
| +3,403 | -0 | sys/contrib/device-tree/src/arm64/rockchip/rk3588s-pinctrl.dtsi |
| +2,152 | -623 | sys/contrib/device-tree/src/arm64/nvidia/tegra234.dtsi |
| +2,721 | -0 | sys/contrib/device-tree/src/arm64/qcom/sm6115.dtsi |
| +1,699 | -871 | sys/contrib/device-tree/src/arm64/qcom/sm8350.dtsi |
| +18,222 | -1,853 | 4,887 files not shown |
| +300,051 | -50,521 | 4,893 files |
HardenedBSD/src 52887f0 — sys/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
| Delta | File | |
|---|---|---|
| +5,148 | -0 | sys/contrib/device-tree/src/arm64/qcom/sm8550.dtsi |
| +3,099 | -359 | sys/contrib/device-tree/src/arm64/qcom/sc8280xp.dtsi |
| +3,403 | -0 | sys/contrib/device-tree/src/arm64/rockchip/rk3588s-pinctrl.dtsi |
| +2,152 | -623 | sys/contrib/device-tree/src/arm64/nvidia/tegra234.dtsi |
| +2,721 | -0 | sys/contrib/device-tree/src/arm64/qcom/sm6115.dtsi |
| +1,699 | -871 | sys/contrib/device-tree/src/arm64/qcom/sm8350.dtsi |
| +18,222 | -1,853 | 4,887 files not shown |
| +300,051 | -50,521 | 4,893 files |
HardenedBSD/src fac71e4 — sys/contrib/device-tree/src/arm64/apple t8112-pmgr.dtsi, sys/contrib/device-tree/src/arm64/freescale imx8-apalis-v1.1.dtsi imx8mp-data-modul-edm-sbc.dts
Import device-tree files from Linux 6.4 Sponsored by: Beckhoff Automation GmbH & Co. KG
HardenedBSD/src cb7aa33 — sys/contrib/device-tree/src/arm64/nvidia tegra234.dtsi tegra186-p2771-0000.dts, sys/contrib/device-tree/src/arm64/qcom sm8550.dtsi sc8280xp.dtsi
Import device-tree files from Linux 6.3 Sponsored by: Beckhoff Automation GmbH & Co. KG
| Delta | File | |
|---|---|---|
| +4,807 | -0 | sys/contrib/device-tree/src/arm64/qcom/sm8550.dtsi |
| +3,403 | -0 | sys/contrib/device-tree/src/arm64/rockchip/rk3588s-pinctrl.dtsi |
| +1,488 | -1,315 | sys/contrib/device-tree/src/arm64/nvidia/tegra234.dtsi |
| +2,363 | -239 | sys/contrib/device-tree/src/arm64/qcom/sc8280xp.dtsi |
| +1,280 | -1,280 | sys/contrib/device-tree/src/arm64/nvidia/tegra186-p2771-0000.dts |
| +1,225 | -1,224 | sys/contrib/device-tree/src/arm64/nvidia/tegra194-p3509-0000.dtsi |
| +14,566 | -4,058 | 1,661 files not shown |
| +104,141 | -21,964 | 1,667 files |
HardenedBSD/src 5aeb963 — contrib/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)
| Delta | File | |
|---|---|---|
| +5,556 | -3,450 | contrib/sqlite3/sqlite3.c |
| +8,287 | -0 | sys/contrib/openzfs/cmd/ztest.c |
| +0 | -8,221 | sys/contrib/openzfs/cmd/ztest/ztest.c |
| +4,219 | -3,950 | sys/contrib/device-tree/src/arm/tegra30-ouya.dts |
| +6,576 | -1,135 | lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json |
| +113 | -6,855 | lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json |
| +24,751 | -23,611 | 9,387 files not shown |
| +738,363 | -247,462 | 9,393 files |
HardenedBSD/src 1a3ea9a — sys/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)
HardenedBSD/src 8cc087a — sys/contrib/device-tree/src/arm64/nvidia tegra194-p3509-0000.dtsi tegra186-p2771-0000.dts, sys/contrib/device-tree/src/arm64/qcom sc7280.dtsi sc7280-herobrine.dtsi
Import device-tree files from Linux 5.16 Sponsored by: Beckhoff Automation GmbH & Co. KG
HardenedBSD/src 354d767 — sys/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
HardenedBSD/src 5956d97 — sys/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
HardenedBSD/src d429eca — contrib/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)
| Delta | File | |
|---|---|---|
| +0 | -32,465 | contrib/apr/configure |
| +31,999 | -0 | contrib/arm-optimized-routines/math/test/traces/sincosf.txt |
| +0 | -30,335 | contrib/subversion/configure |
| +0 | -25,340 | contrib/apr-util/configure |
| +0 | -16,709 | contrib/subversion/subversion/libsvn_wc/wc_db.c |
| +16,000 | -0 | contrib/arm-optimized-routines/math/test/traces/exp.txt |
| +47,999 | -104,849 | 10,834 files not shown |
| +702,320 | -1,092,882 | 10,840 files |
HardenedBSD/src 0a8ed79 — sys/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
HardenedBSD/src 5def4c4 — sys/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
HardenedBSD/src 34ab832 — contrib/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)
| Delta | File | |
|---|---|---|
| +71,590 | -432 | tools/tools/locale/etc/final-maps/widths.txt |
| +52,834 | -0 | contrib/terminus/ter-u32n.bdf |
| +52,834 | -0 | contrib/terminus/ter-u32b.bdf |
| +0 | -49,485 | contrib/binutils/Makefile.in |
| +47,418 | -0 | contrib/terminus/ter-u28b.bdf |
| +47,418 | -0 | contrib/terminus/ter-u28n.bdf |
| +272,094 | -49,917 | 25,491 files not shown |
| +3,013,181 | -3,285,385 | 25,497 files |
HardenedBSD/src c7ce6b0 — contrib/libstdc++ configure, lib/clang/liblldb LLDBWrapLua.cpp
Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit
| Delta | File | |
|---|---|---|
| +0 | -111,817 | contrib/libstdc++/configure |
| +72,183 | -0 | lib/clang/liblldb/LLDBWrapLua.cpp |
| +71,590 | -432 | tools/tools/locale/etc/final-maps/widths.txt |
| +31,726 | -39,305 | share/ctypedef/ja_JP.eucJP.src |
| +59,521 | -0 | sys/contrib/dev/iwm/iwm-9000-34.fw.uu |
| +59,517 | -0 | sys/contrib/dev/iwm/iwm-9260-34.fw.uu |
| +294,537 | -151,554 | 60,534 files not shown |
| +10,288,584 | -10,879,881 | 60,540 files |
HardenedBSD/src 123aebd — sys/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
HardenedBSD/src c66ec88 — sys/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