From: Stephen Rothwell <sfr@canb.auug.org.au>
To: 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>,
Masahiro Yamada <masahiroy@kernel.org>
Subject: linux-next: manual merge of the csky tree with Linus' tree
Date: Sat, 4 Apr 2020 10:13:14 +1100 [thread overview]
Message-ID: <20200404101314.72468dd9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 747 bytes --]
Hi all,
Today's linux-next merge of the csky tree got a conflict in:
arch/csky/include/asm/Kbuild
between commit:
630f289b7114 ("asm-generic: make more kernel-space headers mandatory")
from Linus' tree and commit:
33e53ae1ce41 ("csky: Add kprobes supported")
from the csky tree.
I fixed it up (the former is a superset of the latter) 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 --]
next reply other threads:[~2020-04-03 23:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 23:13 Stephen Rothwell [this message]
[not found] <CAJF2gTRc-NtpRS4ScQbgZAzN+thSejRXgHUuPwm3avYOCpPX2w@mail.gmail.com>
2022-04-04 23:06 ` Palmer Dabbelt
-- strict thread matches above, loose matches on Subject: below --
2022-04-03 22:24 Stephen Rothwell
2022-04-03 22:14 Stephen Rothwell
2020-01-05 22:20 Stephen Rothwell
2020-01-06 15:46 ` Guo Ren
2019-01-06 23:27 Stephen Rothwell
2019-01-07 6:53 ` Christoph Hellwig
2019-01-07 10:30 ` Stephen Rothwell
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=20200404101314.72468dd9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=ren_guo@c-sky.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®