change back to org database, removed patch nvip

docker/Dockerfile.gNB.aerial.ubuntu20

@@ -47,11 +47,6 @@ COPY . .
 RUN /bin/sh oaienv && \
     tar -xvzf nvipc_src.*.tar.gz && \
     cd nvipc_src.* && \
-<<<<<<< Updated upstream
-=======
-#    git init && \
-#    git apply ../cmake_targets/tools/install_libraries_to_system.patch --verbose && \
->>>>>>> Stashed changes
     rm -rf build && mkdir build && cd build && \
     cmake .. -DNVIPC_DPDK_ENABLE=OFF -DNVIPC_DOCA_ENABLE=OFF -DNVIPC_CUDA_ENABLE=OFF -DENABLE_SLT_RSP=ON && \
     make -j && make install
@@ -104,4 +99,4 @@ COPY --from=ran-build \
 WORKDIR /opt/oai-gnb
 COPY --from=ran-build /tini /tini
 ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
-#CMD ["/opt/oai-gnb/bin/nr-softmodem", "-O", "/opt/oai-gnb/etc/gnb.conf"]
+CMD ["/opt/oai-gnb/bin/nr-softmodem", "-O", "/opt/oai-gnb/etc/gnb.conf"]

nfapi/oai_integration/aerial/fapi_vnf_p5.c

@@ -55,10 +55,8 @@ void *aerial_vnf_nr_aerial_p7_start_thread(void *ptr)
 void *aerial_vnf_nr_p7_thread_start(void *ptr)
 {
   // set_thread_priority(79);
-<<<<<<< Updated upstream
  
-=======
-  int s;
+//  int s;
 //  cpu_set_t cpuset;
 
 //  CPU_SET(8, &cpuset);
@@ -66,7 +64,6 @@ void *aerial_vnf_nr_p7_thread_start(void *ptr)
 //  if (s != 0)
 //    printf("failed to set afinity\n");
 
->>>>>>> Stashed changes
   set_priority(79);
 
   pthread_attr_t ptAttr;