From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48042/head -> cms-sw/refs/pull/48042/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Configuration/HLT/python/autoCondHLT.py            |    14 +-
 Configuration/HLT/python/autoHLT.py                |     2 +-
 .../{HLT_2025v10_cff.py => HLT_2025v11_cff.py}     | 18132 ++++++-----
 HLTrigger/Configuration/python/HLT_FULL_cff.py     | 31138 +++++++++---------
 HLTrigger/Configuration/python/HLT_Fake1_cff.py    |     4 +-
 HLTrigger/Configuration/python/HLT_Fake2_cff.py    |     4 +-
 HLTrigger/Configuration/python/HLT_Fake_cff.py     |     4 +-
 HLTrigger/Configuration/python/HLT_GRun_cff.py     | 18126 ++++++-----
 HLTrigger/Configuration/python/HLT_HIon_cff.py     | 11538 +++----
 HLTrigger/Configuration/python/HLT_PIon_cff.py     |     4 +-
 HLTrigger/Configuration/python/HLT_PRef_cff.py     |  1230 +-
 HLTrigger/Configuration/python/HLT_Special_cff.py  |  7084 ++---
 .../python/HLTrigger_Datasets_GRun_cff.py          |  4509 +--
 .../python/HLTrigger_Datasets_HIon_cff.py          | 10760 +++----
 .../python/HLTrigger_Datasets_PRef_cff.py          |   623 +-
 .../python/HLTrigger_Datasets_Special_cff.py       |   418 +-
 HLTrigger/Configuration/python/Tools/options.py    |     2 +-
 .../Configuration/scripts/utils/hltPathOwners.json |    81 +-
 HLTrigger/Configuration/tables/GRun.txt            |    18 +-
 HLTrigger/Configuration/tables/PRef.txt            |     2 -
 HLTrigger/Configuration/tables/Special.txt         |    25 +-
 HLTrigger/Configuration/tables/makeOnlineGRun      |     2 +-
 .../tables/online_FirstCollisions.txt              |    30 +-
 HLTrigger/Configuration/tables/online_LumiScan.txt |    17 +
 HLTrigger/Configuration/tables/online_PPS.txt      |    17 +-
 HLTrigger/Configuration/tables/online_Special.txt  |    25 +-
 HLTrigger/Configuration/tables/online_grun.txt     |    18 +-
 HLTrigger/Configuration/tables/online_pref.txt     |     2 -
 ...OnLine_HLT_2025v10.py => OnLine_HLT_2025v11.py} | 24100 +++++++-------
 HLTrigger/Configuration/test/OnLine_HLT_FULL.py    | 31572 ++++++++++---------
 HLTrigger/Configuration/test/OnLine_HLT_Fake.py    |     4 +-
 HLTrigger/Configuration/test/OnLine_HLT_Fake1.py   |     4 +-
 HLTrigger/Configuration/test/OnLine_HLT_Fake2.py   |     4 +-
 HLTrigger/Configuration/test/OnLine_HLT_GRun.py    | 24074 +++++++-------
 HLTrigger/Configuration/test/OnLine_HLT_HIon.py    | 11538 +++----
 HLTrigger/Configuration/test/OnLine_HLT_PIon.py    |     4 +-
 HLTrigger/Configuration/test/OnLine_HLT_PRef.py    |  1233 +-
 HLTrigger/Configuration/test/OnLine_HLT_Special.py |  7706 ++---
 HLTrigger/Configuration/test/cmsDriver.csh         |    12 +-
 HLTrigger/Configuration/test/getFrozenHLT.sh       |     2 +-
 HLTrigger/Configuration/test/runIntegration.csh    |     4 +-
 HLTrigger/Configuration/test/runOne.csh            |     4 +-
 42 files changed, 107527 insertions(+), 96563 deletions(-)
 rename HLTrigger/Configuration/python/{HLT_2025v10_cff.py => HLT_2025v11_cff.py} (92%)
 rename HLTrigger/Configuration/test/{OnLine_HLT_2025v10.py => OnLine_HLT_2025v11.py} (92%)
Switched to branch 'from-CMSSW_15_1_X_2025-05-08-1100'