From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/48437/head -> cms-sw/refs/pull/48437/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Configuration/HLT/python/autoCondHLT.py            |    8 +-
 Configuration/HLT/python/autoHLT.py                |    2 +-
 .../{HLT_2025v11_cff.py => HLT_2025v12_cff.py}     | 8751 ++++++++++---------
 HLTrigger/Configuration/python/HLT_FULL_cff.py     | 9043 +++++++++----------
 HLTrigger/Configuration/python/HLT_GRun_cff.py     | 8377 +++++++++---------
 HLTrigger/Configuration/python/HLT_HIon_cff.py     |   11 +-
 HLTrigger/Configuration/python/HLT_PIon_cff.py     |  131 +-
 HLTrigger/Configuration/python/HLT_PRef_cff.py     |  687 +-
 HLTrigger/Configuration/python/HLT_Special_cff.py  | 4347 +++++++++-
 .../python/HLTrigger_Datasets_GRun_cff.py          | 4004 ++++-----
 .../python/HLTrigger_Datasets_PRef_cff.py          |  348 +-
 .../python/HLTrigger_Datasets_Special_cff.py       |    9 +
 .../python/HLTrigger_EventContent_cff.py           |    2 +
 HLTrigger/Configuration/python/Tools/options.py    |    2 +-
 .../Configuration/scripts/utils/hltPathOwners.json |   20 +
 HLTrigger/Configuration/tables/GRun.txt            |    1 +
 HLTrigger/Configuration/tables/Special.txt         |    7 +
 HLTrigger/Configuration/tables/makeOnlineGRun      |    2 +-
 HLTrigger/Configuration/tables/online_LumiScan.txt |    7 +
 HLTrigger/Configuration/tables/online_Special.txt  |    7 +
 HLTrigger/Configuration/tables/online_grun.txt     |    1 +
 ...OnLine_HLT_2025v11.py => OnLine_HLT_2025v12.py} | 8833 ++++++++++---------
 HLTrigger/Configuration/test/OnLine_HLT_FULL.py    | 9086 ++++++++++----------
 HLTrigger/Configuration/test/OnLine_HLT_GRun.py    | 8420 +++++++++---------
 HLTrigger/Configuration/test/OnLine_HLT_HIon.py    |   11 +-
 HLTrigger/Configuration/test/OnLine_HLT_PIon.py    |  131 +-
 HLTrigger/Configuration/test/OnLine_HLT_PRef.py    |  687 +-
 HLTrigger/Configuration/test/OnLine_HLT_Special.py | 4412 +++++++++-
 HLTrigger/Configuration/test/cmsDriver.csh         |   12 +-
 HLTrigger/Configuration/test/getFrozenHLT.sh       |    2 +-
 HLTrigger/Configuration/test/runIntegration.csh    |    4 +-
 HLTrigger/Configuration/test/runOne.csh            |    4 +-
 32 files changed, 38329 insertions(+), 29040 deletions(-)
 rename HLTrigger/Configuration/python/{HLT_2025v11_cff.py => HLT_2025v12_cff.py} (94%)
 rename HLTrigger/Configuration/test/{OnLine_HLT_2025v11.py => OnLine_HLT_2025v12.py} (94%)
Switched to branch 'from-CMSSW_15_1_X_2025-06-27-2300'