Merge branch 'latest' into net

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
multipath-tcp · May 9, 2024 · ae59bb2 · ae59bb2
2 parents 5a04777 + 22cff53
commit ae59bb2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -83,7 +83,7 @@ RUN cd /opt && \
 		make install
 
 # Virtme NG
-ARG VIRTME_NG_VERSION="1.23"
+ARG VIRTME_NG_VERSION="1.24"
 RUN pip3 install --break-system-packages virtme-ng=="${VIRTME_NG_VERSION}"
 
 # to quickly shutdown the VM and more

diff --git a/vscode/settings-extra.json b/vscode/settings-extra.json
@@ -1,5 +1,10 @@
 {
   "clangd.arguments": [
     "-compile-commands-dir=${workspaceFolder}/.virtme/build-clang"
-  ]
+  ],
+  "files.watcherExclude": {
+    "**/.git/objects/**": true,
+    "**/.git/subtree-cache/**": true,
+    "**/.virtme/**": true
+  }
 }