From dd44f0a4aeec44eb3d4f6104f316db36544bbc9e Mon Sep 17 00:00:00 2001
From: Venky Ganesh <23023424+venkywonka@users.noreply.github.com>
Date: Tue, 14 Oct 2025 16:30:49 -0700
Subject: [PATCH 1/2] update CODEOWNERS

Signed-off-by: Venky Ganesh <23023424+venkywonka@users.noreply.github.com>
---
 .github/CODEOWNERS | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4c619e62b32..d3bea6bb299 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -159,6 +159,33 @@ docs/source/performance/perf-benchmarking.md @NVIDIA/trtllm-bench-reviewers
 /tests/unittest/api_stability/ @NVIDIA/trt-llm-noncommitted-api-review-committee
 /tests/unittest/api_stability/references_committed/ @NVIDIA/trt-llm-committed-api-review-committee
 
+## OSS Compliance & Legal - License/Attribution Protection
+## IMPORTANT: Changes to any files below may impact legal compliance, attributions, and third-party licenses.
+## These files require review from the OSS compliance team before merging to ensure proper attribution
+## and license compliance when adding, removing, or changing versions of dependencies.
+### License Files
+/LICENSE @NVIDIA/trt-llm-oss-compliance
+/jenkins/license_cpp.json @NVIDIA/trt-llm-oss-compliance
+
+### Python Dependency Management
+/setup.py @NVIDIA/trt-llm-oss-compliance
+/pyproject.toml @NVIDIA/trt-llm-oss-compliance
+/requirements.txt @NVIDIA/trt-llm-oss-compliance
+/requirements-dev.txt @NVIDIA/trt-llm-oss-compliance
+
+### C++ Build & Dependency Management
+/cpp/CMakeLists.txt @NVIDIA/trt-llm-oss-compliance
+/cpp/conanfile.py @NVIDIA/trt-llm-oss-compliance
+/cpp/cmake/** @NVIDIA/trt-llm-oss-compliance
+
+### Third-Party Dependencies
+## Any changes to versions, additions, or removals of third-party libraries
+/3rdparty/** @NVIDIA/trt-llm-oss-compliance
+
+### Docker & Installation Scripts
+## These scripts install and pin dependency versions
+/docker/common/** @NVIDIA/trt-llm-oss-compliance
+
 # The following rule should only be uncommented on release branches (e.g., release/0.19).
 # The rule below requires that any PR to release/**/* branches must be approved by at least one member
 # of the NVIDIA/trt-llm-release-branch-approval team, regardless of who else approves the PR.

From 493237229d80b11a4594c57140bb6254cd89f035 Mon Sep 17 00:00:00 2001
From: Venky Ganesh <23023424+venkywonka@users.noreply.github.com>
Date: Tue, 14 Oct 2025 16:57:23 -0700
Subject: [PATCH 2/2] factor in last-always-wins parsing

Signed-off-by: Venky Ganesh <23023424+venkywonka@users.noreply.github.com>
---
 .github/CODEOWNERS | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d3bea6bb299..0376d72c107 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -161,11 +161,11 @@ docs/source/performance/perf-benchmarking.md @NVIDIA/trtllm-bench-reviewers
 
 ## OSS Compliance & Legal - License/Attribution Protection
 ## IMPORTANT: Changes to any files below may impact legal compliance, attributions, and third-party licenses.
-## These files require review from the OSS compliance team before merging to ensure proper attribution
+## These files require review from the TRTLLM OSS compliance team before merging to ensure proper attribution
 ## and license compliance when adding, removing, or changing versions of dependencies.
 ### License Files
 /LICENSE @NVIDIA/trt-llm-oss-compliance
-/jenkins/license_cpp.json @NVIDIA/trt-llm-oss-compliance
+/jenkins/license_cpp.json @NVIDIA/trt-llm-ci-infra-devs @NVIDIA/trt-llm-infra-devs @NVIDIA/trt-llm-oss-compliance
 
 ### Python Dependency Management
 /setup.py @NVIDIA/trt-llm-oss-compliance
@@ -184,7 +184,10 @@ docs/source/performance/perf-benchmarking.md @NVIDIA/trtllm-bench-reviewers
 
 ### Docker & Installation Scripts
 ## These scripts install and pin dependency versions
-/docker/common/** @NVIDIA/trt-llm-oss-compliance
+/docker/common/** @NVIDIA/trt-llm-setup-infra-devs @NVIDIA/trt-llm-infra-devs @NVIDIA/trt-llm-oss-compliance
+
+### CODEOWNERS file itself
+/.github/CODEOWNERS @NVIDIA/trt-llm-gh-workflows-infra-devs @NVIDIA/trt-llm-infra-devs @NVIDIA/trt-llm-oss-compliance
 
 # The following rule should only be uncommented on release branches (e.g., release/0.19).
 # The rule below requires that any PR to release/**/* branches must be approved by at least one member