Hi Greg, Apologies for the late posting. These are the updates that I have for the next merge window if that's still doable.
Six patches add support for exporting more of ftrace via STM, 3 of them get into ftrace territory, but Steven reviewed all of them and there should be no conflicts. Two patches add new PCI IDs to the Intel TH driver, which would normally go in a "fixes" patchset, but this late in the cycle that doesn't make much sense, so they are included in the same series. Alexander Shishkin (2): intel_th: pci: Add Alder Lake-S support intel_th: pci: Add Alder Lake CPU support Tingwei Zhang (6): stm class: ftrace: Change dependency to TRACING tracing: Add flag to control different traces tracing: Add trace_export support for event trace tracing: Add trace_export support for trace_marker stm class: ftrace: Enable supported trace export flag stm class: ftrace: Use different channel accroding to CPU drivers/hwtracing/intel_th/pci.c | 10 ++ drivers/hwtracing/stm/Kconfig | 2 +- drivers/hwtracing/stm/ftrace.c | 7 +- include/linux/trace.h | 7 + kernel/trace/trace.c | 270 +++++++++++++++++-------------- 5 files changed, 169 insertions(+), 127 deletions(-) -- 2.28.0
