Index: third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto
--- third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto.orig
+++ third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto
@@ -10,7 +10,7 @@ message V4l2QbufFtraceEvent {
   optional uint32 field = 2;
   optional uint32 flags = 3;
   optional uint32 index = 4;
-  optional int32 minor = 5;
+  optional int32 gminor = 5;
   optional uint32 sequence = 6;
   optional uint32 timecode_flags = 7;
   optional uint32 timecode_frames = 8;
@@ -30,7 +30,7 @@ message V4l2DqbufFtraceEvent {
   optional uint32 field = 2;
   optional uint32 flags = 3;
   optional uint32 index = 4;
-  optional int32 minor = 5;
+  optional int32 gminor = 5;
   optional uint32 sequence = 6;
   optional uint32 timecode_flags = 7;
   optional uint32 timecode_frames = 8;
@@ -48,7 +48,7 @@ message V4l2DqbufFtraceEvent {
 message Vb2V4l2BufQueueFtraceEvent {
   optional uint32 field = 1;
   optional uint32 flags = 2;
-  optional int32 minor = 3;
+  optional int32 gminor = 3;
   optional uint32 sequence = 4;
   optional uint32 timecode_flags = 5;
   optional uint32 timecode_frames = 6;
@@ -65,7 +65,7 @@ message Vb2V4l2BufQueueFtraceEvent {
 message Vb2V4l2BufDoneFtraceEvent {
   optional uint32 field = 1;
   optional uint32 flags = 2;
-  optional int32 minor = 3;
+  optional int32 gminor = 3;
   optional uint32 sequence = 4;
   optional uint32 timecode_flags = 5;
   optional uint32 timecode_frames = 6;
@@ -82,7 +82,7 @@ message Vb2V4l2BufDoneFtraceEvent {
 message Vb2V4l2QbufFtraceEvent {
   optional uint32 field = 1;
   optional uint32 flags = 2;
-  optional int32 minor = 3;
+  optional int32 gminor = 3;
   optional uint32 sequence = 4;
   optional uint32 timecode_flags = 5;
   optional uint32 timecode_frames = 6;
@@ -99,7 +99,7 @@ message Vb2V4l2QbufFtraceEvent {
 message Vb2V4l2DqbufFtraceEvent {
   optional uint32 field = 1;
   optional uint32 flags = 2;
-  optional int32 minor = 3;
+  optional int32 gminor = 3;
   optional uint32 sequence = 4;
   optional uint32 timecode_flags = 5;
   optional uint32 timecode_frames = 6;
