From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Oct 2023 01:50:48 +0000 (-0700)
Subject: Merge tag 'probes-fixes-v6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6-pxa1908~97
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=213f891525c222e8ed145ce1ce7ae1f47921cb9c;p=linux.git

Merge tag 'probes-fixes-v6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull probes fixes from Masami Hiramatsu:

 - Fix fprobe document to add a new ret_ip parameter for callback
   functions. This has been introduced in v6.5 but the document was not
   updated.

 - Fix fprobe to check the number of active retprobes is not zero. This
   number is passed from parameter or calculated by the parameter and it
   can be zero which is not acceptable. But current code only check it
   is not minus.

* tag 'probes-fixes-v6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  fprobe: Fix to ensure the number of active retprobes is not zero
  Documentation: probes: Add a new ret_ip callback parameter
---

213f891525c222e8ed145ce1ce7ae1f47921cb9c