aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/module/Makefile.in
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2021-11-10 12:41:17 +0000
committerMartin Matuska <mm@FreeBSD.org>2021-11-10 13:22:37 +0000
commit81b22a9892b1047e551fc3f1d6d58031bc59a4c3 (patch)
tree2214c7f406ca87e2d731d11c7ee6cf792aec47cf /sys/contrib/openzfs/module/Makefile.in
parent2de49deeca0b1377664dee2cd0a43ee7cf6b4bc4 (diff)
parent6c8f03232aa98e950bfe187f9ff53d3541687b50 (diff)
downloadsrc-81b22a9892b1047e551fc3f1d6d58031bc59a4c3.tar.gz
src-81b22a9892b1047e551fc3f1d6d58031bc59a4c3.zip
zfs: merge openzfs/zfs@6c8f03232 (master) into main
Notable upstream pull request merges: #12333: Creating gang ABDs for Raidz optional IOs #12668: FreeBSD: Catch up with recent VFS changes #12687: Skip spacemaps reading in case of pool readonly import #12704: Fix some FreeBSD VOPs to synchronize properly with teardown #12724: Fix lseek(SEEK_DATA/SEEK_HOLE) mmap consistency Obtained from: OpenZFS OpenZFS commit: 6c8f03232aa98e950bfe187f9ff53d3541687b50
Diffstat (limited to 'sys/contrib/openzfs/module/Makefile.in')
-rw-r--r--sys/contrib/openzfs/module/Makefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/module/Makefile.in b/sys/contrib/openzfs/module/Makefile.in
index 8538dd9d6997..b15ab9109725 100644
--- a/sys/contrib/openzfs/module/Makefile.in
+++ b/sys/contrib/openzfs/module/Makefile.in
@@ -115,7 +115,9 @@ modules_uninstall: modules_uninstall-@ac_system@
cppcheck-Linux:
@CPPCHECK@ -j@CPU_COUNT@ --std=c99 --quiet --force --error-exitcode=2 \
- --inline-suppr --suppress=noValidConfiguration \
+ --inline-suppr \
+ --suppress=unmatchedSuppression \
+ --suppress=noValidConfiguration \
--enable=warning,information -D_KERNEL \
--include=@LINUX_OBJ@/include/generated/autoconf.h \
--include=@top_srcdir@/zfs_config.h \