# Conflicts:
#	openair2/RRC/NR_UE/rrc_UE.c

# Conflicts:
#	cmake_targets/CMakeLists.txt

MR1006 : itti enhancement
-new feature: creates itti queue during runtime 
-modified itti message instance

MR1012 : 5G NR: UL transform precoding (SC-FDMA)

MR1022 : Wireshark t hack ueid

MR997 : LTE uplink improvement
-LTE update about uplink performance improvement and some bug fixes from Fujitsu.
-Fix uplink calculation error in SCD and PHY layer.
-Add interference calculation for PUSCH.
-Update TPC control.
-Fix nFAPI hang-up
-Fix DRB is non active after Re-establishment.
-Msg3 PHICH problem.
-Add statistical logs.


MR1030 : CI RHEL container update
-CI adaptation to build the shared and target images on asterix and obelix Python framework

MR1023 : ci ue parallel
-Enables OAI UE parallelization in CI tests (where applicable)

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

    fix ssh connection when remote server has public key
Signed-off-by: Mohammed Ismail <mohammed.ismail@eurecom.fr>

Signed-off-by: Mohammed Ismail <mohammed.ismail@eurecom.fr>

Same logic as previous commit, same caveats.

There was a problem with several UEs in the wireshark log. It seems that
wireshark needs the UE id otherwise it gets confused and sees retransmissions
where it's just another UE connecting and doing the same as a previous
UE.

Let's put kind of a UE id. Each RNTI seen by macpdu2wireshark gets an UE id
assigned the first time it's seen in a trace.

This is a bit hackish but seems to be fine.

We could have added UE_id in all the traces, that is change the T() calls
in the softmodem. It was less work to do it as it is, ie. only touch
macpdu2wireshark.c.

The RAR uses the same UE id all the time, may be a problem. To be refined
if needed.

You need a recent version of wireshark for this to work properly.
Successfully tested with 3.3.2.

Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c