Merge commit 'refs/top-bases/fix-stack' into fix-stack

diff --cc lib/libzpool/include/sys/zfs_context.h
index 69ce63ec6502261699810fe79b8db868c231ed88,230c233a242c369a88c662f4006aea8702cf4726..9c66c6cc1b19fdde1de50b735e39ace3df12dab8
--- 1/lib/libzpool/include/sys/zfs_context.h
--- 2/lib/libzpool/include/sys/zfs_context.h
+++ b/lib/libzpool/include/sys/zfs_context.h
@@@ -73,13 -74,8 +74,14 @@@ extern "C" 
  #include <sys/kstat.h>
  #include <sys/u8_textprep.h>
  #include <sys/sysevent/eventdefs.h>
+ #include <sys/sysevent/dev.h>
  
 +/*
 + * Stack
 + */
 +
 +#define  noinline     __attribute__((noinline))
 +
  /*
   * Debugging
   */

diff --cc module/zfs/dbuf.c
Simple merge