BSD Commit Log Search

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

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master

zfs: merge openzfs/zfs at 21bd76613 (zfs-2.1-release) into stable/13

OpenZFS release 2.1.7

Notable upstream pull requeset merges:
  #13680 Add options to zfs redundant_metadata property
  #13782 Fix setting the large_block feature after receiving a snapshot
  #13839 quota: extend quota for dataset
  #13938 Bring per_txg_dirty_frees_percent back to 30
  #13939 Fix panic in dsl_process_sub_livelist for EINTR
  #13973 Fix memory leaks in dmu_send()/dmu_send_obj()
  #13978 PAM: Fix unchecked return value from zfs_key_config_load()
  #13998 zvol_wait logic may terminate prematurely
  #14001 FreeBSD: Fix a pair of bugs in zfs_fhtovp()
  #14003 Stop ganging due to past vdev write errors
  #14050 Fix draid2+2s metadata error on simultaneous 2 drive failures
  #14062 zed: Avoid core dump if wholedisk property does not exist
  #14077 Propagate extent_bytes change to autotrim thread
  #14079 FreeBSD: vn_flush_cached_data: observe vnode locking contract

    [15 lines not shown]

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

Conflicts:
        sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c (unresolved)

zfs: merge openzfs/zfs at 2163cde45

Notable upstream pull request merges:
  #13680 Add options to zfs redundant_metadata property
  #13758 Allow mounting snapshots in .zfs/snapshot as a regular user
  #13838 quota: disable quota check for ZVOL
  #13839 quota: extend quota for dataset
  #13973 Fix memory leaks in dmu_send()/dmu_send_obj()
  #13977 Avoid unnecessary metaslab_check_free calling
  #13978 PAM: Fix unchecked return value from zfs_key_config_load()
  #13979 Handle possible null pointers from malloc/strdup/strndup()
  #13997 zstream: allow decompress to fix metadata for uncompressed
         records
  #13998 zvol_wait logic may terminate prematurely
  #14001 FreeBSD: Fix a pair of bugs in zfs_fhtovp()
  #14003 Stop ganging due to past vdev write errors
  #14039 Optimize microzaps
  #14050 Fix draid2+2s metadata error on simultaneous 2 drive failures
  #14062 zed: Avoid core dump if wholedisk property does not exist

    [16 lines not shown]

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)

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

zfs: merge openzfs/zfs at c0cf6ed67

Notable upstream pull request merges:
  #10662 zvol_wait: Ignore locked zvols
  #12789 Improve log spacemap load time
  #12812 Improved zpool status output, list all affected datasets
  #13277 FreeBSD: Use NDFREE_PNBUF if available
  #13302 Make zfs_max_recordsize default to 16M
  #13311 Fix error handling in FreeBSD's get/putpages VOPs
  #13345 FreeBSD: Fix translation from ABD to physical pages
  #13373 zfs: holds: dequadratify
  #13375 Corrected edge case in uncompressed ARC->L2ARC handling
  #13388 Improve mg_aliquot math
  #13405 Reduce dbuf_find() lock contention
  #13406 FreeBSD: use zero_region instead of allocating a dedicated page

Obtained from:  OpenZFS
OpenZFS commit: c0cf6ed6792e545fd614c2a88cb53756db7e03f8

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)

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

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

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)

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit

Merge branch 'hardened/current/master' of git-01.md.hardenedbsd.org:HardenedBSD/HardenedBSD into hardened/current/master

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

Conflicts:
        etc/mtree/BSD.usr.dist (unresolved)
        share/man/man4/Makefile (unresolved)

OpenZFS merge main-gf11b09

- add dRAID support
- fix duplicate close handling
- fix memory leak in prefetch
- fix problem with SIMD benchmarking on FreeBSD boot
...

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)

MFH

Sponsored by:   Rubicon Communications, LLC (netgate.com)

MFH

Sponsored by:   Rubicon Communications, LLC (netgate.com)

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)

Initial import from vendor-sys branch of openzfs

Initial import from vendor-sys branch of openzfs