LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Michael Ellerman <mpe@ellerman.id.au>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	PowerPC <linuxppc-dev@lists.ozlabs.org>,
	Arnd Bergmann <arnd@arndb.de>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Matt Brown <matthew.brown.dev@gmail.com>
Subject: linux-next: manual merge of the powerpc tree with the asm-generic tree
Date: Wed, 21 Mar 2018 10:26:18 +1100	[thread overview]
Message-ID: <20180321102618.4b46f1b4@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2115 bytes --]

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

                 reply	other threads:[~2018-03-20 23:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180321102618.4b46f1b4@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=benh@kernel.crashing.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=matthew.brown.dev@gmail.com \
    --cc=mpe@ellerman.id.au \
    --subject='Re: linux-next: manual merge of the powerpc tree with the asm-generic tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).