Merge pull request #37751 from changchengx/nasm_avx512

author Kefu Chai <kchai@redhat.com>

Sat, 31 Oct 2020 03:41:19 +0000 (11:41 +0800)

committer GitHub <noreply@github.com>

Sat, 31 Oct 2020 03:41:19 +0000 (11:41 +0800)
author Kefu Chai <kchai@redhat.com>
Sat, 31 Oct 2020 03:41:19 +0000 (11:41 +0800)
committer GitHub <noreply@github.com>
Sat, 31 Oct 2020 03:41:19 +0000 (11:41 +0800)
diff --cc ceph.spec.in
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Sat, 31 Oct 2020 03:41:19 +0000 (11:41 +0800)
committer	GitHub <noreply@github.com>
	Sat, 31 Oct 2020 03:41:19 +0000 (11:41 +0800)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history