Merge pull request #24813 from wjwithagen/wjw-fix-alpine-compat

author Kefu Chai <tchaikov@gmail.com>

Sun, 27 Jan 2019 13:42:51 +0000 (21:42 +0800)

committer GitHub <noreply@github.com>

Sun, 27 Jan 2019 13:42:51 +0000 (21:42 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sun, 27 Jan 2019 13:42:51 +0000 (21:42 +0800)
committer GitHub <noreply@github.com>
Sun, 27 Jan 2019 13:42:51 +0000 (21:42 +0800)
diff --cc src/common/blkdev.cc
Simple merge
diff --cc src/include/compat.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sun, 27 Jan 2019 13:42:51 +0000 (21:42 +0800)
committer	GitHub <noreply@github.com>
	Sun, 27 Jan 2019 13:42:51 +0000 (21:42 +0800)
		1	2
src/common/blkdev.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/compat.h	patch \|	diff1 \|	diff2 \|	blob \| history