Fix to previous cmake fix for .s files
blocks: fixed relative rate in keep_m_in_n. It's m-in-n, not n-in-m.
Merge branch 'maint'
Merge remote-tracking branch 'dgeiger/cmake_fixes'
volk: fixing up output message to print c flags and asm flags used by Volk next to each other.
Merge branch 'master' into next