# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

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_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h

integration_2022_wk11

See merge request oai/openairinterface5g!1495

# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c

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).

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

  * Also added obsolence messages for the old L2 simulator since 2022.w01 EpiSci merge
  * Added link to their new tutorial
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

From the comment above the line with the warning:
> This asn1cCalloc leaks memory but also masks a bug.
> If we delete this asn1cCalloc statement, eNB will crash in NSA mode.
> Please don't delete the following line unless the bug has been found