From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47280/head -> cms-sw/refs/pull/47280/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 FWCore/AbstractServices/BuildFile.xml              |  3 ++
 .../interface/ResourceInformation.h                | 12 +++----
 FWCore/AbstractServices/src/ResourceInformation.cc |  6 ++++
 FWCore/Framework/BuildFile.xml                     |  1 +
 FWCore/Framework/src/ScheduleItems.cc              |  4 +--
 FWCore/Services/BuildFile.xml                      |  3 +-
 FWCore/Services/plugins/CPU.cc                     |  2 +-
 FWCore/Services/plugins/CondorStatusUpdater.cc     |  2 +-
 .../Services/plugins/ResourceInformationService.cc | 42 +++++++++++-----------
 FWCore/Utilities/src/ResourceInformation.cc        |  4 ---
 .../CUDAServices/plugins/BuildFile.xml             |  1 +
 .../CUDAServices/plugins/CUDAService.cc            |  2 +-
 HeterogeneousCore/CUDAServices/test/BuildFile.xml  |  1 +
 .../CUDAServices/test/testCUDAService.cpp          |  3 +-
 .../ROCmServices/plugins/BuildFile.xml             |  1 +
 .../ROCmServices/plugins/ROCmService.cc            |  2 +-
 HeterogeneousCore/ROCmServices/test/BuildFile.xml  |  1 +
 PhysicsTools/PyTorch/test/BuildFile.xml            |  1 +
 PhysicsTools/PyTorch/test/testBaseCUDA.h           |  2 +-
 PhysicsTools/TensorFlow/BuildFile.xml              |  1 +
 PhysicsTools/TensorFlow/src/TensorFlow.cc          |  6 ++--
 PhysicsTools/TensorFlow/test/BuildFile.xml         |  7 ++++
 PhysicsTools/TensorFlow/test/testBaseCUDA.h        |  2 +-
 23 files changed, 64 insertions(+), 45 deletions(-)
 create mode 100644 FWCore/AbstractServices/BuildFile.xml
 rename FWCore/{Utilities => AbstractServices}/interface/ResourceInformation.h (81%)
 create mode 100644 FWCore/AbstractServices/src/ResourceInformation.cc
 delete mode 100644 FWCore/Utilities/src/ResourceInformation.cc
Switched to branch 'from-CMSSW_15_0_X_2025-02-05-2300'