Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
4731673919
|
@ -47,8 +47,8 @@
|
||||||
#include <ucred.h>
|
#include <ucred.h>
|
||||||
#ifdef HAVE_IDMAP
|
#ifdef HAVE_IDMAP
|
||||||
#include <idmap.h>
|
#include <idmap.h>
|
||||||
#endif /* HAVE_IDMAP */
|
|
||||||
#include <aclutils.h>
|
#include <aclutils.h>
|
||||||
|
#endif /* HAVE_IDMAP */
|
||||||
|
|
||||||
#include <sys/spa.h>
|
#include <sys/spa.h>
|
||||||
#include <sys/zap.h>
|
#include <sys/zap.h>
|
||||||
|
|
Loading…
Reference in New Issue