From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47355/head -> cms-sw/refs/pull/47355/head
Switched to branch 'merge-attempt'
Auto-merging FWCore/Framework/test/checkForModuleDependencyCorrectness_t.cppunit.cc
Merge made by the 'ort' strategy.
 .../src/SiStripSpyEventMatcher.cc                  |  6 +-
 DQMServices/FwkIO/plugins/DQMRootOutputModule.cc   |  6 +-
 DQMServices/FwkIO/plugins/format.h                 |  3 +-
 .../interface/HardwareResourcesDescription.h       |  9 +++
 .../Provenance/interface/ModuleDescription.h       |  1 -
 .../Provenance/interface/ProcessConfiguration.h    | 20 ++++--
 .../Provenance/src/HardwareResourcesDescription.cc |  2 +
 DataFormats/Provenance/src/ModuleDescription.cc    |  5 +-
 DataFormats/Provenance/src/ProcessConfiguration.cc | 19 +++---
 DataFormats/Provenance/src/ProcessHistory.cc       |  4 +-
 .../test/HardwareResourcesDescription_t.cpp        |  1 +
 FWCore/AbstractServices/BuildFile.xml              |  2 +
 .../interface/ResourceInformation.h                |  4 ++
 FWCore/AbstractServices/src/ResourceInformation.cc |  9 +++
 FWCore/Framework/src/ScheduleItems.cc              |  7 ++-
 FWCore/Framework/test/Event_t.cpp                  | 10 +--
 ...heckForModuleDependencyCorrectness_t.cppunit.cc |  3 +-
 .../test/edproducer_productregistry_callback.cc    | 13 ++--
 .../test/event_getrefbeforeput_t.cppunit.cc        |  6 +-
 FWCore/Framework/test/eventprincipal_t.cppunit.cc  | 10 ++-
 FWCore/Framework/test/generichandle_t.cppunit.cc   |  7 ++-
 FWCore/Framework/test/maker2_t.cppunit.cc          |  5 +-
 .../plugins/DelayedReaderThrowingSource.cc         |  4 +-
 FWCore/Integration/plugins/PutOrMergeTestSource.cc |  2 +-
 FWCore/Integration/test/ProcessConfiguration_t.cpp | 49 ++++++++++++++-
 FWCore/Integration/test/ProcessHistory_t.cpp       | 72 +++++++++++++---------
 FWCore/Sources/src/DaqProvenanceHelper.cc          | 18 ++++--
 FWCore/TestProcessor/src/TestProcessor.cc          |  2 +-
 .../LHEInterface/plugins/BuildFile.xml             |  1 +
 .../LHEInterface/plugins/LHEProvenanceHelper.cc    | 11 +++-
 IOPool/Common/bin/EdmProvDump.cc                   | 19 ++++--
 IOPool/Common/test/removeChangingParts.py          |  2 -
 IOPool/Common/test/unit_test_outputs/provdump.log  |  2 +-
 IOPool/Input/src/ProvenanceAdaptor.cc              |  2 +-
 IOPool/Input/test/BuildFile.xml                    |  3 +-
 .../test/testReducedProcessHistoryCreate_cfg.py    | 19 +++++-
 .../testReducedProcessHistoryHardwareResources.sh  | 26 ++++++++
 ...tory.sh => testReducedProcessHistoryVersion.sh} |  0
 IOPool/SecondaryInput/test/SecondaryProducer.cc    |  6 +-
 IOPool/Streamer/test/BuildFile.xml                 |  3 +-
 ...n_TestReducedProcessHistoryHardwareResources.sh | 21 +++++++
 ....sh => run_TestReducedProcessHistoryVersion.sh} |  0
 .../test/testReducedProcessHistoryCreate_cfg.py    | 18 +++++-
 Mixing/Base/src/PileUp.cc                          |  5 +-
 44 files changed, 315 insertions(+), 122 deletions(-)
 create mode 100755 IOPool/Input/test/testReducedProcessHistoryHardwareResources.sh
 rename IOPool/Input/test/{testReducedProcessHistory.sh => testReducedProcessHistoryVersion.sh} (100%)
 create mode 100755 IOPool/Streamer/test/run_TestReducedProcessHistoryHardwareResources.sh
 rename IOPool/Streamer/test/{run_TestReducedProcessHistory.sh => run_TestReducedProcessHistoryVersion.sh} (100%)
Switched to branch 'from-CMSSW_15_1_X_2025-02-17-1100'