merge develop, no big issue, we are sync

openair2/COMMON/gtpv1_u_messages_types.h

@@ -191,6 +191,7 @@ typedef struct gtpv1u_gnb_create_tunnel_req_s {
   int                    num_tunnels;
   teid_t                 upf_NGu_teid[NR_GTPV1U_MAX_BEARERS_PER_UE];  ///< Tunnel Endpoint Identifier
   pdusessionid_t         pdusession_id[NR_GTPV1U_MAX_BEARERS_PER_UE];
+  ebi_t                  incoming_rb_id[NR_GTPV1U_MAX_BEARERS_PER_UE];
   transport_layer_addr_t upf_addr[NR_GTPV1U_MAX_BEARERS_PER_UE];
 } gtpv1u_gnb_create_tunnel_req_t;
 

openair2/COMMON/rrc_messages_types.h

@@ -411,6 +411,7 @@ typedef struct NRRrcConfigurationReq_s {
   int                     ssb_SubcarrierOffset;
   int                     pdsch_AntennaPorts;
   int                     pusch_AntennaPorts;
+  int                     do_CSIRS;
   int                     pusch_TargetSNRx10;
   int                     pucch_TargetSNRx10;
 } gNB_RrcConfigurationReq;