diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-08-08 01:57:07 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-08-08 02:01:26 +0000 |
| commit | 1f88aa09417f1cfb3929fd37531b1ab51213c2d6 (patch) | |
| tree | 34f3bb9d2e1f27e013383c9dc3b4d4ff8da2434d /sys/contrib/openzfs/lib/libspl/include | |
| parent | b0dafb1b6f352a90cf164210598e778ecedaea48 (diff) | |
| parent | f3678d70ff8f98d67caf377ec0326c9a6c7bcf29 (diff) | |
| download | src-1f88aa09417f1cfb3929fd37531b1ab51213c2d6.tar.gz src-1f88aa09417f1cfb3929fd37531b1ab51213c2d6.zip | |
zfs: merge openzfs/zfs@f3678d70f (master) into main
Notable upstream pull request merges:
#12339 Read past end of argv array in zpool_do_import()
#12365 Fixes in persistent L2ARC
#12383 Fixes for KMSAN reports
#12425 Avoid small buffer copying on write
#12428 Fix unfortunate NULL in spa_update_dspace
#12446 Allow disabling of unmapped I/O on FreeBSD
Obtained from: OpenZFS
OpenZFS commit: f3678d70ff8f98d67caf377ec0326c9a6c7bcf29
Diffstat (limited to 'sys/contrib/openzfs/lib/libspl/include')
| -rw-r--r-- | sys/contrib/openzfs/lib/libspl/include/os/linux/sys/sysmacros.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/sysmacros.h b/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/sysmacros.h index 22fcb04b94e0..31f347c6fd5a 100644 --- a/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/sysmacros.h +++ b/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/sysmacros.h @@ -98,6 +98,4 @@ #define offsetof(s, m) ((size_t)(&(((s *)0)->m))) #endif -#define _NOTE(x) - #endif /* _LIBSPL_SYS_SYSMACROS_H */ |