Conflicts:
	executables/nr-ru.c
	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_reconfig.c

Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing

Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing

Conflicts:
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c

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

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

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

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

fix(docker): typo in ran.rhel8 dockerfile, cleanup on other dockerfiles, proper tag for 5G RF sim docker-compose
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Integration Branch : 2021 week 32

See merge request oai/openairinterface5g!1224

The following Merge Requests have been included:

* MR [1198] : 5G UE UCI procedurers at MAC
* MR [1207] : Code-cleanup-20210716
* MR [1215] : NR UL antenna ports cleanup
* MR [1220] : Temporary fix for CORESET configuration in SIB1
* MR [1221] : Container: adding conf template to gNB container image

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

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

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

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

Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c

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

         also added how to pull RAN images
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into code-cleanup-20210716

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

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