Merge branch 'main' into pci-hotplug

Sweetsurbhi88 · web-flow · commit 5914f43f3673 · 2026-04-09T18:57:01.000-04:00
Signed-off-by: SurbhiKakarya &lt;116319529+Sweetsurbhi88@users.noreply.github.com&gt;
diff --git a/protect/control/v1/common.proto b/protect/control/v1/common.proto
@@ -329,7 +329,8 @@ message WorkloadSpec {
   repeated CgroupLimit cgroup_limits = 9;
   string hostname = 10;
   repeated WorkloadBlockDeviceSpec block_devices = 11;
-  repeated WorkloadPciDeviceSpec pci_devices = 12;
+  optional int32 oom_score_adj = 12;
+  repeated WorkloadPciDeviceSpec pci_devices = 13;
 }
 
 message CgroupLimit {

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,8 @@ message WorkloadSpec {`
`329`	`329`	`repeated CgroupLimit cgroup_limits = 9;`
`330`	`330`	`string hostname = 10;`
`331`	`331`	`repeated WorkloadBlockDeviceSpec block_devices = 11;`
`332`		`- repeated WorkloadPciDeviceSpec pci_devices = 12;`
	`332`	`+ optional int32 oom_score_adj = 12;`
	`333`	`+ repeated WorkloadPciDeviceSpec pci_devices = 13;`
`333`	`334`	`}`
`334`	`335`
`335`	`336`	`message CgroupLimit {`