# Conflicts:
#	openair2/GNB_APP/MACRLC_nr_paramdef.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

integration_2022_wk21

See merge request oai/openairinterface5g!1564

Merge remote-tracking branch 'origin/NR_removing_calculate_preferred_tda' into integration_2022_wk21

In the past, setting k2=2 for 5ms TDD periods resulted in increased ping
RTT and/or reestablishment requests. These problems do not appear
anymore, and we can allow k2=2.

# Conflicts:
#	openair1/PHY/NR_TRANSPORT/srs_rx.c

In the past, activation of slot 0 (i.e., after the switch UL->DL)
resulted in many retransmissions. This does not seem to be the case
anymore, and we can therefore activate slot 0 also in TDD.

# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c