diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-10-22 16:25:23 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-10-22 16:26:16 +0000 |
| commit | 22b267e823719ef22790ed548fb11da8aa81d1ae (patch) | |
| tree | d127bb40c8736b2cbea53d9c6d120355e93df161 /sys/modules/zfs | |
| parent | 63f537551380d2dab29fa402ad1269feae17e594 (diff) | |
| parent | 797f55ef12d752d2a7fb04fae5d24e019adf2a1d (diff) | |
| download | src-22b267e823719ef22790ed548fb11da8aa81d1ae.tar.gz src-22b267e823719ef22790ed548fb11da8aa81d1ae.zip | |
zfs: merge openzfs/zfs@797f55ef1
Notable upstream pull request merges:
#14378 c0e58995e Large sync writes perform worse with slog
#14721 797f55ef1 Do not persist user/group/project quota zap objects
when unneeded
#15356 380c25f64 FreeBSD: Improve taskq wrapper
#15390 4fbc52495 Remove lock from dsl_pool_need_dirty_delay()
#15397 57b409856 Trust ARC_BUF_SHARED() more
#15402 b29e98fa8 Properly pad struct tx_cpu to cache line
#15405 ea30b5a9e Set spa_ccw_fail_time=0 when expanding a vdev
#15416 b9384b949 FreeBSD: taskq: Remove unused declaration
Obtained from: OpenZFS
OpenZFS commit: 797f55ef12d752d2a7fb04fae5d24e019adf2a1d
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 4 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index a41af071ec5d..e91cf5f22368 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1110,7 +1110,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_g8a7407012" +#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_g797f55ef1" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1140,7 +1140,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g8a7407012" +#define ZFS_META_RELEASE "FreeBSD_g797f55ef1" /* Define the project version. */ #define ZFS_META_VERSION "2.2.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 0dfff6b0c883..e88a5e8dbb37 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.2.99-151-g8a7407012" +#define ZFS_META_GITREV "zfs-2.2.99-162-g797f55ef1" |