From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47675/head -> cms-sw/refs/pull/47675/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../test/ppsTimingCalibrationAnalyzer_cfg.py       |  2 +-
 .../test/DiamondCalibrationWorker_cfg.py           |  2 +-
 .../test/DiamondSampicCalibrationHarvester_cfg.py  |  2 +-
 .../test/DiamondSampicCalibrationWorker_cfg.py     |  2 +-
 .../python/Common/PoolDBESSource_cfi.py            |  1 -
 .../test/ppsTimingCalibrationLUTAnalyzer_cfg.py    |  2 +-
 .../DQM/test/DQMXMLFileEventSetupAnalyzer_cfg.py   |  3 ---
 .../RunInfo/test/LHCInfoPerFillAnalyzer_cfg.py     |  2 +-
 CondTools/RunInfo/test/LHCInfoPerLSAnalyzer_cfg.py |  2 +-
 .../SiPixel/test/SiPixelBadModuleReader_cfg.py     |  2 --
 .../test/SiPixelCondObjAllPayloadsReader_cfg.py    |  1 -
 .../SiPixel/test/SiPixelCondObjForHLTReader_cfg.py |  1 -
 .../test/SiPixelCondObjOfflineReader_cfg.py        |  1 -
 ...SiPixelGainCalibrationRejectNoisyAndDead_cfg.py |  1 -
 .../test/SiStripApvGainFromASCIIFile_cfg.py        |  3 ---
 .../SiStrip/test/SiStripBadChannelPatcher_cfg.py   |  3 ---
 .../SiStrip/test/SiStripBadStripReader_cfg.py      | 22 ++++++++++------------
 .../SiStrip/test/SiStripFedCablingReader_cfg.py    |  2 --
 CondTools/SiStrip/test/SiStripSummaryReader_cfg.py |  2 --
 .../SiStrip/test/SiStripThresholdReader_cfg.py     |  2 --
 DQM/CTPPS/test/diamond_re_reco_dqm_test_cfg.py     |  2 +-
 RecoPPS/Local/test/diamonds_reco_cfg.py            |  2 +-
 .../test/totemTiming_digiConverter_reco_cfg.py     |  2 +-
 RecoPPS/Local/test/totemTiming_reco_cfg.py         |  2 +-
 24 files changed, 21 insertions(+), 45 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-03-23-2300'