Skip to content

Commit 773774a

Browse files
authored
Merge branch 'main' into unpin_m6i_6.1
2 parents a01b19c + 32826d3 commit 773774a

File tree

13 files changed

+60
-59
lines changed

13 files changed

+60
-59
lines changed

Cargo.lock

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

src/acpi-tables/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "Apache-2.0"
88

99
[dependencies]
1010
displaydoc = "0.2.5"
11-
thiserror = "2.0.7"
11+
thiserror = "2.0.9"
1212
vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
1313
zerocopy = { version = "0.8.13", features = ["derive"] }
1414

src/clippy-tracing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ clap = { version = "4.5.23", features = ["derive"] }
1414
itertools = "0.13.0"
1515
proc-macro2 = { version = "1.0.92", features = ["span-locations"] }
1616
quote = "1.0.37"
17-
syn = { version = "2.0.90", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
17+
syn = { version = "2.0.91", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
1818
walkdir = "2.5.0"
1919

2020
[dev-dependencies]

src/cpu-template-helper/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ bench = false
1212
[dependencies]
1313
clap = { version = "4.5.23", features = ["derive", "string"] }
1414
displaydoc = "0.2.5"
15-
libc = "0.2.168"
15+
libc = "0.2.169"
1616
log-instrument = { path = "../log-instrument", optional = true }
1717
serde = { version = "1.0.216", features = ["derive"] }
18-
serde_json = "1.0.133"
19-
thiserror = "2.0.7"
18+
serde_json = "1.0.134"
19+
thiserror = "2.0.9"
2020

2121
vmm = { path = "../vmm" }
2222
vmm-sys-util = "0.12.1"

src/firecracker/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ bench = false
1818
[dependencies]
1919
displaydoc = "0.2.5"
2020
event-manager = "0.4.0"
21-
libc = "0.2.168"
21+
libc = "0.2.169"
2222
log-instrument = { path = "../log-instrument", optional = true }
2323
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
2424

2525
seccompiler = { path = "../seccompiler" }
2626
serde = { version = "1.0.216", features = ["derive"] }
2727
serde_derive = "1.0.136"
28-
serde_json = "1.0.133"
29-
thiserror = "2.0.7"
28+
serde_json = "1.0.134"
29+
thiserror = "2.0.9"
3030
timerfd = "1.6.0"
3131
utils = { path = "../utils" }
3232
vmm = { path = "../vmm" }
3333
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
3434

3535
[dev-dependencies]
3636
cargo_toml = "0.21.0"
37-
libc = "0.2.168"
37+
libc = "0.2.169"
3838
regex = { version = "1.11.1", default-features = false, features = ["std", "unicode-perl"] }
3939

4040
# Dev-Dependencies for uffd examples
@@ -45,7 +45,7 @@ userfaultfd = "0.8.1"
4545
bincode = "1.2.1"
4646
seccompiler = { path = "../seccompiler" }
4747
serde = { version = "1.0.216" }
48-
serde_json = "1.0.133"
48+
serde_json = "1.0.134"
4949

5050
[features]
5151
tracing = ["log-instrument", "seccompiler/tracing", "utils/tracing", "vmm/tracing"]

src/jailer/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ name = "jailer"
1212
bench = false
1313

1414
[dependencies]
15-
libc = "0.2.168"
15+
libc = "0.2.169"
1616
log-instrument = { path = "../log-instrument", optional = true }
1717
regex = { version = "1.11.1", default-features = false, features = ["std"] }
18-
thiserror = "2.0.7"
18+
thiserror = "2.0.9"
1919
vmm-sys-util = "0.12.1"
2020

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

src/log-instrument-macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bench = false
1313
[dependencies]
1414
proc-macro2 = "1.0.92"
1515
quote = "1.0.37"
16-
syn = { version = "2.0.90", features = ["full", "extra-traits"] }
16+
syn = { version = "2.0.91", features = ["full", "extra-traits"] }
1717

1818
[lints]
1919
workspace = true

src/log-instrument/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ log = "0.4.22"
3232
log-instrument-macros = { path = "../log-instrument-macros" }
3333

3434
[dev-dependencies]
35-
env_logger = "0.11.5"
35+
env_logger = "0.11.6"
3636

3737
[lints]
3838
workspace = true

src/rebase-snap/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ bench = false
1111

1212
[dependencies]
1313
displaydoc = "0.2.5"
14-
libc = "0.2.168"
14+
libc = "0.2.169"
1515
log-instrument = { path = "../log-instrument", optional = true }
16-
thiserror = "2.0.7"
16+
thiserror = "2.0.9"
1717
vmm-sys-util = "0.12.1"
1818

1919
utils = { path = "../utils" }

src/seccompiler/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ bench = false
1818
[dependencies]
1919
bincode = "1.2.1"
2020
displaydoc = "0.2.5"
21-
libc = "0.2.168"
21+
libc = "0.2.169"
2222
log-instrument = { path = "../log-instrument", optional = true }
2323
serde = { version = "1.0.216", features = ["derive"] }
24-
serde_json = "1.0.133"
25-
thiserror = "2.0.7"
24+
serde_json = "1.0.134"
25+
thiserror = "2.0.9"
2626

2727
utils = { path = "../utils" }
2828

0 commit comments

Comments
 (0)