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

2018-06-05 Thread Paolo Bonzini
On 04/06/2018 09:33, Dave Martin wrote: > On Mon, Jun 04, 2018 at 04:57:54PM +1000, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the kvm tree got a conflict in: >> >> arch/arm64/include/asm/processor.h >> >> between commit: >> >> 94b07c1f8c39 ("arm64: signal: Report

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

2018-06-05 Thread Paolo Bonzini
On 04/06/2018 09:33, Dave Martin wrote: > On Mon, Jun 04, 2018 at 04:57:54PM +1000, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the kvm tree got a conflict in: >> >> arch/arm64/include/asm/processor.h >> >> between commit: >> >> 94b07c1f8c39 ("arm64: signal: Report

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

2018-06-04 Thread Dave Martin
On Mon, Jun 04, 2018 at 04:57:54PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/arm64/include/asm/processor.h > > between commit: > > 94b07c1f8c39 ("arm64: signal: Report signal frame size to userspace via > auxv") > >

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

2018-06-04 Thread Dave Martin
On Mon, Jun 04, 2018 at 04:57:54PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/arm64/include/asm/processor.h > > between commit: > > 94b07c1f8c39 ("arm64: signal: Report signal frame size to userspace via > auxv") > >

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

2018-06-04 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/arm64/include/asm/processor.h between commit: 94b07c1f8c39 ("arm64: signal: Report signal frame size to userspace via auxv") from the arm64 tree and commit: 9a6e594869b2 ("arm64/sve: Move sve_pffr() to fpsimd.h

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

2018-06-04 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/arm64/include/asm/processor.h between commit: 94b07c1f8c39 ("arm64: signal: Report signal frame size to userspace via auxv") from the arm64 tree and commit: 9a6e594869b2 ("arm64/sve: Move sve_pffr() to fpsimd.h

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

2018-02-07 Thread Christoffer Dall
On Wed, Feb 07, 2018 at 12:27:53PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/arm64/include/asm/pgtable-prot.h > > between commit: > > 41acec624087 ("arm64: kpti: Make use of nG dependent on >

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

2018-02-07 Thread Christoffer Dall
On Wed, Feb 07, 2018 at 12:27:53PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/arm64/include/asm/pgtable-prot.h > > between commit: > > 41acec624087 ("arm64: kpti: Make use of nG dependent on >

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

2018-02-06 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/arm64/include/asm/pgtable-prot.h between commit: 41acec624087 ("arm64: kpti: Make use of nG dependent on arm64_kernel_unmapped_at_el0()") from the arm64 tree and commit: d0e22b4ac3ba ("KVM: arm/arm64: Limit

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

2018-02-06 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/arm64/include/asm/pgtable-prot.h between commit: 41acec624087 ("arm64: kpti: Make use of nG dependent on arm64_kernel_unmapped_at_el0()") from the arm64 tree and commit: d0e22b4ac3ba ("KVM: arm/arm64: Limit