Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

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.

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