From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven Rostedt <rostedt@goodmis.org>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Colin Ian King <colin.king@canonical.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the ftrace tree with the tip tree
Date: Mon, 22 Mar 2021 14:45:03 +1100 [thread overview]
Message-ID: <20210322144503.26e2b6ca@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 786 bytes --]
Hi all,
Today's linux-next merge of the ftrace tree got a conflict in:
arch/x86/kernel/kprobes/ftrace.c
between commit:
d9f6e12fb0b7 ("x86: Fix various typos in comments")
from the tip tree and commit:
e0196ae73234 ("ftrace: Fix spelling mistake "disabed" -> "disabled"")
from the ftrace tree.
I fixed it up (I used the former - it fixed a second typo in the same
comment) 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:[~2021-03-22 3:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-22 3:45 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-07 1:39 linux-next: manual merge of the ftrace tree with the tip tree Stephen Rothwell
2019-11-21 4:10 Stephen Rothwell
2019-11-28 0:47 ` Stephen Rothwell
2019-11-28 1:00 ` Steven Rostedt
2016-09-07 5:25 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=20210322144503.26e2b6ca@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=colin.king@canonical.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).