# Conflicts:
#	executables/softmodem-common.h
#	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/prachsim.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

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

MR #1148 : Fix coreset dmrs idx
 -- Fix coreset dmrs idx for coresets with more than 1 symbol duration

MR #1139 : bugfix for sib1 in case of ssb different from 0
 -- solving a small bug in handling sib1 relative to ssb other than 0

MR #1136 : CI: Migration of the physical-simulators to OpenShift
 -- switch to a parallel pod deployment on the OpenShift Cluster
 -- Huge gain in time : 1h30m down to 25 minutes

MR #1134 : Docker improvements 2021 april
 -- updated the LTE-UE image generation.
    * Proper configuration file in nfapi case
    * Proper entrypoint

MR #1131 : Removing deprecated dl and ul_bwp_dedicated in config request at UE

MR #1091 : Ue pdsch pusch parallel
 -- The UE code for now is unfit to process more than 1 slot in parallel.
    This is why the PUCCH signal is not transmitted most of the time.
    Hence, the following changes are made:

    * Process only one slot at a time. Previously it was 2 slots in parallel.
    * Now we do parallelization with the slot i.e., PUSCH and PDSCH are processed in parallel.
    * Option for the UE to go back to sync mode instead of stopping if it loses sync with gNB. Command line parameter --non-stop enables it.
    * New feature: Included a mechanism to detect false DCIs.

MR #1147 : benetel conf files fix

handling of SDAP header, move RAR to slot last DL slot in TDD period (need change in configuration file)

changes in gtpu interface for testing, small changes in L1 for PUSCH signal/noise measurements. SRB2 interfaces.

# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c

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

# Conflicts:
#	executables/nr-uesoftmodem.h
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	openair2/RRC/NR_UE/L2_interface_ue.c

Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS

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

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

Include second RRC Reconfiguration message to carry DRB, SRB2 configuration and NAS PDU Session Establishment Accept message

-Remove DRB and SRB configuration from the first RRC Reconfiguration message. Missing radio configuration to be filled in first RRC Reconfiguration message.

CMAC_Init has to be called between each usage of the cmac context.