# Conflicts:
#	openair2/GNB_APP/gnb_config.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf

Update documentation to be able to run OAI gNB with OAI UE and COTS UE with the same configuration file

# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c

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

integration_2022_wk17

See merge request oai/openairinterface5g!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>