From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Masahiro Yamada <masahiroy@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Uday Shankar <ushankar@purestorage.com>
Subject: linux-next: manual merge of the ftrace tree with the kbuild tree
Date: Mon, 24 Mar 2025 16:41:11 +1100 [thread overview]
Message-ID: <20250324164111.20c92791@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
Hi all,
Today's linux-next merge of the ftrace tree got a conflict in:
scripts/tracing/draw_functrace.py
between commit:
9d702bb1d3c0 ("scripts: make python shebangs specific about desired version")
from the kbuild tree and commit:
a926d15a799a ("scripts/tracing: Remove scripts/tracing/draw_functrace.py")
from the ftrace tree.
I fixed it up (I just removed the file) 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:[~2025-03-24 5:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-24 5:41 Stephen Rothwell [this message]
2025-03-30 23:57 ` linux-next: manual merge of the ftrace tree with the kbuild tree Stephen Rothwell
2025-03-31 16:12 ` Steven Rostedt
-- strict thread matches above, loose matches on Subject: below --
2022-01-12 0:21 Stephen Rothwell
2022-01-14 6:46 ` Stephen Rothwell
2022-01-16 21:52 ` 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=20250324164111.20c92791@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=mhiramat@kernel.org \
--cc=rostedt@goodmis.org \
--cc=ushankar@purestorage.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