--- wikisrc/security/meltdown_spectre.mdwn	2018/05/23 07:47:07	1.36
+++ wikisrc/security/meltdown_spectre.mdwn	2018/06/14 14:40:40	1.37
@@ -37,9 +37,9 @@ arm		|ARM (others)	|Not vulnerable	|		|	
 [[!table data="""
 Port		|Vendor/Model	|Spectre (V2)	|NetBSD-7	|NetBSD-8	|NetBSD-current
 amd64		|Intel		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigB] [MitigD]
-amd64		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigC] [MitigD]
+amd64		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigC] [MitigD]	|Fixed [MitigC] [MitigD]
 i386		|Intel		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigD]
-i386		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigC] [MitigD]
+i386		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigC] [MitigD]	|Fixed [MitigC] [MitigD]
 mips		|MIPS P5600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 mips		|MIPS P6600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 mips		|MIPS (others)	|Not vulnerable	|		|		|
@@ -86,10 +86,10 @@ software change is required.
 
 [[!table data="""
 Port		|Vendor/Model	|Spectre (V4)	|NetBSD-7	|NetBSD-8	|NetBSD-current
-amd64		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
-amd64		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigF]
-i386		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
-i386		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigF]
+amd64		|Intel		|Vulnerable	|Not fixed	|Fixed [MitigE]	|Fixed [MitigE]
+amd64		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigF]	|Fixed [MitigF]
+i386		|Intel		|Vulnerable	|Not fixed	|Fixed [MitigE]	|Fixed [MitigE]
+i386		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigF]	|Fixed [MitigF]
 arm		|ARM Cortex-A57	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 arm		|ARM Cortex-A72	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 arm		|ARM Cortex-A73	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
@@ -138,6 +138,9 @@ dynamically enabled/disabled by changing
 Software mitigation. It is enabled by default in GENERIC. When enabled,
 the "swmitigated" sysctl is set to one.
 
+Note: there is no retpoline for the ASM parts, and no RSB-stuffing either
+for Skylake.
+
 ### Mitigations E, F
 
 There are two available mitigations for SpectreV4. Their availability