# Conflicts:
#	openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/nr_rrc_config.c

# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

integration_2022_wk17

See merge request !1539

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

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

Conflicts:
	targets/ARCH/rfsimulator/simulator.c

Conflicts:
	openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c

fix 2 bugs: one new introduced by merge develop, one introduced by extra change asked in code review

 - Better mechanism for qlog cleaning
 - Faster attachment check
 - html.py is confusing for some python3 installation -- renaming it

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

Several problems were found and fixed.

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

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

* Proxy no longer required for git cloning
* Most of the IP addresses have been changed
  - Remaining --> 192.168.18.89 for amariue

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

The code completely changed, expect problems.

Fix segmentation fault at UE for 2x2

See merge request !1527