Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/43645 )
Change subject: misc: Merge branch v21.0.0.0 into develop
......................................................................
misc: Merge branch v21.0.0.0 into develop
This incorporates the last of the v21.0 staging branch changes into the
develop branch.
Change-Id: I89349ac5c52fd454eb87d6199ea5ccde0d50dda3
---
M src/arch/riscv/faults.cc
2 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/src/arch/riscv/faults.cc b/src/arch/riscv/faults.cc
index d64d698..19e6449 100644
--- a/src/arch/riscv/faults.cc
+++ b/src/arch/riscv/faults.cc
@@ -31,11 +31,8 @@
#include "arch/riscv/faults.hh"
-<<<<<<< HEAD (c9415d gpu-compute: Remove unused functions)
#include "arch/riscv/fs_workload.hh"
#include "arch/riscv/insts/static_inst.hh"
-=======
->>>>>>> BRANCH (ea7d01 misc: Add release notes for v21.0.0.0)
#include "arch/riscv/isa.hh"
#include "arch/riscv/registers.hh"
#include "arch/riscv/utility.hh"
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43645
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I89349ac5c52fd454eb87d6199ea5ccde0d50dda3
Gerrit-Change-Number: 43645
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
