Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/CODING/TESTBENCH/ldpctest.c
	openair1/PHY/CODING/defs.h
	openair1/PHY/CODING/ldpc_generate_coefficient.c

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c

Conflicts:
	openair1/PHY/CODING/ldpc_encoder.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c

ldpc_encoder now supports again BG1 and BG2 where the original non-optimized algorithm is used for BG1

Merge branch 'gNB_mwc18_integration' of https://gitlab.eurecom.fr/oai-nr/openairinterface5g into gNB_mwc18_integration

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/SCHED/ru_procedures.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c

Merge branch 'RU-RAU-split-parallel-EMUFH' of http://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split-parallel-EMUFH

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c

adding an addition error check on harq_pid as it is sometimes not in range. root cause still to be identified

adding an addition error check on harq_pid as it is sometimes not in range. root cause still to be identified

bugfix in dlsch_encoding for multiple segments. changing TBS for MCS 4, 6 and 28 for 100PRB to be compatible with LDPC

Conflicts:
	openair1/PHY/CODING/ldpc_encoder.c