diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-18 12:08:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-18 12:08:57 -0800 |
| commit | f04dba64d667419493d1f9aadd50b19860312b6c (patch) | |
| tree | 0828955ddca3bbe14bccc63251b44c53087b6fb3 /Documentation | |
| parent | bf3f401db6cbe010095fe3d1e233a5fde54e8b78 (diff) | |
| parent | fb85145c04447035c07cd609302d6996eb217a1d (diff) | |
Merge tag 'char-misc-5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fixes from Greg KH:
"Here are some small fixes for 5.5-rc7
Included here are:
- two lkdtm fixes
- coresight build fix
- Documentation update for the hw process document
All of these have been in linux-next with no reported issues"
* tag 'char-misc-5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
Documentation/process: Add Amazon contact for embargoed hardware issues
lkdtm/bugs: fix build error in lkdtm_UNSET_SMEP
lkdtm/bugs: Make double-fault test always available
coresight: etm4x: Fix unused function warning
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/process/embargoed-hardware-issues.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/process/embargoed-hardware-issues.rst b/Documentation/process/embargoed-hardware-issues.rst index 799580acc8de..5d54946cfc75 100644 --- a/Documentation/process/embargoed-hardware-issues.rst +++ b/Documentation/process/embargoed-hardware-issues.rst @@ -255,7 +255,7 @@ an involved disclosed party. The current ambassadors list: Red Hat Josh Poimboeuf <jpoimboe@redhat.com> SUSE Jiri Kosina <jkosina@suse.cz> - Amazon + Amazon Peter Bowen <pzb@amzn.com> Google Kees Cook <keescook@chromium.org> ============= ======================================================== |