Merge pull request #89 from delphix/projects/merge-upstream/master

delphix-devops-bot · web-flow · commit 0ead283230d5 · 2022-07-20T20:24:05.000+02:00
Merge remote-tracking branch '6.0/stage' into 'master'
diff --git a/bpf/estat/zvol.c b/bpf/estat/zvol.c
@@ -31,7 +31,6 @@
 #define	POOL (OPTARG)
 #endif
 
-
 // Structure to hold thread local data
 typedef struct {
 	u64 ts;
