linux-kernel - linux-next: manual merge of the akpm tree with the csky 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: <20200514202008.5ba89194@canb.auug.org.au>
Date:   Thu, 14 May 2020 20:20:08 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Guo Ren <ren_guo@...ky.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Dmitry Safonov <dima@...sta.com>
Subject: linux-next: manual merge of the akpm tree with the csky tree

Hi all,

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

  arch/csky/kernel/dumpstabkc.c

between commit:

  18c07d23da5a ("csky: Fixup calltrace panic")

from the csky tree and patches:

  "csky: add show_stack_loglvl()"
  "kernel: rename show_stack_loglvl() => show_stack()"

from the akpm tree.

I fixed it up (that file was removed by the former commit and show_stack
was moved, so I applied a patch similar to that used for riscv) 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

Content of type "application/pgp-signature" skipped