Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/mm/fault.c
between commit:
49a502ea23bf ("powerpc/mm: Make NULL pointer deferences explicit on bad page
faults.")
from the powerpc tree and commit:
d7b456152230 ("KVM: PPC: Book3S HV: Implement functions t
On 15/02/2017 12:16, Michael Ellerman wrote:
>> However, the reason was that this is simply not how topic branches
>> should work: topic branches should be the base for other work, they
>> shouldn't contain _all_ the work.
>
> I think that's an overly specific definition of what a topic branch is.
Paolo Bonzini writes:
> On 14/02/2017 09:45, Michael Ellerman wrote:
>>> If possible, please pull only up to "powerpc/64: Allow for relocation-on
>>> interrupts from guest to host" and cherry-pick the top two patches
>>> ("powerpc/64: CONFIG_RELOCATABLE support for hmi interrupts" and
>>> "powerp
Stephen Rothwell writes:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/powerpc/kvm/book3s_hv_rm_xics.c
>
> between commit:
>
> ab9bad0ead9a ("powerpc/powernv: Remove separate entry for OPAL real mode
> calls")
>
> from the powerpc tree and commit:
>
> 2
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/kvm/book3s_hv_rm_xics.c
between commit:
ab9bad0ead9a ("powerpc/powernv: Remove separate entry for OPAL real mode
calls")
from the powerpc tree and commit:
21acd0e4df04 ("KVM: PPC: Book 3S: XICS: Don't lock
On 14/02/2017 09:45, Michael Ellerman wrote:
>> If possible, please pull only up to "powerpc/64: Allow for relocation-on
>> interrupts from guest to host" and cherry-pick the top two patches
>> ("powerpc/64: CONFIG_RELOCATABLE support for hmi interrupts" and
>> "powerpc/powernv: Remove separate e
Paolo Bonzini writes:
> On 10/02/2017 04:59, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the kvm tree got a conflict in:
>>
>> arch/powerpc/include/asm/head-64.h
>>
>> between commit:
>>
>> 852e5da99d15 ("powerpc/64s: Tidy up after exception handler rework")
>>
>
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/platforms/pseries/lpar.c
between commit:
dbcf929c0062 ("powerpc/pseries: Add support for hash table resizing")
from the powerpc tree and commit:
cc3d2940133d ("powerpc/64: Enable use of radix MMU under hype
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/include/asm/prom.h
between commit:
0de0fb09bbce ("powerpc/pseries: Advertise HPT resizing support via CAS")
from the powerpc tree and commit:
3f4ab2f83b4e ("powerpc/pseries: Fixes for the "ibm,architecture-
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/include/asm/hvcall.h
between commit:
64b40ffbc830 ("powerpc/pseries: Add hypercall wrappers for hash page table
resizing")
from the powerpc tree and commit:
cc3d2940133d ("powerpc/64: Enable use of radix M
On 10/02/2017 04:59, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/powerpc/include/asm/head-64.h
>
> between commit:
>
> 852e5da99d15 ("powerpc/64s: Tidy up after exception handler rework")
>
> from the powerpc tree and commit:
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/kernel/exceptions-64s.S
between commit:
1a6822d194c3 ("powerpc/64s: Use (start, size) rather than (start, end) for
exception handlers")
from the powerpc tree and commit:
bc3551257af8 ("powerpc/64: Allow fo
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/include/asm/head-64.h
between commit:
852e5da99d15 ("powerpc/64s: Tidy up after exception handler rework")
from the powerpc tree and commit:
7ede531773ea ("KVM: PPC: Book3S: Move 64-bit KVM interrupt handle
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/kernel/Makefile
between commit:
27d114966735 ("powerpc/32: Remove RELOCATABLE_PPC32")
from the powerpc tree and commit:
fd7bacbca47a ("KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on
HMI inter
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/kernel/idle_book3s.S
between commit:
69c592ed40d3 ("powerpc/opal: Add real mode call wrappers")
from the powerpc tree and commit:
fd7bacbca47a ("KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/kernel/exceptions-64s.S
between commit:
9baaef0a22c8 ("powerpc/irq: Add support for HV virtualization interrupts")
from the powerpc tree and commit:
fd7bacbca47a ("KVM: PPC: Book3S HV: Fix TB corruption in
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/kvm/book3s_64_vio_hv.c
between commit:
f64e8084c94b ("powerpc/mm: Move hash related mmu-*.h headers to book3s/")
from the powerpc tree and commit:
d3695aa4f452 ("KVM: PPC: Add support for multiple-TCE hcall
17 matches
Mail list logo
