diff options
| author | Tom Rini <[email protected]> | 2024-05-14 07:46:33 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-14 07:46:33 -0600 |
| commit | e7992828adcd5fad75bce9e6c41dfa9277ab93b0 (patch) | |
| tree | dcb6356b6af294979f388c78c6821a63c91d3275 /include | |
| parent | c67199962b2a819a4b0ae8d57dc68b7cadee0c9e (diff) | |
| parent | 42826664e4452304bdadc909d7c5f791d4abc552 (diff) | |
Merge branch '2024-05-13-assorted-updates' into next
- A few zfs fixes, ARMv8 timer cleanups, support more algorithms with
the nuvoton crypto driver, virtio + env in filesystem fix, K3 code
cleanup and warning fix in gen_compile_commands.
Diffstat (limited to 'include')
| -rw-r--r-- | include/virtio.h | 1 | ||||
| -rw-r--r-- | include/zfs/zfs.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/virtio.h b/include/virtio.h index 1ab0ec5f39f..17f894a79e3 100644 --- a/include/virtio.h +++ b/include/virtio.h @@ -21,6 +21,7 @@ #define __VIRTIO_H__ #include <virtio_types.h> +#include <dm/device.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/typecheck.h> diff --git a/include/zfs/zfs.h b/include/zfs/zfs.h index 17b93c10c81..72d87452ddf 100644 --- a/include/zfs/zfs.h +++ b/include/zfs/zfs.h @@ -15,6 +15,7 @@ * On-disk version number. */ #define SPA_VERSION 28ULL +#define FEATURES_SUPPORTED_SPA_VERSION 5000ULL /* * The following are configuration names used in the nvlist describing a pool's |