linux-next: manual merge of the powerpc tree with the asm-generic tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the powerpc tree got a conflict in:

  lib/raid6/test/Makefile

between commit:

  fa523d54a7eb ("raid: remove tile specific raid6 implementation")

from the asm-generic tree and commit:

  751ba79cc552 ("lib/raid6/altivec: Add vpermxor implementation for raid6 Q syndrome")

from the powerpc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc lib/raid6/test/Makefile
index fabc477b1417,5050e270c06b..000000000000
--- a/lib/raid6/test/Makefile
+++ b/lib/raid6/test/Makefile
@@@ -45,12 -45,17 +45,14 @@@ else ifeq ($(HAS_NEON),yes
          CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1
  else
          HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\
-                          gcc -c -x c - >&/dev/null && \
-                          rm ./-.o && echo yes)
+                          gcc -c -x c - >/dev/null && rm ./-.o && echo yes)
          ifeq ($(HAS_ALTIVEC),yes)
-                 OBJS += altivec1.o altivec2.o altivec4.o altivec8.o
+                 CFLAGS += -I../../../arch/powerpc/include
+                 CFLAGS += -DCONFIG_ALTIVEC
+                 OBJS += altivec1.o altivec2.o altivec4.o altivec8.o \
+                         vpermxor1.o vpermxor2.o vpermxor4.o vpermxor8.o
          endif
  endif
 -ifeq ($(ARCH),tilegx)
 -OBJS += tilegx8.o
 -endif
  
  .c.o:
  	$(CC) $(CFLAGS) -c -o $@ $<
@@@ -117,7 -137,8 +131,7 @@@ tables.c: mktable
  	./mktables > tables.c
  
  clean:
- 	rm -f *.o *.a mktables mktables.c *.uc int*.c altivec*.c neon*.c tables.c raid6test
+ 	rm -f *.o *.a mktables mktables.c *.uc int*.c altivec*.c vpermxor*.c neon*.c tables.c raid6test
 -	rm -f tilegx*.c
  
  spotless: clean
  	rm -f *~

Attachment: pgpKlJMiXunwj.pgp
Description: OpenPGP digital signature