Xue Song 834d6f1055 Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo ...

Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c

2021-03-05 19:07:43 +09:00

..

COMMON

Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo

2021-03-05 19:07:43 +09:00

DOCS

Fixing errored/missing circular dependency protection

2020-05-15 15:39:11 +02:00

ENB_APP

Merge remote-tracking branch 'origin/lte_uplink_improvement' into integration_2021_wk04_b

2021-01-29 07:41:47 +01:00

F1AP

fix build error of enb and ittisim

2021-02-10 01:07:02 +00:00

GNB_APP

Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo

2021-03-05 19:07:43 +09:00

LAYER2

Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo

2021-03-05 19:07:43 +09:00

M2AP

itti dynamic queue creation, and 64 bits instance id

2020-12-23 13:56:01 +01:00

MCE_APP

itti dynamic queue creation, and 64 bits instance id

2020-12-23 13:56:01 +01:00

NETWORK_DRIVER

trivial merge with develop"

2021-02-11 13:27:00 +01:00

NR_PHY_INTERFACE

merge MR978 (5G nFAPI) into develop

2021-02-12 16:26:22 +05:30

NR_UE_PHY_INTERFACE

move unreachable LOG_D() in NR_IF_Module.c

2021-01-27 12:05:34 +01:00

PHY_INTERFACE

Merge conflicts resolved

2021-02-08 18:05:29 +05:30

RRC

Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo

2021-03-05 19:07:43 +09:00

SDAP/nr_sdap

Create asn1 file

2020-09-03 17:17:47 +09:00

SIMULATION/NR_RRC

Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo

2021-03-05 19:07:43 +09:00

UTIL

NSA: some work on security (for PDCP)

2021-02-12 16:01:37 +01:00

X2AP

lte/nr x2ap: fix content of SgNBAdditionRequest

2021-02-01 11:48:44 +01:00