From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47467/head -> cms-sw/refs/pull/47467/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. EventFilter/Utilities/interface/EvFDaqDirector.h | 1 - .../Utilities/interface/FastMonitoringService.h | 4 +- EventFilter/Utilities/src/FastMonitoringService.cc | 3 +- FWCore/Framework/interface/GlobalSchedule.h | 1 - FWCore/Framework/interface/Schedule.h | 1 - FWCore/Framework/src/EventProcessor.cc | 3 +- FWCore/Framework/src/GlobalSchedule.cc | 5 +-- FWCore/Framework/src/Schedule.cc | 3 +- FWCore/Framework/src/SubProcess.cc | 3 +- .../PathsAndConsumesOfModulesTestService.cc | 6 ++- FWCore/Integration/plugins/TestServiceOne.cc | 2 +- FWCore/Integration/plugins/TestServiceOne.h | 2 +- FWCore/PrescaleService/interface/PrescaleService.h | 3 +- FWCore/PrescaleService/src/PrescaleService.cc | 2 +- .../ServiceRegistry/interface/ActivityRegistry.h | 4 +- FWCore/Services/plugins/CheckTransitions.cc | 1 - FWCore/Services/plugins/CondorStatusUpdater.cc | 4 +- FWCore/Services/plugins/DependencyGraph.cc | 15 ++----- FWCore/Services/plugins/Timing.cc | 4 +- FWCore/Services/plugins/Tracer.cc | 4 +- FWCore/Services/plugins/tracer_setupFile.cc | 2 +- FWCore/TestProcessor/src/TestProcessor.cc | 11 +---- HLTrigger/Timer/interface/ProcessCallGraph.h | 4 +- HLTrigger/Timer/plugins/FastTimerService.cc | 12 ++---- HLTrigger/Timer/plugins/FastTimerService.h | 3 +- HLTrigger/Timer/src/ProcessCallGraph.cc | 4 +- .../CUDAServices/plugins/NVProfilerService.cc | 50 ++++++++++++---------- .../SonicTriton/interface/TritonService.h | 3 +- HeterogeneousCore/SonicTriton/src/TritonService.cc | 2 +- .../plugins/RandomNumberGeneratorService.cc | 4 +- .../plugins/RandomNumberGeneratorService.h | 2 +- .../plugins/ModuleEventAllocMonitor.cc | 2 +- .../AllocMonitor/plugins/moduleAlloc_setupFile.cc | 2 +- 33 files changed, 71 insertions(+), 101 deletions(-) Switched to branch 'from-CMSSW_15_1_X_2025-04-10-1100'