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
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
Merge branch 'freebsd/current/main' into hardened/current/master
Import device-tree files from Linux 6.10
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 |
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 |
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 |
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 |
Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master Conflicts: lib/libc/gen/arc4random.c (unresolved)
Import device-tree files from Linux 5.17 Sponsored by: Beckhoff Automation GmbH & Co. KG
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 |
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
Import device-tree files from Linux 5.13 Sponsored by: Diablotin Systems
Import device-tree files from Linux 5.11 Sponsored by: Diablotin Systems
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 |
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 |
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
Add 'sys/contrib/device-tree/' from commit '5ee353c36d3c9c7f63df7c7671875e73fba70958' git-subtree-dir: sys/contrib/device-tree git-subtree-mainline: 94611a838866cba8d7366a3107724af98c75e953 git-subtree-split: 5ee353c36d3c9c7f63df7c7671875e73fba70958