Skip to contentSkip to conversation

linux-next: duplicate patch in the ftrace tree

DISCUSSION Stephen Rothwell 2 participants 2 messages Sep 4, 2023 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi all,

The following commit is also in Linus Torvalds' tree as a different commit (but the same patch):

bd96000ba862 ("Documentation: tracing: Update fprobe event example with BTF field")

This is commit

a2439a4c9085 ("Documentation: tracing: Update fprobe event example with BTF field")

in Linus' tree.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw
Quoted 6 lines · On Tue, 5 Sep 2023 07:50:33 +1000 Stephen Rothwell <[email protected]> wrote:

Hi all,

The following commit is also in Linus Torvalds' tree as a different commit (but the same patch):

bd96000ba862 ("Documentation: tracing: Update fprobe event example with BTF field")

Hmm, this is included in my topic branch. Anyway, let me rebase it on linus tree.

Thank you!

Quoted 10 lines

This is commit

a2439a4c9085 ("Documentation: tracing: Update fprobe event example with BTF field")

in Linus' tree.

Signature · 2 lines
Cheers,
Stephen Rothwell
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>