Skip to content

Commit

Permalink
Merge branch 'main' into clippy_cast_lossless
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Woollett-Light authored Nov 4, 2022
2 parents 5f46874 + 73b5dc3 commit 5307637
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/jailer.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jailer --id <id> \
Supported options are "1" for cgroup-v1 and "2" for cgroup-v2.
- `cgroup` cgroups can be passed to the jailer to let it set the values
when the microVM process is spawned. The `--cgroup` argument must follow this format:
`<cgroup_file>=<value>` (e.g cpuset.cpus=0). This argument can be used multiple
`<cgroup_file>=<value>` (e.g `cpuset.cpus=0`). This argument can be used multiple
times to set multiple cgroups. This is useful to avoid providing privileged permissions
to another process for setting the cgroups before or after the jailer is executed.
The `--cgroup` flag can help as well to set Firecracker process cgroups
Expand Down
4 changes: 2 additions & 2 deletions docs/kernel-policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ registers incompatibility.
<table>
<tr>
<th></th>
<th>Snapshot taken on host 4.15</th>
<th>Snapshot taken on host 4.14</th>
<th>Snapshot taken on host 5.10</th>
</tr>
<tr>
<th>Load snapshot on host 4.15</th>
<th>Load snapshot on host 4.14</th>
<td style="background-color:mediumseagreen">successful</td>
<td style="background-color:mediumseagreen">unsuccessful due to mismatch in MSRs</td>
</tr>
Expand Down

0 comments on commit 5307637

Please sign in to comment.