lisa.trace: Fix FtraceConf.merge() (!2010) · Merge requests · Tooling / lisa · GitLab

GitLab Maintenance scheduled for Thursday, 18th December 2025, from 7:00 AM to 10:00 AM BST. GitLab will be in read-only mode and experience short periods of complete downtime (up to 20 minutes) during this window.

Douglas Raillard requested to merge github/fork/douglas-raillard-arm/_home_pr90245 into master May 30, 2023

FIX

Fix a typo in FtraceConf.merge() that would ignore the events in one of the configurations.