Skip to content
  • Roberto Louro Magueta's avatar
    Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts2 · 160cb0b9
    Roberto Louro Magueta authored
    # Conflicts:
    #	cmake_targets/CMakeLists.txt
    #	cmake_targets/build_oai
    #	cmake_targets/tools/build_helper
    #	executables/nr-gnb.c
    #	openair1/PHY/INIT/nr_init_ru.c
    #	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
    #	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
    #	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
    #	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
    #	openair1/SCHED_NR/phy_procedures_nr_gNB.c
    #	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
    #	openair2/F1AP/f1ap_du_rrc_message_transfer.c
    #	openair2/F1AP/f1ap_du_rrc_message_transfer.h
    #	openair2/F1AP/f1ap_du_task.c
    #	openair2/GNB_APP/gnb_app.c
    #	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
    #	openair2/LAYER2/NR_MAC_gNB/config.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.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_uci.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
    #	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
    #	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
    #	openair2/RRC/LTE/rrc_eNB_GTPV1U.c
    #	openair2/RRC/NR/L2_nr_interface.c
    #	openair2/RRC/NR/MESSAGES/asn1_msg.c
    #	openair2/RRC/NR/rrc_gNB.c
    #	openair2/RRC/NR/rrc_gNB_NGAP.c
    #	openair2/RRC/NR_UE/rrc_UE.c
    #	openair3/NAS/NR_UE/nr_nas_msg_sim.c
    #	openair3/ocp-gtpu/gtp_itf.cpp
    #	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
    160cb0b9