archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the akpm tree with the csky tree
@ 2020-05-14 10:20 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2020-05-14 10:20 UTC (permalink / raw)
  To: Andrew Morton, Guo Ren
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Dmitry Safonov

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

Hi all,

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


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.

Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2020-05-14 10:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-14 10:20 linux-next: manual merge of the akpm tree with the csky tree Stephen Rothwell

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).