diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2017-07-12 23:04:45 +0000 |
|---|---|---|
| committer | Johannes Weiner <hannes@cmpxchg.org> | 2017-07-12 23:04:45 +0000 |
| commit | 19310e1bd6270efbab6eb8cc025e7d7f6cb3a506 (patch) | |
| tree | 2a581a3d76601da6bb3f70a16435e699e2b857c1 | |
| parent | 82d230eee9cee5087d440ba4e672c278a0ab65fe (diff) | |
linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | Documentation/arm64/silicon-errata.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/arm64/silicon-errata.txt b/Documentation/arm64/silicon-errata.txt index 6cd005da3a1a..e6b6144ebdac 100644 --- a/Documentation/arm64/silicon-errata.txt +++ b/Documentation/arm64/silicon-errata.txt @@ -62,10 +62,6 @@ stable kernels. | Cavium | ThunderX GICv3 | #23154 | CAVIUM_ERRATUM_23154 | | Cavium | ThunderX Core | #27456 | CAVIUM_ERRATUM_27456 | | Cavium | ThunderX Core | #30115 | CAVIUM_ERRATUM_30115 | -<<<<<<< HEAD -| Cavium | ThunderX SMMUv2 | #27704 | N/A | -======= ->>>>>>> linux-next/akpm-base | Cavium | ThunderX2 SMMUv3| #74 | N/A | | Cavium | ThunderX2 SMMUv3| #126 | N/A | | | | | | |