Thread (10 messages) 10 messages, 4 authors, 2016-02-24

next-20160222 build: 5 failures 9 warnings (next-20160222)

From: Stephen Rothwell <hidden>
Date: 2016-02-22 13:19:04
Also in: kvmarm, linux-next

Possibly related (same subject, not in this thread)

Hi Marc,

On Mon, 22 Feb 2016 12:44:15 +0000 Marc Zyngier [off-list ref] wrote:
On 22/02/16 12:07, Brian Starkey wrote:
quoted
On Mon, Feb 22, 2016 at 12:00:40PM +0000, Marc Zyngier wrote:  
quoted
On 22/02/16 11:52, Brian Starkey wrote:  
quoted
quoted
This will create a new conflict, but will make the resolution 100% 
clear.  
I applied this, but arm64 defconfig wouldn't build until I uncommented
the '#define kvm_call_hyp(...' line.

Is that right?  
This patch is intended as a merge indication so that when you do the
merge with the arm64 tree, it conflicts and you can resolve it by going
the right thing (merging the non-comment version of this line).  
Right, now I understand "make the resolution 100% clear" - I guess 100%
clear isn't clear enough for me :-(  
It is not meant to be clear to you, but to whoever is actually performing the merge:
Excellent, thanks for that - hopefully I will get it right tomorrow.

-- 
Cheers,
Stephen Rothwell
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help