From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>, Guo Ren <ren_guo@c-sky•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Dmitry Safonov <dima@arista•com>
Subject: linux-next: manual merge of the akpm tree with the csky tree
Date: Thu, 14 May 2020 20:20:08 +1000 [thread overview]
Message-ID: <20200514202008.5ba89194@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 851 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2020-05-14 10:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200514202008.5ba89194@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dima@arista$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ren_guo@c-sky$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox