Skip to content

Commit 5327e57

Browse files
authored
Merge branch 'main' into allow-snapshot-tap-changes
2 parents 3240301 + 38630d2 commit 5327e57

File tree

11 files changed

+63
-60
lines changed

11 files changed

+63
-60
lines changed

Cargo.lock

Lines changed: 43 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/clippy-tracing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ syn = { version = "2.0.96", features = ["full", "extra-traits", "visit", "visit-
1818
walkdir = "2.5.0"
1919

2020
[dev-dependencies]
21-
uuid = { version = "1.11.1", features = ["v4"] }
21+
uuid = { version = "1.12.0", features = ["v4"] }
2222

2323
[lints]
2424
workspace = true

src/cpu-template-helper/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ displaydoc = "0.2.5"
1515
libc = "0.2.169"
1616
log-instrument = { path = "../log-instrument", optional = true }
1717
serde = { version = "1.0.217", features = ["derive"] }
18-
serde_json = "1.0.135"
18+
serde_json = "1.0.137"
1919
thiserror = "2.0.11"
2020

2121
vmm = { path = "../vmm" }

src/firecracker/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
2424

2525
serde = { version = "1.0.217", features = ["derive"] }
2626
serde_derive = "1.0.136"
27-
serde_json = "1.0.135"
27+
serde_json = "1.0.137"
2828
thiserror = "2.0.11"
2929
timerfd = "1.6.0"
3030
utils = { path = "../utils" }
@@ -43,7 +43,7 @@ userfaultfd = "0.8.1"
4343
[build-dependencies]
4444
seccompiler = { path = "../seccompiler" }
4545
serde = { version = "1.0.217" }
46-
serde_json = "1.0.135"
46+
serde_json = "1.0.137"
4747

4848
[features]
4949
tracing = ["log-instrument", "utils/tracing", "vmm/tracing"]

src/log-instrument/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ name = "five"
2828
name = "six"
2929

3030
[dependencies]
31-
log = "0.4.22"
31+
log = "0.4.25"
3232
log-instrument-macros = { path = "../log-instrument-macros" }
3333

3434
[dev-dependencies]

src/seccompiler/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ clap = { version = "4.5.23", features = ["derive", "string"] }
2121
displaydoc = "0.2.5"
2222
libc = "0.2.169"
2323
serde = { version = "1.0.217", features = ["derive"] }
24-
serde_json = "1.0.135"
24+
serde_json = "1.0.137"
2525
thiserror = "2.0.11"
2626
zerocopy = { version = "0.8.14" }
2727

src/snapshot-editor/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ displaydoc = "0.2.5"
1616
fc_utils = { package = "utils", path = "../utils" }
1717
libc = "0.2.169"
1818
log-instrument = { path = "../log-instrument", optional = true }
19-
semver = "1.0.24"
19+
semver = "1.0.25"
2020
thiserror = "2.0.11"
2121
vmm = { path = "../vmm" }
2222
vmm-sys-util = "0.12.1"

src/vmm/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,28 @@ bench = false
1212
acpi_tables = { path = "../acpi-tables" }
1313
aes-gcm = { version = "0.10.1", default-features = false, features = ["aes"] }
1414
arrayvec = { version = "0.7.6", optional = true }
15-
aws-lc-rs = { version = "1.12.0", features = ["bindgen"] }
15+
aws-lc-rs = { version = "1.12.1", features = ["bindgen"] }
1616
base64 = "0.22.1"
1717
bincode = "1.2.1"
18-
bitflags = "2.7.0"
18+
bitflags = "2.8.0"
1919
crc64 = "2.0.0"
2020
derive_more = { version = "1.0.0", default-features = false, features = ["from", "display"] }
2121
displaydoc = "0.2.5"
2222
event-manager = "0.4.0"
2323
gdbstub = { version = "0.7.3", optional = true }
2424
gdbstub_arch = { version = "0.3.1", optional = true }
25-
kvm-bindings = { version = "0.10.0", features = ["fam-wrappers", "serde"] }
26-
kvm-ioctls = "0.19.1"
25+
kvm-bindings = { version = "0.11.0", features = ["fam-wrappers", "serde"] }
26+
kvm-ioctls = "0.20.0"
2727
libc = "0.2.169"
2828
linux-loader = "0.13.0"
29-
log = { version = "0.4.22", features = ["std", "serde"] }
29+
log = { version = "0.4.25", features = ["std", "serde"] }
3030
log-instrument = { path = "../log-instrument", optional = true }
3131
memfd = "0.6.3"
3232
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
3333

34-
semver = { version = "1.0.24", features = ["serde"] }
34+
semver = { version = "1.0.25", features = ["serde"] }
3535
serde = { version = "1.0.217", features = ["derive", "rc"] }
36-
serde_json = "1.0.135"
36+
serde_json = "1.0.137"
3737
slab = "0.4.7"
3838
thiserror = "2.0.11"
3939
timerfd = "1.5.0"

tools/devctr/ctr_gitconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
# https://github.blog/2022-04-12-git-security-vulnerability-announced/
77

88
[safe]
9-
directory = /firecracker
10-
directory = /firecracker/.git
9+
directory = *

0 commit comments

Comments
 (0)