On 20 December 2011 19:10, Mark Langsdorf <mark.langsd...@calxeda.com> wrote: > From: juha.riihim...@nokia.com > > Conflicts: > > target-arm/cpu.h > target-arm/helper.c > > Signed-off-by: Mark Langsdorf <mark.langsd...@calxeda.com>
All sorts of problems here, I'm afraid. * you can't submit a patch written by somebody else and without their sign-off * no git 'conflicts' messages in commit messages! * lots of irrelevant changes (like the brace changes) * it's clearly not actually an implementation of trustzone (just for a start, no register banking, and no monitor mode) This is a long way from being acceptable upstream. I have a variant on this patch in qemu-linaro (http://git.linaro.org/gitweb?p=qemu/qemu-linaro.git;a=commitdiff;h=52bca16c339bebfc8d0a359886c0a63988ec6735) which at least has fewer irrelevant bits in it but is still in need of attention. More promisingly, https://github.com/jowinter/qemu-trustzone is a much more complete trustzone implementation, and Johannes has said he hopes to get it into shape for upstream. -- PMM