Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1659351 > unrolled thread

linux-next: manual merge of the tip tree with the unicore32 tree

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the tip tree with the unicore32 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-07 05:20 +0200

#1659351 — linux-next: manual merge of the tip tree with the unicore32 tree

Hi all,

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

  arch/unicore32/include/asm/Kbuild

between commit:

  bc27113620ca ("unicore32-oldabi: add oldabi syscall interface")

from the unicore32 tree and commit:

  6bc51cbaa9d7 ("signal: Remove non-uapi <asm/siginfo.h>")

from the tip 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 arch/unicore32/include/asm/Kbuild
index ea47c4bf3aa7,7a53a55341de..000000000000
--- a/arch/unicore32/include/asm/Kbuild
+++ b/arch/unicore32/include/asm/Kbuild
@@@ -44,7 -44,7 +44,6 @@@ generic-y += serial.
  generic-y += setup.h
  generic-y += shmbuf.h
  generic-y += shmparam.h
- generic-y += siginfo.h
 -generic-y += signal.h
  generic-y += sizes.h
  generic-y += socket.h
  generic-y += sockios.h

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web