From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Tue, 1 May 2018 10:22:03 +0000 (+0100)
Subject: note out-of-date
X-Git-Tag: convert-csv-opcode-to-binary~5411
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92bedf16ac52e3a3ba29f7d2df75ddd11d49e3ed;p=libreriscv.git

note out-of-date
---

diff --git a/isa_conflict_resolution.mdwn b/isa_conflict_resolution.mdwn
index dd6c78028..0b099cc75 100644
--- a/isa_conflict_resolution.mdwn
+++ b/isa_conflict_resolution.mdwn
@@ -1,5 +1,8 @@
 # Resolving ISA conflicts and providing a pain-free RISC-V Standards Upgrade Path
 
+**Note: out-of-date as of review 31apr2018, requires updating to reflect
+"mvendorid-marchid-isamux" concept.**
+
 ## Executive Summary
 
 A non-invasive backwards-compatible change to make mvendorid and marchid