From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 01:17:56 +0000 (+1000)
Subject: Merge remote-tracking branch 'md/for-next'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=32050cf17b379473b517bbf8fda9557caca1b750;p=deliverable%2Flinux.git

Merge remote-tracking branch 'md/for-next'
---

32050cf17b379473b517bbf8fda9557caca1b750
diff --cc include/linux/raid/pq.h
index 395a4c674168,1abd89584568..4d57bbaaa1bf
--- a/include/linux/raid/pq.h
+++ b/include/linux/raid/pq.h
@@@ -102,8 -102,10 +102,11 @@@ extern const struct raid6_calls raid6_a
  extern const struct raid6_calls raid6_avx2x1;
  extern const struct raid6_calls raid6_avx2x2;
  extern const struct raid6_calls raid6_avx2x4;
+ extern const struct raid6_calls raid6_avx512x1;
+ extern const struct raid6_calls raid6_avx512x2;
+ extern const struct raid6_calls raid6_avx512x4;
  extern const struct raid6_calls raid6_tilegx8;
 +extern const struct raid6_calls raid6_s390vx8;
  
  struct raid6_recov_calls {
  	void (*data2)(int, size_t, int, int, void **);
@@@ -116,7 -118,7 +119,8 @@@
  extern const struct raid6_recov_calls raid6_recov_intx1;
  extern const struct raid6_recov_calls raid6_recov_ssse3;
  extern const struct raid6_recov_calls raid6_recov_avx2;
+ extern const struct raid6_recov_calls raid6_recov_avx512;
 +extern const struct raid6_recov_calls raid6_recov_s390xc;
  
  extern const struct raid6_calls raid6_neonx1;
  extern const struct raid6_calls raid6_neonx2;