Eurecom f83c02d981 Merge branch 'NR_2port_CSIRS' into CSI-SA ...

Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.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/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp

2021-10-17 02:13:11 +02:00

..

COMMON

Merge remote-tracking branch 'origin/develop' into bandwidth-testing

2021-09-05 15:37:11 +02:00

DOCS

Fixing errored/missing circular dependency protection

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

ENB_APP

switchpoint advance for X300

2021-09-20 23:28:13 +02:00

F1AP

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

2021-07-12 14:02:31 +02:00

GNB_APP

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

2021-10-16 16:04:54 +02:00

LAYER2

Merge branch 'NR_2port_CSIRS' into CSI-SA

2021-10-17 02:13:11 +02:00

M2AP

itti dynamic queue creation, and 64 bits instance id

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

MCE_APP

code-cleanup-20210716

2021-07-16 17:16:15 +02:00

NETWORK_DRIVER

try to fix CUDA, and fix infinite loop in nr UE uplink data collect

2021-08-05 17:31:31 +02:00

NR_PHY_INTERFACE

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

2021-08-25 16:02:31 +02:00

NR_UE_PHY_INTERFACE

skip dlsch mac pdu processing when crc fails

2021-08-27 12:42:25 +02:00

PHY_INTERFACE

CMakeList cleanup,improvement and trial to run in ubuntu 16

2021-07-25 13:52:01 +02:00

RRC

Merge branch 'NR_2port_CSIRS' into CSI-SA

2021-10-17 02:13:11 +02:00

SDAP/nr_sdap

Create asn1 file

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

SIMULATION/NR_RRC

Change some LOG levels

2021-06-05 14:20:39 +01:00

UTIL

nfapi work around (missing malloc)

2021-07-22 15:32:09 +02:00

X2AP

merge develop

2021-07-02 12:22:42 +02:00