# Conflicts:
#	executables/nr-uesoftmodem.c
#	executables/nr-uesoftmodem.h
#	executables/softmodem-common.h
#	openair1/PHY/MODULATION/slot_fep_nr.c
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
#	openair1/SCHED_NR/fapi_nr_l1.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/LAYER2/NR_MAC_UE/mac_proto.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing

Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing

Conflicts:
	executables/nr-ru.c
	openair1/PHY/NR_TRANSPORT/nr_dci.c
	openair1/PHY/NR_TRANSPORT/nr_dci_tools.c

MR !1081 : Prb based channel estimation
-An option for using average channel estimates over 1 prb is introduced in DLSCH and ULSCH. 
This improved BLER performance for MCS 28 when prbs are allocated across DC.

MR !1231 : Nr msg3 retransmission
-Implement re-transmission of MSG3 gNB and UE
-Fixes content resolution timer at UE

MR !1236 : nr: add T trace for msg4 (rrc setup)

Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing

Conflicts:
	executables/nr-ru.c

MR 1170 : 5G nFAPI Improvements
- Bugfixes in packing/unpacking
- Adds uplink indication functionality
- Changes the nFAPI system architecture to account for architecture changes in the develop branch
- Adds nFAPI system documentation
- Removes hardcodings

MR 1222 : Update RRC ASN1 file to version 16.4.1 

MR 1223 : Fixes to NR UE MAC PDU generation 
- included MAC CE sub-PDUs size in the computation of RLC data to transmit this fixes the error with residual mac pdu appearing at gNB side when transmitting higher amount of data 
-  got rid of the nr_generate_ulsch_pdu and moved the relevant UL-SCH MAC PDU generation procedure within the nr_ue_get_sdu and nr_ue_get_rach 
-  reduced memcpy calls and unnecessary memory allocations 
-  fetching RLC data and SDU size from the mac_rlc_data_req, removed the call to mac_rlc_get_buffer_occupancy_ind 
-  introduced a new function to generate the MAC CEs sub-PDUs 
-  removed unnecessary function input parameters 
-  minor fixes and cleanup 
-  enhanced logging

MR 1227 : removed duplicate structure, changed 'x' to 'r' and 'y' to 'i'

Conflicts:
	executables/nr-ru.c
	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.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.c
	openair2/RRC/NR/rrc_gNB_reconfig.c