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

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

integration_2022_wk13b

See merge request oai/openairinterface5g!1515

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

In --do-ra mode, calculate_preferred_dl_tda() would be called without a
BWP. Then, get_searchspace() would search in the scc, leading to a
segfault. Therefore, don't call calculate_preferred_dl_tda() in do-ra
mode.

# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c

# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	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
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf

Merge remote-tracking branch 'origin/fix-running-modem-in-generic-fedora-container' into integration_2022_wk13b

integration_2022_wk13

See merge request oai/openairinterface5g!1510

Signed-off-by: Manish <Manish1.Kumar@amd.com>

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