From 8bd92fea43b26f5521941fcc168e29517532b2e4 Mon Sep 17 00:00:00 2001
From: Evan Anderson <evan@stacklok.com>
Date: Tue, 10 Sep 2024 10:36:08 -0700
Subject: [PATCH] Updates from Paul and David Hadas, including an explicit
 waiver of company diversity for the 2024 combined committee.

---
 GOVERNANCE.md               | 34 ----------------------------------
 STEERING-COMMITTEE.md       | 14 ++++++++++----
 TECH-OVERSIGHT-COMMITTEE.md |  3 +++
 3 files changed, 13 insertions(+), 38 deletions(-)
 delete mode 100644 GOVERNANCE.md
 create mode 100644 TECH-OVERSIGHT-COMMITTEE.md

diff --git a/GOVERNANCE.md b/GOVERNANCE.md
deleted file mode 100644
index be62c06c..00000000
--- a/GOVERNANCE.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: "Knative Governance Framework"
-linkTitle: "Governance"
-weight: 20
-type: "docs"
-aliases:
-  - /contributing/governance/
----
-
-Knative Governance is broken into two components. At a high level, the Knative
-Steering Committee (KSC) is the "root" level governance body.
-The Tech Oversight Committee (TOC) operates
-entirely within the governance definitions delineated by the KSC.
-
-## Community and Operations
-
-The [Knative Steering Committee](./STEERING-COMMITTEE.md) is responsible for the
-general health of the Knative community. Responsibilities include maintaining
-the governance framework, code of conduct, community meetings, communication
-platforms, and test resources.
-
-## Trademarks
-
-The [Knative Steering Committee](./STEERING-COMMITTEE.md) is responsible for
-management, licensing, and conformance verification of Knative logos, names, and
-trademarks, including the definition of what "Knative" is and the definition and
-rules for usage of derived marks.
-
-## Technology and Software Implementation
-
-The [Knative Technical Oversight Committee](./TECH-OVERSIGHT-COMMITTEE.md) is
-responsible for the technical oversight, release process, and integration of the
-technology components of the Knative project. Most day-to-day work is delegated
-by the TOC to various subject-specific working groups.
diff --git a/STEERING-COMMITTEE.md b/STEERING-COMMITTEE.md
index ee94a8b4..8b7db2bf 100644
--- a/STEERING-COMMITTEE.md
+++ b/STEERING-COMMITTEE.md
@@ -1,9 +1,10 @@
 ---
 title: "Knative steering committee"
 linkTitle: "Steering committee"
-weight: 35
+weight: 20
 type: "docs"
 aliases:
+  - /contributing/governance/
   - /contributing/steering-committee/
   - /contributing/tech-oversight-committee/
 ---
@@ -109,7 +110,7 @@ first name):
 | <img width="30px" src="https://github.com/nainaz.png">        | Naina Singh             | Red Hat      | [@nainaz](https://github.com/nainaz)               | 2022-12-06 | 2024     |
 | <img width="30px" src="https://github.com/salaboy.png">       | Mauricio Salatino       | Diagrid      | [@salaboy](https://github.com/salaboy)             | 2022-12-06 | 2024     |
 | <img width="30px" src="https://github.com/davidhadas.png">    | David Hadas             | IBM          | [@davidhadas](https://github.com/davidhadas)       | 2023-09-12 | 2024     |
-| <img width="30px" src="https://github.com/dprotaso.png">      | Dave Protasowski        | VMware       | [@dprotaso](https://github.com/dprotaso)           | 2021-05-26 | 2024     |
+| <img width="30px" src="https://github.com/dprotaso.png">      | Dave Protasowski        | Independent  | [@dprotaso](https://github.com/dprotaso)           | 2021-05-26 | 2024     |
 | <img width="30px" src="https://github.com/dsimansk.png">      | David Simansky          | Red Hat      | [@dsimansk](https://github.com/dsimansk)           | 2022-06-01 | 2024     |
 | <img width="30px" src="https://github.com/psschwei.png">      | Paul Schweigert         | IBM          | [@psschwei](https://github.com/psschwei)           | 2022-09-28 | 2024     |
 > * Norris holds the End User seat
@@ -186,6 +187,12 @@ and new special elections held. In the event of a question of company membership
 example evaluating independence of corporate subsidiaries) a majority of all
 non-involved Steering Committee members will decide.
 
+The above limits shall be relaxed for the temporary combination of the 2024 Steering
+and Technical Oversight Committees, with the limitation that the so-constituted
+committee may not pass any governance changes except by the abstention of Red Hat or
+IBM members such that the remaining voting member do not constitute a majority of
+the committee.
+
 ## Election Procedure
 
 ### Timeline
@@ -363,12 +370,11 @@ To recognize the folks that have served in the KSC in the past, below we list th
 
 ### Technical Oversight Committee
 
-To recognize the folks that have served in the TOC in the past, below we list the previous members of the TOC (sorted by their 'Term End').
-
 The _Technical Oversight Committee (TOC)_ was a separate committee responsible
 for setting the overall technical direction and roadmap of the project before
 2024. In 2024, SC and TOC [were merged](https://github.com/knative/community/issues/1549) into a single governance body.
 
+To recognize the folks that have served in the TOC in the past, below we list the previous members of the TOC (sorted by their 'Term End').
 
 | &nbsp;                                                         | Member          | Profile                                              | Term Start | Term End   |
 | -------------------------------------------------------------- | ---------------  | --------------------------------------------------- | ---------- | ---------- |
diff --git a/TECH-OVERSIGHT-COMMITTEE.md b/TECH-OVERSIGHT-COMMITTEE.md
new file mode 100644
index 00000000..83cfe726
--- /dev/null
+++ b/TECH-OVERSIGHT-COMMITTEE.md
@@ -0,0 +1,3 @@
+# See [Steering Committee documentation](./STEERING-COMMITTEE.md)
+
+The Technical Oversight Committee [has been merged with the Steering Committee](https://github.com/knative/community/pull/1587).