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

2021-06-22 Thread Paolo Bonzini
On 22/06/21 16:51, Michael Ellerman wrote: Please drop the patches at https://www.spinics.net/lists/kvm-ppc/msg18666.html from the powerpc tree, and merge them through either the kvm-powerpc or kvm trees. The kvm-ppc tree is not taking patches at the moment. If so, let's remove the "T" entry

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

2021-06-22 Thread Michael Ellerman
Paolo Bonzini writes: > On 22/06/21 07:25, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the kvm tree got a conflict in: >> >>include/uapi/linux/kvm.h >> >> between commit: >> >>9bb4a6f38fd4 ("KVM: PPC: Book3S HV: Add KVM_CAP_PPC_RPT_INVALIDATE >> capability") >

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

2021-06-21 Thread Paolo Bonzini
On 22/06/21 07:25, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the kvm tree got a conflict in: include/uapi/linux/kvm.h between commit: 9bb4a6f38fd4 ("KVM: PPC: Book3S HV: Add KVM_CAP_PPC_RPT_INVALIDATE capability") from the powerpc tree and commits: 644f706719f0 (

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

2017-02-15 Thread Paolo Bonzini
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.

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

2017-02-15 Thread Michael Ellerman
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

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

2017-02-15 Thread Michael Ellerman
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

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

2017-02-14 Thread Paolo Bonzini
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

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

2017-02-14 Thread Michael Ellerman
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") >> >

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

2017-02-10 Thread Paolo Bonzini
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: