Hi all,
On Fri, 29 May 2020 16:46:13 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/s390/kvm/vsie.c
>
> between commit:
>
> 0b0ed657fe00 ("s390: remove critical section cleanup from entry.S")
>
> from the s390 tree and commit:
>
>
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/s390/kvm/vsie.c
between commit:
0b0ed657fe00 ("s390: remove critical section cleanup from entry.S")
from the s390 tree and commit:
d075fc3154be ("KVM: s390: vsie: Move conditional reschedule")
from the kvm tree.
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/s390/mm/gmap.c
>
> between commit:
>
> f04540298440 ("s390/mm: fix gmap tlb flush issues")
>
> from the s390 tree and commit:
>
> 6ea427bbbd40 ("s390/mm: add reference counter to gmap structure")
>
> fro
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/s390/mm/gmap.c
between commit:
f04540298440 ("s390/mm: fix gmap tlb flush issues")
from the s390 tree and commit:
6ea427bbbd40 ("s390/mm: add reference counter to gmap structure")
from the kvm tree.
I fixed it up
On Wed, Jun 29, 2016 at 02:36:58PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/s390/hypfs/hypfs_diag.c
>
> between commit:
>
> e030c1125eab ("s390/hypfs: use basic block for diag inline assembly")
>
> from the s390 tree
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/s390/hypfs/hypfs_diag.c
between commit:
e030c1125eab ("s390/hypfs: use basic block for diag inline assembly")
from the s390 tree and commit:
e65f30e0cb29 ("s390: hypfs: Move diag implementation and data definitions
Hi all,
Today's linux-next merge of the kvm tree got a conflict in
arch/s390/mm/pgtable.c between commit 9511571c4f0e ("s390: mm: fixing
calls of pte_unmap_unlock") from the s390 tree and commit dc77d344b41f
("KVM: s390/mm: fix up indentation of set_guest_storage_key") from the
kvm tree.
I fixed
Hi all,
Today's linux-next merge of the kvm tree got a conflict in
arch/s390/include/asm/pgtable.h between commit 338679f7ba4a
("s390/pgtable: Fix guest overindication for change bit") from the s390
tree and commit 0d0dafc1e48f ("s390/kvm: rename RCP_xxx defines to
PGSTE_xxx") from the kvm tree.
Hi Martin,
On Thu, 3 Jan 2013 08:31:55 +0100 Martin Schwidefsky
wrote:
>
> I surprises me a bit that there is only one hunk in the cleanup patch.
> I expected three, the above for virtio_ccw.c, one for irq.c and another
> for irq.h. I checked the resulting tree which is correct! The merge diff
>
Hi Stephen,
On Thu, 3 Jan 2013 12:06:50 +1100
Stephen Rothwell wrote:
> Today's linux-next merge of the kvm tree got conflicts in
> arch/s390/include/asm/irq.h and arch/s390/kernel/irq.c between commit
> bfb048f594d5 ("s390/irq: remove split irq fields from /proc/stat") from
> the s390 tree and
Hi all,
Today's linux-next merge of the kvm tree got conflicts in
arch/s390/include/asm/irq.h and arch/s390/kernel/irq.c between commit
bfb048f594d5 ("s390/irq: remove split irq fields from /proc/stat") from
the s390 tree and commit 7e64e0597fd6 ("KVM: s390: Add a channel I/O
based virtio transpor
Hi all,
Today's linux-next merge of the kvm tree got a conflict in
arch/s390/include/asm/processor.h between commit 3c011c612acb
("s390/bpf,jit: BPF Just In Time compiler for s390") from the s390 tree
and commit 9b7fb990e080 ("s390, /dis: Instruction decoding interface") from
the kvm tree.
Just c
12 matches
Mail list logo
