Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c

Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

-After that no DL traffic is getting blocked at the Accelleran CU for low values of throughput
-Remaining to remove the hardcoded value of buffer availability and report the actual value from the DU.

Merge branch 'tdd25period_for_MR' of https://gitlab.eurecom.fr/oai/openairinterface5g into tdd25period_for_MR

Conflicts:
	openair1/PHY/NR_TRANSPORT/pucch_rx.c

- extra logging for CRNTI procedure (to catch bug in nr_free_list

integration_2022_wk12_a

See merge request oai/openairinterface5g!1503

Signed-off-by: Manish <Manish1.Kumar@amd.com>

Replace the N310. Thus, the management IP address works, and the second
SFP connector can be used.

Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

integration_2022_wk11

See merge request oai/openairinterface5g!1495

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

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

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

The basic simulator can be replaced with the RF simulator. Use option
--rfsim.

Integration 2022 wk10

See merge request oai/openairinterface5g!1485

Deletes the second_addr parameter in all files that also use the
mgmt_addr=192.168.18.240 (asterix's N310).

some bugfixes for CSI reporting with PUCCH2. Configuration of cqi_Table 2 for CSI reporting when 256-QAM is enabled.

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SIMULATION/NR_PHY/dlschsim.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair3/ocp-gtpu/gtp_itf.cpp
	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf