linux-kernel - linux-next: manual merge of the akpm-current tree with the asm-generic tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20181220184403.464d0e3f@canb.auug.org.au>
Date:   Thu, 20 Dec 2018 18:44:03 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Arnd Bergmann <arnd@...db.de>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Firoz Khan <firoz.khan@...aro.org>,
        Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>
Subject: linux-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

Content of type "application/pgp-signature" skipped