From: Andrew Morton <akpm@linux-foundation.org>


Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/md/raid5.c |    5 -----
 1 file changed, 5 deletions(-)

diff -puN drivers/md/raid5.c~git-md-accel-fixup drivers/md/raid5.c
--- a/drivers/md/raid5.c~git-md-accel-fixup
+++ a/drivers/md/raid5.c
@@ -1566,14 +1566,9 @@ static void compute_parity6(struct strip
 /* Compute one missing block */
 static void compute_block_1(struct stripe_head *sh, int dd_idx, int nozero)
 {
-<<<<<<< HEAD/drivers/md/raid5.c
-	int i, count, disks = sh->disks;
-	void *ptr[MAX_XOR_BLOCKS], *p;
-=======
 	raid6_conf_t *conf = sh->raid_conf;
 	int i, count, disks = conf->raid_disks;
 	void *ptr[MAX_XOR_BLOCKS], *dest, *p;
->>>>>>> /drivers/md/raid5.c
 	int pd_idx = sh->pd_idx;
 	int qd_idx = raid6_next_disk(pd_idx, disks);
 
_