HardenedBSD/src 297ec93sys/contrib/openzfs/module/icp/algs/sha1 sha1.c, sys/contrib/openzfs/module/icp/asm-x86_64/sha1 sha1-x86_64.S

Merge remote-tracking branch 'origin/freebsd/13-stable/main' into hardened/13-stable/master
DeltaFile
+0-1,353sys/contrib/openzfs/module/icp/asm-x86_64/sha1/sha1-x86_64.S
+0-1,230sys/contrib/openzfs/module/icp/io/sha1_mod.c
+0-835sys/contrib/openzfs/module/icp/algs/sha1/sha1.c
+420-365sys/contrib/openzfs/module/zfs/btree.c
+204-158sys/contrib/openzfs/module/zfs/dsl_scan.c
+147-160sys/contrib/openzfs/module/zfs/spa.c
+771-4,101152 files not shown
+3,249-5,458158 files

HardenedBSD/src f193a24sys/contrib/openzfs/module/icp/algs/sha1 sha1.c, sys/contrib/openzfs/module/icp/asm-x86_64/sha1 sha1-x86_64.S

zfs: merge openzfs/zfs at 6a6bd4939 (zfs-2.1-release) into stable/13

OpenZFS release 2.1.6

Notable upstream pull requeset merges:
  #11733 ICP: Add missing stack frame info to SHA asm files
  #12274 Optimize txg_kick() process
  #12284 Add Module Parameter Regarding Log Size Limit
  #12285 Introduce a tunable to exclude special class buffers from L2ARC
  #12287 Remove refcount from spa_config_*()
  #12425 Avoid small buffer copying on write
  #12516 Fix NFS and large reads on older kernels
  #12678 spa.c: Replace VERIFY(nvlist_*(...) == 0) with fnvlist_*
  #12789 Improve log spacemap load time
  #13022 Add more control/visibility and speedup spa_load_verify()
  #13106 add physical device size to SIZE column in 'zpool list -v'
  #13388 Improve mg_aliquot math
  #13405 Revert "Reduce dbuf_find() lock contention"
  #13452 More speculative prefetcher improvements

    [36 lines not shown]
DeltaFile
+0-1,353sys/contrib/openzfs/module/icp/asm-x86_64/sha1/sha1-x86_64.S
+0-1,230sys/contrib/openzfs/module/icp/io/sha1_mod.c
+0-835sys/contrib/openzfs/module/icp/algs/sha1/sha1.c
+420-365sys/contrib/openzfs/module/zfs/btree.c
+204-158sys/contrib/openzfs/module/zfs/dsl_scan.c
+147-160sys/contrib/openzfs/module/zfs/spa.c
+771-4,101143 files not shown
+3,163-5,424149 files

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 93df976sys/contrib/openzfs/cmd/arc_summary arc_summary2, sys/contrib/openzfs/module/icp/asm-x86_64/sha1 sha1-x86_64.S

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+853-950sys/contrib/openzfs/module/zfs/lz4.c
+0-1,480sys/contrib/openzfs/module/icp/include/sys/crypto/ioctl.h
+0-1,369sys/contrib/openzfs/module/icp/asm-x86_64/sha1/sha1-x86_64.S
+0-1,230sys/contrib/openzfs/module/icp/io/sha1_mod.c
+0-1,180sys/contrib/openzfs/cmd/arc_summary/arc_summary2
+935-0sys/contrib/openzfs/module/zfs/lz4_zfs.c
+1,788-6,209502 files not shown
+5,690-11,220508 files

HardenedBSD/src e92ffd9sys/contrib/openzfs/cmd/arc_summary arc_summary2, sys/contrib/openzfs/module/icp/asm-x86_64/sha1 sha1-x86_64.S

zfs: merge openzfs/zfs at 17b2ae0b2 (master) into main

Notable upstream pull request merges:
  #12766 Fix error propagation from lzc_send_redacted
  #12805 Updated the lz4 decompressor
  #12851 FreeBSD: Provide correct file generation number
  #12857 Verify dRAID empty sectors
  #12874 FreeBSD: Update argument types for VOP_READDIR
  #12896 Reduce number of arc_prune threads
  #12934 FreeBSD: Fix zvol_*_open() locking
  #12947 lz4: Cherrypick fix for CVE-2021-3520
  #12961 FreeBSD: Fix leaked strings in libspl mnttab
  #12964 Fix handling of errors from dmu_write_uio_dbuf() on FreeBSD
  #12981 Introduce a flag to skip comparing the local mac when raw sending
  #12985 Avoid memory allocations in the ARC eviction thread

Obtained from:  OpenZFS
OpenZFS commit: 17b2ae0b24d487fdda2ef1098ec26fa7f79a61f6
DeltaFile
+853-950sys/contrib/openzfs/module/zfs/lz4.c
+0-1,480sys/contrib/openzfs/module/icp/include/sys/crypto/ioctl.h
+0-1,369sys/contrib/openzfs/module/icp/asm-x86_64/sha1/sha1-x86_64.S
+0-1,230sys/contrib/openzfs/module/icp/io/sha1_mod.c
+0-1,180sys/contrib/openzfs/cmd/arc_summary/arc_summary2
+935-0sys/contrib/openzfs/module/zfs/lz4_zfs.c
+1,788-6,209502 files not shown
+5,690-11,220508 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