HardenedBSD/src 31367a1contrib/sqlite3 sqlite3.c, share/colldef_unicode zh_CN.UTF-8.src

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+40,646-40,658share/colldef_unicode/zh_CN.UTF-8.src
+46,300-0sys/contrib/dev/rtw88/rtw8822c_table.c
+0-27,824sys/contrib/openzfs/module/zstd/lib/zstd.c
+22,204-0sys/contrib/dev/rtw88/rtw8822b_table.c
+9,441-436sys/contrib/zlib/crc32.h
+5,931-3,922contrib/sqlite3/sqlite3.c
+124,522-72,84014,231 files not shown
+826,315-442,38114,237 files

HardenedBSD/src a71eccesys/contrib/openzfs/module/icp/core kcf_sched.c kcf_callprov.c, sys/contrib/openzfs/module/zstd/lib zstd.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-27,824sys/contrib/openzfs/module/zstd/lib/zstd.c
+4,278-0sys/contrib/openzfs/module/zstd/lib/compress/zstd_compress.c
+1,885-0sys/contrib/openzfs/module/zstd/lib/decompress/zstd_decompress.c
+2-1,625sys/contrib/openzfs/module/icp/core/kcf_sched.c
+5-1,440sys/contrib/openzfs/module/icp/core/kcf_callprov.c
+1,432-0sys/contrib/openzfs/module/zstd/lib/decompress/zstd_decompress_block.c
+7,602-30,889599 files not shown
+31,989-44,078605 files

HardenedBSD/src c03c5b1sys/contrib/openzfs/module/icp/core kcf_sched.c kcf_callprov.c, sys/contrib/openzfs/module/zstd/lib zstd.c

zfs: merge openzfs/zfs at a86e08941 (master) into main

Notable upstream pull request merges:
  #9078:  log xattr=sa create/remove/update to ZIL
  #11919: Cross-platform xattr user namespace compatibility
  #13014: Report dnodes with faulty bonuslen
  #13016: FreeBSD: Fix zvol_cdev_open locking
  #13019: spl: Don't check FreeBSD rwlocks for double initialization
  #13027: Fix clearing set-uid and set-gid bits on a file when
          replying a write
  #13031: Add enumerated vdev names to 'zpool iostat -v' and
          'zpool list -v'
  #13074: Enable encrypted raw sending to pools with greater ashift
  #13076: Receive checks should allow unencrypted child datasets
  #13098: Avoid dirtying the final TXGs when exporting a pool
  #13172: Fix ENOSPC when unlinking multiple files from full pool

Obtained from:  OpenZFS
OpenZFS commit: a86e089415679cf1b98eb424a159bb36aa2c19e3
DeltaFile
+0-27,824sys/contrib/openzfs/module/zstd/lib/zstd.c
+4,278-0sys/contrib/openzfs/module/zstd/lib/compress/zstd_compress.c
+1,885-0sys/contrib/openzfs/module/zstd/lib/decompress/zstd_decompress.c
+2-1,625sys/contrib/openzfs/module/icp/core/kcf_sched.c
+5-1,440sys/contrib/openzfs/module/icp/core/kcf_callprov.c
+1,432-0sys/contrib/openzfs/module/zstd/lib/decompress/zstd_decompress_block.c
+7,602-30,889594 files not shown
+31,928-44,012600 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 0e3bd8acontrib/llvm-project/llvm/lib/Analysis/models/inliner saved_model.pbtxt, contrib/llvm-project/llvm/lib/Target/Hexagon HexagonDepIICScalar.td

MFH

Sponsored by:   Rubicon Communications, LLC (netgate.com)
DeltaFile
+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,565-0sys/contrib/openzfs/module/zfs/arc.c
+6,876-3,589contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepIICScalar.td
+123,257-12,83911,178 files not shown
+1,373,540-560,26311,184 files

HardenedBSD/src e251528 (r364886)contrib/llvm-project/llvm/lib/Analysis/models/inliner saved_model.pbtxt, contrib/llvm-project/llvm/lib/Target/Hexagon HexagonDepIICScalar.td

MFH

Sponsored by:   Rubicon Communications, LLC (netgate.com)
DeltaFile
+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,565-0sys/contrib/openzfs/module/zfs/arc.c
+6,876-3,589contrib/llvm-project/llvm/lib/Target/Hexagon/HexagonDepIICScalar.td
+123,257-12,83911,178 files not shown
+1,373,540-560,26311,184 files

HardenedBSD/src ff81541sys/cddl/contrib/opensolaris/uts/common/fs/zfs spa.c, sys/contrib/openzfs/cmd/zpool zpool_main.c

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

Conflicts:
        cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c (deleted)
        share/mk/bsd.libnames.mk (unresolved)
        share/mk/src.libnames.mk (unresolved)
DeltaFile
+35,376-0sys/contrib/openzfs/include/sys/u8_textprep_data.h
+27,826-0sys/contrib/openzfs/module/zstd/lib/zstd.c
+10,565-0sys/contrib/openzfs/module/zfs/arc.c
+10,326-0sys/contrib/openzfs/cmd/zpool/zpool_main.c
+9,754-0sys/contrib/openzfs/module/zfs/spa.c
+0-8,972sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
+93,847-8,9724,169 files not shown
+773,355-276,7044,175 files

HardenedBSD/src 2b8ca65sys/contrib/openzfs/cmd/zfs zfs_main.c, sys/contrib/openzfs/cmd/zpool zpool_main.c

Initial import from vendor-sys branch of openzfs
DeltaFile
+35,376-0sys/contrib/openzfs/include/sys/u8_textprep_data.h
+27,826-0sys/contrib/openzfs/module/zstd/lib/zstd.c
+10,565-0sys/contrib/openzfs/module/zfs/arc.c
+10,326-0sys/contrib/openzfs/cmd/zpool/zpool_main.c
+9,754-0sys/contrib/openzfs/module/zfs/spa.c
+8,620-0sys/contrib/openzfs/cmd/zfs/zfs_main.c
+102,467-03,665 files not shown
+770,607-03,671 files

HardenedBSD/src eda14cb (r364740)sys/contrib/openzfs/cmd/zfs zfs_main.c, sys/contrib/openzfs/cmd/zpool zpool_main.c

Initial import from vendor-sys branch of openzfs
DeltaFile
+35,376-0sys/contrib/openzfs/include/sys/u8_textprep_data.h
+27,826-0sys/contrib/openzfs/module/zstd/lib/zstd.c
+10,565-0sys/contrib/openzfs/module/zfs/arc.c
+10,326-0sys/contrib/openzfs/cmd/zpool/zpool_main.c
+9,754-0sys/contrib/openzfs/module/zfs/spa.c
+8,620-0sys/contrib/openzfs/cmd/zfs/zfs_main.c
+102,467-03,665 files not shown
+770,607-03,671 files