On 9/27/18 9:00 AM, Peter Maydell wrote: > On 27 September 2018 at 01:24, Philippe Mathieu-Daudé <f4...@amsat.org> wrote: >> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> >> --- >> memory.c | 30 +++++++++++++++++++++--------- >> 1 file changed, 21 insertions(+), 9 deletions(-) >> > > NB that this patch will have a (fairly trivial) conflict with > the "remove oldmmio accessors" patches, because it patches > a function that those patches delete.
Yes, I thought about adding a comment about it ("to be respin once Paolo's next PR lands") and then forgot :| As you said this is here trivial, the meat of this series being patch #3.