Skip to content

Commit b3a9964

Browse files
committed
Merge tag 'char-misc-5.3-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull Documentation updates from Greg KH: "A few small patches for the documenation file that came in through the char-misc tree in -rc7 for your tree. They fix the mistake in the .rst format that kept the table of companies from showing up in the html output, and most importantly, add people's names to the list showing support for our process" * tag 'char-misc-5.3-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: Documentation/process: Add Qualcomm process ambassador for hardware security issues Documentation/process/embargoed-hardware-issues: Microsoft ambassador Documentation/process: Add Google contact for embargoed hardware issues Documentation/process: Volunteer as the ambassador for Xen
2 parents d3464cc + a8e0aba commit b3a9964

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Documentation/process/embargoed-hardware-issues.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Scope
55
-----
66

77
Hardware issues which result in security problems are a different category
8-
of security bugs than pure software bugs which only affect the Linux
8+
of security bugs than pure software bugs which only affect the Linux
99
kernel.
1010

1111
Hardware issues like Meltdown, Spectre, L1TF etc. must be treated
@@ -159,7 +159,7 @@ Mitigation development
159159

160160
The initial response team sets up an encrypted mailing-list or repurposes
161161
an existing one if appropriate. The disclosing party should provide a list
162-
of contacts for all other parties who have already been, or should be
162+
of contacts for all other parties who have already been, or should be,
163163
informed about the issue. The response team contacts these parties so they
164164
can name experts who should be subscribed to the mailing-list.
165165

@@ -217,11 +217,11 @@ an involved disclosed party. The current ambassadors list:
217217
AMD
218218
IBM
219219
Intel
220-
Qualcomm
220+
Qualcomm Trilok Soni <[email protected]>
221221

222-
Microsoft
222+
Microsoft Sasha Levin <[email protected]>
223223
VMware
224-
XEN
224+
Xen Andrew Cooper <[email protected]>
225225

226226
Canonical Tyler Hicks <[email protected]>
227227
Debian Ben Hutchings <[email protected]>
@@ -230,8 +230,8 @@ an involved disclosed party. The current ambassadors list:
230230
SUSE Jiri Kosina <[email protected]>
231231

232232
Amazon
233-
Google
234-
============== ========================================================
233+
Google Kees Cook <[email protected]>
234+
============= ========================================================
235235

236236
If you want your organization to be added to the ambassadors list, please
237237
contact the hardware security team. The nominated ambassador has to

0 commit comments

Comments
 (0)