From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47659/head -> cms-sw/refs/pull/47659/head
Switched to branch 'merge-attempt'
Auto-merging FWCore/Framework/src/EventProcessor.cc
Merge made by the 'ort' strategy.
 .../interface/SubProcessParentageHelper.h          |  32 -
 .../Provenance/src/SubProcessParentageHelper.cc    |  20 -
 FWCore/Common/interface/FWCoreCommonFwd.h          |   1 -
 FWCore/Common/interface/OutputProcessBlockHelper.h |   3 +-
 FWCore/Common/interface/ProcessBlockHelper.h       |  32 +-
 FWCore/Common/interface/ProcessBlockHelperBase.h   |   7 +-
 FWCore/Common/interface/SubProcessBlockHelper.h    |  35 -
 FWCore/Common/src/OutputProcessBlockHelper.cc      |  11 +-
 FWCore/Common/src/SubProcessBlockHelper.cc         |  75 --
 .../Common/test/test_catch2_ProcessBlockHelpers.cc |   3 -
 FWCore/Framework/bin/cmsRun.cpp                    |   3 +-
 FWCore/Framework/interface/EventProcessor.h        |   2 -
 .../interface/MergeableRunProductMetadata.h        |   3 -
 .../Framework/interface/ProductResolversFactory.h  |  10 +-
 FWCore/Framework/interface/Schedule.h              |   7 +-
 FWCore/Framework/interface/ScheduleItems.h         |  13 -
 .../interface/SignallingProductRegistryFiller.h    |   4 -
 FWCore/Framework/interface/SubProcess.h            | 322 --------
 FWCore/Framework/interface/globalTransitionAsync.h | 149 ----
 FWCore/Framework/interface/one/OutputModuleBase.h  |   6 -
 FWCore/Framework/interface/streamTransitionAsync.h | 160 ----
 FWCore/Framework/src/CommonParams.h                |   4 +-
 FWCore/Framework/src/EventProcessor.cc             | 218 +-----
 .../Framework/src/MergeableRunProductMetadata.cc   |   1 -
 FWCore/Framework/src/OutputModuleDescription.h     |  10 +-
 FWCore/Framework/src/ProductResolvers.cc           |  38 +-
 FWCore/Framework/src/ProductResolvers.h            |  71 --
 FWCore/Framework/src/ProductResolversFactory.cc    |  29 +-
 FWCore/Framework/src/Schedule.cc                   |  22 +-
 FWCore/Framework/src/ScheduleItems.cc              |  59 --
 FWCore/Framework/src/SubProcess.cc                 | 870 ---------------------
 FWCore/Framework/src/SystemTimeKeeper.cc           |   5 +-
 .../src/TriggerResultsBasedEventSelector.cc        |   2 -
 FWCore/Framework/src/one/OutputModuleBase.cc       |   5 +-
 FWCore/Framework/test/stream_filter_t.cppunit.cc   |   2 +-
 FWCore/Framework/test/stream_producer_t.cppunit.cc |   2 +-
 FWCore/Framework/test/stubs/HistoryAnalyzer.cc     |   4 +-
 FWCore/Integration/plugins/TestParentage.cc        |   7 +-
 FWCore/ParameterSet/interface/IllegalParameters.h  |   2 -
 FWCore/TestProcessor/src/TestProcessor.cc          |  93 +--
 IOPool/Common/bin/EdmProvDump.cc                   |   1 -
 IOPool/Output/src/PoolOutputModule.cc              |   7 -
 42 files changed, 127 insertions(+), 2223 deletions(-)
 delete mode 100644 DataFormats/Provenance/interface/SubProcessParentageHelper.h
 delete mode 100644 DataFormats/Provenance/src/SubProcessParentageHelper.cc
 delete mode 100644 FWCore/Common/interface/SubProcessBlockHelper.h
 delete mode 100644 FWCore/Common/src/SubProcessBlockHelper.cc
 delete mode 100644 FWCore/Framework/interface/SubProcess.h
 delete mode 100644 FWCore/Framework/interface/globalTransitionAsync.h
 delete mode 100644 FWCore/Framework/interface/streamTransitionAsync.h
 delete mode 100644 FWCore/Framework/src/SubProcess.cc
Switched to branch 'from-CMSSW_15_1_X_2025-03-21-1100'