linux-next: duplicate patches in the ftrace tree

linux-next: duplicate patches in the ftrace tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 895 bytes --]

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  2740abcc36cb ("Allow forcing unconditional bootconfig processing")
  d3a1913404bf ("bootconfig: Default BOOT_CONFIG_FORCE to y if BOOT_CONFIG_EMBED")
  9739868a6e5b ("bootconfig: Increase max nodes of bootconfig from 1024 to 8192 for DCC support")
  9f58b99c9c40 ("tracing/probe: add a char type to show the character value of traced arguments")

These are commits

  b743852ccc1d ("Allow forcing unconditional bootconfig processing")
  6ded8a28ed80 ("bootconfig: Default BOOT_CONFIG_FORCE to y if BOOT_CONFIG_EMBED")
  6c40624930c5 ("bootconfig: Increase max nodes of bootconfig from 1024 to 8192 for DCC support")
  8478cca1e3ab ("tracing/probe: add a char type to show the character value of traced arguments")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patches in the ftrace tree

[Masami Hiramatsu]

On Fri, 24 Feb 2023 16:34:26 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>   2740abcc36cb ("Allow forcing unconditional bootconfig processing")
>   d3a1913404bf ("bootconfig: Default BOOT_CONFIG_FORCE to y if BOOT_CONFIG_EMBED")
>   9739868a6e5b ("bootconfig: Increase max nodes of bootconfig from 1024 to 8192 for DCC support")
>   9f58b99c9c40 ("tracing/probe: add a char type to show the character value of traced arguments")
> 
> These are commits
> 
>   b743852ccc1d ("Allow forcing unconditional bootconfig processing")
>   6ded8a28ed80 ("bootconfig: Default BOOT_CONFIG_FORCE to y if BOOT_CONFIG_EMBED")
>   6c40624930c5 ("bootconfig: Increase max nodes of bootconfig from 1024 to 8192 for DCC support")
>   8478cca1e3ab ("tracing/probe: add a char type to show the character value of traced arguments")

Oops, that may be my mistake. I've update bootconfig/for-next which only has the
commits went to the Linus tree. I think linux-trace/for-next is an old set.
Steve, can you update the for-next branch?

Thank you,

> 
> in Linus' tree.
> 
> -- 
> Cheers,
> Stephen Rothwell


-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>

linux-next: duplicate patches in the ftrace tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 562 bytes --]

Hi all,

The following commits are also in the mm tree as different commits
(but the same patches):

  4336cc15b9f7 ("selftests: use canonical ftrace path")
  d1c27c55427e ("leaking_addresses: also skip canonical ftrace path")
  c2f92e8b2d24 ("tools/kvm_stat: use canonical ftrace path")

these are commits

  7dcf5bf9ae8a ("selftests: use canonical ftrace path")
  4ea6b3463c3e ("leaking_addresses: also skip canonical ftrace path")
  d791c1b3e996 ("tools/kvm_stat: use canonical ftrace path")

in the mm tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patches in the ftrace tree

[Ross Zwisler]

On Mon, Apr 03, 2023 at 02:51:15PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in the mm tree as different commits
> (but the same patches):
> 
>   4336cc15b9f7 ("selftests: use canonical ftrace path")
>   d1c27c55427e ("leaking_addresses: also skip canonical ftrace path")
>   c2f92e8b2d24 ("tools/kvm_stat: use canonical ftrace path")
> 
> these are commits
> 
>   7dcf5bf9ae8a ("selftests: use canonical ftrace path")
>   4ea6b3463c3e ("leaking_addresses: also skip canonical ftrace path")
>   d791c1b3e996 ("tools/kvm_stat: use canonical ftrace path")
> 
> in the mm tree.

Thanks, it looks like akpm dropped them from the mm tree, so that conflict
should be resolved.

linux-next: duplicate patches in the ftrace tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 589 bytes --]

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  e46ad59233cf ("selftests/ftrace: Add new test case which checks for optimized probes")
  bd2cdc432190 ("selftests/ftrace: Add new test case which adds multiple consecutive probes in a function")

These are commits

  5985329c7073 ("selftests/ftrace: Add new test case which checks for optimized probes")
  cf9071dd46e7 ("selftests/ftrace: Add new test case which adds multiple consecutive probes in a function")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patches in the ftrace tree

[Masami Hiramatsu]

Thanks for the caution!

On Fri, 14 Jul 2023 14:54:04 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>   e46ad59233cf ("selftests/ftrace: Add new test case which checks for optimized probes")
>   bd2cdc432190 ("selftests/ftrace: Add new test case which adds multiple consecutive probes in a function")

These are only in next-20230714.

> 
> These are commits
> 
>   5985329c7073 ("selftests/ftrace: Add new test case which checks for optimized probes")
>   cf9071dd46e7 ("selftests/ftrace: Add new test case which adds multiple consecutive probes in a function")

I confirmed the latter pair was pushed by my probes-v6.5.
So the latter one should be kept.

