From: Steven Rostedt Date: Wed, 14 Aug 2024 20:56:42 +0000 (-0400) Subject: Merge tag 'v6.11-rc3' into trace/ring-buffer/core X-Git-Tag: v6.12-rc1~107^2~13 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ee057c8c194b9283f4137b253b70e292693a39f0;p=linux-block.git Merge tag 'v6.11-rc3' into trace/ring-buffer/core The "reserve_mem" kernel command line parameter has been pulled into v6.11. Merge the latest -rc3 to allow the persistent ring buffer memory to be able to be mapped at the address specified by the "reserve_mem" command line parameter. Signed-off-by: Steven Rostedt (Google) --- ee057c8c194b9283f4137b253b70e292693a39f0