lkml.org 
[lkml]   [2018]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm-current tree with the asm-generic tree
Hi all,

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

arch/sh/include/asm/Kbuild

between commit:

2b3c5a99d5f3 ("sh: generate uapi header and syscall table header files")

from the asm-generic tree and commit:

548211e87ba0 ("sh: include: convert to SPDX identifiers")

from the akpm-current 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/sh/include/asm/Kbuild
index b15caf34813a,f4440779deab..000000000000
--- a/arch/sh/include/asm/Kbuild
+++ b/arch/sh/include/asm/Kbuild
@@@ -1,4 -1,4 +1,5 @@@
+ # SPDX-License-Identifier: GPL-2.0
+generated-y += syscall_table.h
generic-y += compat.h
generic-y += current.h
generic-y += delay.h
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2018-12-20 08:44    [W:0.032 / U:29.544 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site