integration_2022_wk35b

• MR !785 (merged) Add .clang-format file
• MR !1487 (merged) LDPC offload on T1 card
• MR !1677 (merged) NR LBRM for UL
• MR !1683 (merged) Schedule ULSCH in flexible slots in InitialBWP
• MR !1674 (merged) Optimize nr_rotation
• MR !1685 (merged) Fix AssertFatal in Msg3
• MR !1684 (merged) Implementation of a RA timer to remove UE in the case of Msg4 not be decoded by the UE
• MR !1669 (merged) Fixes when there is no spCellConfig configured
• MR !1648 (merged) simplify thread pool configuration
• MR !1609 (merged) improve-nr_ul_channel_estimation

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c

@@ -591,13 +591,9 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
     //////////////////////////////////////////////////////////////////////////////////////////
   }
   for (r=0; r<nbDecode; r++) {
-<<<<<<< HEAD
-    notifiedFIFO_elt_t *req=pullTpool(&nf, &(pool_dl));
+    notifiedFIFO_elt_t *req=pullTpool(&nf,  &get_nrUE_params()->Tpool);
     if (req == NULL)
       break; // Tpool has been stopped
-=======
-    notifiedFIFO_elt_t *req=pullTpool(&nf, &get_nrUE_params()->Tpool);
->>>>>>> e9caae6f99 (simplify thread pool configuration)
     bool last = false;
     if (r == nbDecode - 1)
       last = true;