merged and fixed merge conflicts with zol upstream#2

Closed

dan-and wants to merge 10 commits intoBrainSlayer:masterfrom dan-and:master

+706-297

Commits on Jun 13, 2019

Merge branch 'master' of https://github.com/zfsonlinux/zfs
root
committed
ztest: dmu_tx_assign() gets ENOSPC in spa_vdev_remove_thread()

ahrens
authored and
behlendorf
committed
Restrict filesystem creation if name referred either '.' or '..'

TulsiJain
authored and
behlendorf
committed
looping in metaslab_block_picker impacts performance on fragmented pools

ahrens
authored and
behlendorf
committed
Move write aggregation memory copy out of vq_lock

amotin
authored and
behlendorf
committed
compress metadata in later sync passes

ahrens
authored and
behlendorf
committed
panic in removal_remap test on 4K devices

ahrens
authored and
behlendorf
committed
lz4_decompress_abd declared but not defined

ahrens
authored and
behlendorf
committed
Python config cleanup

Ryan Moeller
authored and
behlendorf
committed

Commits on Jun 14, 2019

resolved merge conflict between zstd addons and upstream
dan-and
committed