Xue Song e1a92eadba Merge branch 'master' into develop_SA_rfsim_for_F1 ...

Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c

2021-02-10 15:56:50 +09:00

..

COMMON

Merge branch 'master' into develop_SA_rfsim_for_F1

2021-02-04 18:16:37 +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 develop_SA_rfsim_for_F1

2021-02-04 18:16:37 +09:00

LAYER2

Merge branch 'master' into develop_SA_rfsim_for_F1

2021-02-10 15:56:50 +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

fix memory allocation error

2021-01-10 21:41:22 +01:00

NR_PHY_INTERFACE

Merge remote-tracking branch 'origin/NR-PHY-MAC-IF-multi-UE' into rh_wk50_debug

2020-12-09 09:48:40 +01:00

NR_UE_PHY_INTERFACE

move unreachable LOG_D() in NR_IF_Module.c

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

PHY_INTERFACE

Remove Mutexes in phy_stub_UE.c

2020-10-13 08:49:30 +02:00

RRC

Merge branch 'master' into develop_SA_rfsim_for_F1

2021-02-10 15:56:50 +09:00

SDAP/nr_sdap

Create asn1 file

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

SIMULATION/NR_RRC

fix build error of enb and ittisim

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

UTIL

Merge branch 'develop_SA_SIM' into develop_SA_L3

2020-11-24 09:15:52 +00:00

X2AP

lte/nr x2ap: fix content of SgNBAdditionRequest

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