On 28 April 2014 08:23, Christoffer Dall christoffer.dall@linaro.org wrote:
Whats the merge plan for these patches? We both share a common header but the code that uses it would seemingly go up via different trees. armv8 (Catalin) and KVM (Christoffer)?
Are they inter-dependent? I thought your patches depended on Anup's - not the other way around?
If my assumption is correct, I think we can make sure to send the pull request to kvm/next early and ask Catalin to pull in kvm/next before pulling your changes.
Right. My patches depend on the header (uapi/psci.h) introduced by Anups patchset.
Cheers, Ashwin