Ah, sorry, I missed to update probes/for-next. That caused this issue.
Let me update the probes/for-next branch.

Thank you,

> 
> in Linus' tree.
> 
> -- 
> Cheers,
> Stephen Rothwell


-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>

linux-next: duplicate patches in the ftrace tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 633 bytes --]

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  1a41e44aaf63 ("tracepoint: Support iterating over tracepoints on modules")
  3c842de2d916 ("sefltests/tracing: Add a test for tracepoint events on modules")
  4ca74b253b11 ("tracepoint: Support iterating tracepoints in a loading module")
  59c9f2923c04 ("tracing/fprobe: Support raw tracepoints on future loaded modules")
  8e327678a908 ("kprobes: Remove obsoleted declaration for init_test_probes")
  c37e4bc7f70a ("tracing/fprobe: Support raw tracepoint events on modules")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patches in the ftrace tree

[Steven Rostedt]

On Fri, 27 Sep 2024 07:54:39 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>   1a41e44aaf63 ("tracepoint: Support iterating over tracepoints on modules")
>   3c842de2d916 ("sefltests/tracing: Add a test for tracepoint events on modules")
>   4ca74b253b11 ("tracepoint: Support iterating tracepoints in a loading module")
>   59c9f2923c04 ("tracing/fprobe: Support raw tracepoints on future loaded modules")
>   8e327678a908 ("kprobes: Remove obsoleted declaration for init_test_probes")
>   c37e4bc7f70a ("tracing/fprobe: Support raw tracepoint events on modules")
> 

Hmm, seems that Masami rebased his for-next branch. I just updated the
tracing for-next tree. They should have the same commits again.

-- Steve

linux-next: duplicate patches in the ftrace tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1420 bytes --]

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  0e5d1a4b22bc ("ring-buffer: Remove the unused variable bmeta")
  186a3d01d596 ("module: Add module_for_each_mod() function")
  34c9862b1833 ("tracing: Skip update_last_data() if cleared and remove active check for save_mod()")
  45be9d6a4e4c ("ring-buffer: Use kaslr address instead of text delta")
  47d1b7233ae8 ("ring-buffer: Add ring_buffer_meta_scratch()")
  4cb6fa440707 ("tracing: Show module names and addresses of last boot")
  7f335d104d30 ("ring-buffer: Add buffer meta data for persistent ring buffer")
  9042bbf70203 ("tracing: Freeable reserved ring buffer")
  aad5fa4e9de1 ("mm/memblock: Add reserved memory release function")
  bab85a646dd9 ("tracing: Show last module text symbols in the stacktrace")
  c6a1b7c2e58d ("tracing: Update modules to persistent instances when loaded")
  dca91c1c5468 ("tracing: Have persistent trace instances save module addresses")
  dfc0b3249550 ("tracing: Initialize scratch_size to zero to prevent UB")
  e39a2f30d23c ("tracing: Fix a compilation error without CONFIG_MODULES")
  f20423262b36 ("tracing: Use _text and the kernel offset in last_boot_info")
  f5d0a66ca482 ("tracing: Have persistent trace instances save KASLR offset")
  ff700de3978f ("ring-buffer: Fix bytes_dropped calculation issue")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patches in the ftrace tree

[Steven Rostedt]

On Tue, 1 Apr 2025 09:40:14 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>   0e5d1a4b22bc ("ring-buffer: Remove the unused variable bmeta")
>   186a3d01d596 ("module: Add module_for_each_mod() function")
>   34c9862b1833 ("tracing: Skip update_last_data() if cleared and remove active check for save_mod()")
>   45be9d6a4e4c ("ring-buffer: Use kaslr address instead of text delta")
>   47d1b7233ae8 ("ring-buffer: Add ring_buffer_meta_scratch()")
>   4cb6fa440707 ("tracing: Show module names and addresses of last boot")
>   7f335d104d30 ("ring-buffer: Add buffer meta data for persistent ring buffer")
>   9042bbf70203 ("tracing: Freeable reserved ring buffer")
>   aad5fa4e9de1 ("mm/memblock: Add reserved memory release function")
>   bab85a646dd9 ("tracing: Show last module text symbols in the stacktrace")
>   c6a1b7c2e58d ("tracing: Update modules to persistent instances when loaded")
>   dca91c1c5468 ("tracing: Have persistent trace instances save module addresses")
>   dfc0b3249550 ("tracing: Initialize scratch_size to zero to prevent UB")
>   e39a2f30d23c ("tracing: Fix a compilation error without CONFIG_MODULES")
>   f20423262b36 ("tracing: Use _text and the kernel offset in last_boot_info")
>   f5d0a66ca482 ("tracing: Have persistent trace instances save KASLR offset")
>   ff700de3978f ("ring-buffer: Fix bytes_dropped calculation issue")
> 

Ah thanks. Linus didn't like the first patch in that series so I rebased
without it, tested it, and sent a second pull request. I forgot to update
my for-next branch to include that update. I'll do that now.

-- Steve