Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3a9964c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Documentation/process/embargoed-hardware-issues.rst

+7 −7
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ Mitigation development 


The initial response team sets up an encrypted mailing-list or repurposes

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

can name experts who should be subscribed to the mailing-list.
@@ -217,11 +217,11 @@ an involved disclosed party. The current ambassadors list: 
  AMD

  IBM

  Intel

  Qualcomm

  Qualcomm	Trilok Soni <tsoni@codeaurora.org>



  Microsoft

  Microsoft	Sasha Levin <sashal@kernel.org>

  VMware

  XEN

  Xen		Andrew Cooper <andrew.cooper3@citrix.com>



  Canonical	Tyler Hicks <tyhicks@canonical.com>

  Debian	Ben Hutchings <ben@decadent.org.uk>
@@ -230,8 +230,8 @@ an involved disclosed party. The current ambassadors list: 
  SUSE		Jiri Kosina <jkosina@suse.cz>



  Amazon

  Google

  ============== ========================================================

  Google	Kees Cook <keescook@chromium.org>

  ============= ========================================================



If you want your organization to be added to the ambassadors list, please

contact the hardware security team. The nominated ambassador has to