diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-06-22 07:16:24 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-06-22 07:18:11 +0000 |
| commit | 25302a721f69d34c72d8bd3e0c316ad12647e281 (patch) | |
| tree | e67e15150d84552ab60fc1e08b31126e9c80b0cd /sys/contrib/openzfs/lib/libspl/asm-generic/.gitignore | |
| parent | 52d8029e935b0cde48936151af9dd7a82e90c51c (diff) | |
| parent | 9a865b7fb70f44e988f59b31b38eabafe363d6f8 (diff) | |
| download | src-25302a721f69d34c72d8bd3e0c316ad12647e281.tar.gz src-25302a721f69d34c72d8bd3e0c316ad12647e281.zip | |
zfs: merge openzfs/zfs@9a865b7fb (zfs-2.1-release) into stable/13
Notable upstream pull request merges:
#11904 libspl: implement atomics in terms of atomics
Obtained from: OpenZFS
OpenZFS commit: 9a865b7fb70f44e988f59b31b38eabafe363d6f8
Diffstat (limited to 'sys/contrib/openzfs/lib/libspl/asm-generic/.gitignore')
| -rw-r--r-- | sys/contrib/openzfs/lib/libspl/asm-generic/.gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/lib/libspl/asm-generic/.gitignore b/sys/contrib/openzfs/lib/libspl/asm-generic/.gitignore deleted file mode 100644 index 2792cf7b4551..000000000000 --- a/sys/contrib/openzfs/lib/libspl/asm-generic/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/atomic.S |