From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47498/head -> cms-sw/refs/pull/47498/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Alignment/CocoaModel/src/DeviationsFromFileSensor2D.cc           | 2 ++
 Alignment/CocoaModel/src/Measurement.cc                          | 4 ++--
 Alignment/OfflineValidation/bin/haddws.C                         | 2 +-
 Alignment/OfflineValidation/macros/loopAndPlot.C                 | 2 +-
 CalibCalorimetry/CastorCalib/src/CastorDbHardcode.cc             | 1 -
 CalibCalorimetry/CastorCalib/src/CastorPedestalAnalysis.cc       | 1 -
 CalibCalorimetry/EcalLaserAnalyzer/src/MELaserPrim.cc            | 2 --
 CalibFormats/SiPixelObjects/interface/PixelConfigBase.h          | 2 +-
 CalibFormats/SiPixelObjects/src/PixelFEDCard.cc                  | 1 -
 .../plugins/SiPixelGainCalibrationAnalysis.cc                    | 9 +++------
 CalibTracker/SiStripAPVAnalysis/src/TT6ApvMask.cc                | 2 --
 CondCore/Utilities/bin/conddb_copy_iov.cpp                       | 1 -
 CondCore/Utilities/bin/conddb_edit_tag.cpp                       | 1 -
 CondCore/Utilities/bin/conddb_import.cpp                         | 1 -
 CondCore/Utilities/bin/conddb_test.cpp                           | 1 -
 CondCore/Utilities/bin/conddb_test_gt_load.cpp                   | 1 -
 CondCore/Utilities/bin/conddb_test_gt_perf.cpp                   | 1 -
 CondCore/Utilities/bin/conddb_test_read.cpp                      | 1 -
 CondCore/Utilities/src/CondDBImport.cc                           | 1 -
 CondFormats/DTObjects/src/DTReadOutMapping.cc                    | 1 -
 CondFormats/L1TObjects/src/L1GtTriggerMenu.cc                    | 1 -
 CondTools/DT/src/DTExpandMap.cc                                  | 1 -
 CondTools/DT/src/DTHVStatusHandler.cc                            | 1 -
 23 files changed, 10 insertions(+), 30 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-03-05-1100'