linux-next: manual merge of the md tree with the s390 tree

Hi Shaohua, Today's linux-next merge of the md tree got a conflict in: include/linux/raid/pq.h between commit: f5b55fa1f81d ("RAID/s390: provide raid6 recovery optimization") from the s390 tree and commit: a5e49b04af05 ("lib/raid6: Add AVX512 optimized recovery functions") from the md

linux-next: manual merge of the md tree with the s390 tree

Hi Shaohua, Today's linux-next merge of the md tree got a conflict in: include/linux/raid/pq.h between commit: f5b55fa1f81d ("RAID/s390: provide raid6 recovery optimization") from the s390 tree and commit: a5e49b04af05 ("lib/raid6: Add AVX512 optimized recovery functions") from the md