# Conflicts:
#	common/utils/system.c

MR !1179 : Fix Incorrect Array Size computation  
MR !1182 : CI NSA test fixes and enhancements  
MR !1169 : Dataplane bug in L2NFAPI_NOS1

This reverts commit 7011c0d9

# Conflicts:
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

This work is based on feedback from Thomas Schlichter.
His comments and suggestions were made just after the original MR was merged.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

MR !1180: \[CI\] nsa traces 
-NSA test and pipeline update for UE-module
-improve traces and log collection (pcap, QLog, stats)
 
MR !1126: bugfix-nr-t-reordering 
-deal with "infinity" case for t-reordering
-some small fixes (one bug i pdcp, one log set to LOG_E in rlc)
 
MR !1168: nr-pdcp-small-bugfixes
-better nettle version detection
-bad HFN computation at PDU reception

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

# Conflicts:
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c

MR !1171 : \[RHEL8\]\[CONTAINER\] Runtime check when creating pThreads  
MR !1172 : \[Docker\] adding OAI LTE RU target build in a container image  
MR !1174 : flexran-rtc repository is now public  
MR !1167 : fixing bugs in pucch ue functions