Commit b3a9964c authored by Linus Torvalds's avatar Linus Torvalds

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
parents d3464ccd a8e0abae
...@@ -5,7 +5,7 @@ Scope ...@@ -5,7 +5,7 @@ Scope
----- -----
Hardware issues which result in security problems are a different category Hardware issues which result in security problems are a different category
of security bugs than pure software bugs which only affect the Linux of security bugs than pure software bugs which only affect the Linux
kernel. kernel.
Hardware issues like Meltdown, Spectre, L1TF etc. must be treated Hardware issues like Meltdown, Spectre, L1TF etc. must be treated
...@@ -159,7 +159,7 @@ Mitigation development ...@@ -159,7 +159,7 @@ Mitigation development
The initial response team sets up an encrypted mailing-list or repurposes The initial response team sets up an encrypted mailing-list or repurposes
an existing one if appropriate. The disclosing party should provide a list an existing one if appropriate. The disclosing party should provide a list
of contacts for all other parties who have already been, or should be of contacts for all other parties who have already been, or should be,
informed about the issue. The response team contacts these parties so they informed about the issue. The response team contacts these parties so they
can name experts who should be subscribed to the mailing-list. can name experts who should be subscribed to the mailing-list.
...@@ -217,11 +217,11 @@ an involved disclosed party. The current ambassadors list: ...@@ -217,11 +217,11 @@ an involved disclosed party. The current ambassadors list:
AMD AMD
IBM IBM
Intel Intel
Qualcomm Qualcomm Trilok Soni <tsoni@codeaurora.org>
Microsoft Microsoft Sasha Levin <sashal@kernel.org>
VMware VMware
XEN Xen Andrew Cooper <andrew.cooper3@citrix.com>
Canonical Tyler Hicks <tyhicks@canonical.com> Canonical Tyler Hicks <tyhicks@canonical.com>
Debian Ben Hutchings <ben@decadent.org.uk> Debian Ben Hutchings <ben@decadent.org.uk>
...@@ -230,8 +230,8 @@ an involved disclosed party. The current ambassadors list: ...@@ -230,8 +230,8 @@ an involved disclosed party. The current ambassadors list:
SUSE Jiri Kosina <jkosina@suse.cz> SUSE Jiri Kosina <jkosina@suse.cz>
Amazon Amazon
Google Google Kees Cook <keescook@chromium.org>
============== ======================================================== ============= ========================================================
If you want your organization to be added to the ambassadors list, please If you want your organization to be added to the ambassadors list, please
contact the hardware security team. The nominated ambassador has to contact the hardware security team. The nominated ambassador has to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment