# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

integration_2022_wk15b

See merge request !1524

MR !1508 Remove NR UE PDCCH

Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UE_thread_improvement_IDCC

# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_TRANSPORT/nr_dci.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c

# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/NR_REFSIG/nr_refsig.h
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h

integration_2022_wk15

See merge request !1522

# Conflicts:
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

integration_2022_wk14

See merge request !1519

MR 1471 : L2 sim fixes and 5G SA L2SIM CI integration  
MR 1325 : SDAP  
Cherry-picks on MR 1517 : correct gNB fail detection  
MR 1464 : LDPC decoder memory optim  
MR 1514 : Amarisoft UE automation

 -- Excluded the 2nd UE container IP address from capture
 -- Also added support for multiple UEs for dlsch_ulsch_stats

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Manish authored 2 years ago and Raphael Defosseux committed 2 years ago

Signed-off-by: Manish <Manish1.Kumar@amd.com>

Merge remote-tracking branch 'origin/episys-throughput-updates-and-downlink-siso-cm' into integration_2022_wk14