# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.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_primitives.c
#	openair2/RRC/NR/rrc_gNB_nsa.c

Integration 2022 wk08

See merge request oai/openairinterface5g!1459

# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
#	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	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_primitives.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/nr_rrc_proto.h
#	openair2/RRC/NR/rrc_gNB_nsa.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c

# Conflicts:
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c

This reverts commit 777074ff.

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

         recover the full MAGMA-MME log
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

fix(doc): updated the Tutorial with only MAGMA-MME references and logs
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

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

fix(ci): display state of container when failure, better tshark filtering, auto-undeploy if deploy went wrong
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

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

integration_2022_wk07_c

See merge request oai/openairinterface5g!1451

This merges the following MRs:
- MR !1436 fairRR LTE scheduler fixes: should make the connection more stable, less UL retransmissions
- MR !1386 phy sync improvements: the 5G NR UE should sync better
- MR !1361 FDD support (no traffic): adds FDD support for the scheduler, but heavy traffic has not been tested
- MR !1447 using uid for PUCCH RRC conf: use the RRC UID to decide on PUCCH resources, should in particular avoid the "PUCCH straddles DC carrier" assert
- fix for 5G F1 RFsim test fail

add use_mmap parameter for the record player device
fix assertion when replaying without using mmap