# Conflicts:
#	ci-scripts/cls_oaicitest.py

MR !1161 : Improvements on CCE-to-REG mapping and interleaver
- Improvements on CCE-to-REG mapping and interleaver to support coresets with more than 1 symbol duration

MR !1153 : Nr cleanup pucch resources
- Removing unused PUCCH resources and accordingly increasing the PUCCH symbol allocation by 1 unit (now 13 symbols in regular slot)

MR !1162 : [CI] nsa and benetel pipelines with quectel
-adapt iperf routines for quectel 
-change quectel NIC name 
-new NSA test markers for eNB and gNB 
-several bugfixes (CI python)

MR !1164 : fix compile
- Fix several compilation issues nr-ittisim, uescope, telnetsrv, 
- fixed also the F1AP asn1c recompilation 
- some compilation warnings struct members "Status" is a problem as long as we use a Xwindow include

MR !1154 : implementation of handling csi and harq in the same pucch2
- Implementation of multiplexing CSI report and ACKs in the same PUCCH (format 2)

MR !1158 : Fix nr_ulsim
- fix call nr_ue_pusch_common_procedures() in nr_ulsim. This means there was no actual PUSCH transmission and all LLR were 0

MR !1159 : physim-deploy-handle-error-cases
-When failing, physim test on openshift cluster is not properly creating HTML report 
-Removing trailing / in xxx.git/ 
-Increased timeout of git checkout -f calls

MR !1165 : [CI] fixing test retry for module UE
- CI hotfix for module UE ip addresses mgt

MR !1166 : [CI] NSA uplink + benetel longrun
-fix moduleUE UL iperf implem
-add UL test for benetel
-xml file cleaning
-new benetel long run test

# Conflicts:
#	ci-scripts/cls_oaicitest.py

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Merge remote-tracking branch 'origin/NR_multiplexing_HARQ_CSI_PUCCH' into develop-NR_SA_F1AP_5GRECORDS

# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h

# Conflicts:
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c

# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair2/RRC/NR_UE/rrc_UE.c
#	openair2/SIMULATION/NR_RRC/itti_sim.c

Merge remote-tracking branch 'origin/ci_hotfix_module_ue_ip_address' into develop-NR_SA_F1AP_5GRECORDS

Merge remote-tracking branch 'origin/physim-deploy-handle-error-cases' into develop-NR_SA_F1AP_5GRECORDS

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>