rmagueta 6f19524e95 Merge remote-tracking branch 'origin/CSI-SA' into develop-CSI ...

# 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

2022-02-22 15:10:20 +00:00

..

nr_compute_tbs_common.c

Enhancements to the overall MAC logging

2021-11-05 16:05:10 +01:00

nr_mac_common.c

Merge remote-tracking branch 'origin/CSI-SA' into develop-CSI

2022-02-22 15:10:20 +00:00

nr_mac_common.h

Merge remote-tracking branch 'origin/CSI-SA' into develop-CSI

2022-02-22 15:10:20 +00:00

nr_mac_extern.h

Merge branch 'eurecom-develop' into episys/mel/sa_development_init

2021-11-03 08:54:06 -07:00

nr_mac.h

Fixing MR based on OAI feedback

2021-11-08 10:59:28 -08:00