Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree

From	Catalin Marinas <catalin.marinas@arm.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree
Date	2016-02-22 10:30 +0100
Message-ID	<r4UYx-3uz-11@gated-at.bofh.it> (permalink)
References	<r4OzL-7aj-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Mon, Feb 22, 2016 at 01:33:22PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the kvm-arm tree got a conflict in:
> 
>   arch/arm64/kvm/hyp.S
> 
> between commit:
> 
>   a0bf9776cd0b ("arm64: kvm: deal with kernel symbols outside of linear mapping")
> 
> from the arm64 tree and commit:
> 
>   253dcab4c363 ("arm64: KVM: VHE: Patch out use of HVC")
> 
> from the kvm-arm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

This looks correct as well. Thanks.

-- 
Catalin

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the kvm-arm tree with the arm64 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-22 03:40 +0100
  Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree Catalin Marinas <catalin.marinas@arm.com> - 2016-02-22 10:30 +0100

csiph-web