# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf

integration_2022_wk13

See merge request oai/openairinterface5g!1510

  - The GitLab pipeline reporting for the 5G RF sim container was the same as 4G RF
  - Calling a sudo command without providing password
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

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

  -- In case we do multiple merges per week
  -- Also use the proper week numbering (ISO week number, with Monday as first day of week (01..53))
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

  * using focal instead of xenial (new cppcheck version)
  * detecting the difference in stats with latest develop stats
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

* The quectel CM program output is now redirected to a file. Easier to follow when running
* I added `-i 1` option to all server iperf commands to have details
* module-based iperf logs are also copied to the RAN enb log folder so they are artifacted
* iperf3 console output was badly formatted
* `docker kill --signal INT` does not stop the container
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_REFSIG/nr_gold.c
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair1/PHY/defs_nr_common.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

integration_2022_wk12_a

See merge request oai/openairinterface5g!1503

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

Merge branch 'develop-2oaiue-doc-update' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-2oaiue-doc-update

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

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

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.

integration_2022_wk11

See merge request oai/openairinterface5g!1495