]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f06c928 f795e90)
zfs: merge openzfs/zfs@f795e90a1
authorMartin Matuska <mm@FreeBSD.org>
Wed, 4 Oct 2023 12:02:37 +0000 (14:02 +0200)
committerMartin Matuska <mm@FreeBSD.org>
Wed, 4 Oct 2023 12:08:42 +0000 (14:08 +0200)
commitf7f4bd06a8d4e5d1e92d0d2905a68a2a03ed9c0c
tree986c7135832a9f7d718a3bb97e839fcd49a5418etree | snapshot
parentf06c928544747326c04f84c582bcd5fda0d7bb91commit | diff
parentf795e90a11c683d64bacc260fb7feab705b220b1commit | diff
zfs: merge openzfs/zfs@f795e90a1

Notable upstream pull request merges:
 #15322 4e16964e1 Add '-u' - nomount flag for zfs set
 #15331 fe4d055b3 Report ashift of L2ARC devices in zdb
 #15333 249d759ca Fix invalid pointer access in trace_dbuf.h
 #15339 f795e90a1 Add BTI landing pads to the AArch64 SHA2 assembly

Obtained from: OpenZFS
OpenZFS commit: f795e90a11c683d64bacc260fb7feab705b220b1
23 files changed:
sys/contrib/openzfs/cmd/zdb/zdb.c diff1 | diff2 | blob | history
sys/contrib/openzfs/cmd/zfs/zfs_main.c diff1 | diff2 | blob | history
sys/contrib/openzfs/config/zfs-build.m4 diff1 | diff2 | blob | history
sys/contrib/openzfs/contrib/bash_completion.d/Makefile.am diff1 | diff2 | blob | history
sys/contrib/openzfs/contrib/debian/control diff1 | diff2 | blob | history
sys/contrib/openzfs/contrib/debian/openzfs-zfsutils.install diff1 | diff2 | blob | history
sys/contrib/openzfs/contrib/debian/rules.in diff1 | diff2 | blob | history
sys/contrib/openzfs/include/libzfs.h diff1 | diff2 | blob | history
sys/contrib/openzfs/include/os/linux/zfs/sys/trace_dbuf.h diff1 | diff2 | blob | history
sys/contrib/openzfs/lib/libzfs/libzfs.abi diff1 | diff2 | blob | history
sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c diff1 | diff2 | blob | history
sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c diff1 | diff2 | blob | history
sys/contrib/openzfs/man/man7/zfsprops.7 diff1 | diff2 | blob | history
sys/contrib/openzfs/man/man8/zfs-set.8 diff1 | diff2 | blob | history
sys/contrib/openzfs/module/icp/asm-aarch64/sha2/sha256-armv8.S diff1 | diff2 | blob | history
sys/contrib/openzfs/module/icp/asm-aarch64/sha2/sha512-armv8.S diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/vdev_label.c diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/runfiles/common.run diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/runfiles/sanity.run diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_nomount.ksh | diff2 | blob | history
sys/modules/zfs/zfs_config.h diff1 | | blob | history
sys/modules/zfs/zfs_gitrev.h diff1 | | blob | history
Unnamed repository; edit this file 'description' to name the repository.