Resolve conflict with removed cleaner type

diff --cc cmd/zdb/zdb.c
Simple merge

diff --cc cmd/ztest/ztest.c
Simple merge

diff --cc lib/libzfs/libzfs_mount.c
Simple merge

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

diff --cc module/zfs/include/sys/spa.h
Simple merge

diff --cc module/zfs/include/sys/zil.h
index 402a16cb286ed915e932cea6375dde3f551d9246,b69323cfaf3e681b72465db02a624ba11ed0ceab..6a0f101d18728227b3bba3aceee8206f4ab6cc8a
--- 1/module/zfs/include/sys/zil.h
--- 2/module/zfs/include/sys/zil.h
+++ b/module/zfs/include/sys/zil.h
@@@ -334,8 -334,7 +334,7 @@@ typedef void zil_parse_blk_func_t(zilog
      uint64_t txg);
  typedef void zil_parse_lr_func_t(zilog_t *zilog, lr_t *lr, void *arg,
      uint64_t txg);
 -typedef int zil_replay_func_t();
 +typedef int zil_replay_func_t(void *, char *, boolean_t);
- typedef void zil_replay_cleaner_t(void *);
  typedef int zil_get_data_t(void *arg, lr_write_t *lr, char *dbuf, zio_t *zio);
  
  extern uint64_t       zil_parse(zilog_t *zilog, zil_parse_blk_func_t *parse_blk_func,

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