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

2020-06-03 Thread Stephen Rothwell
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: > >

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

2016-07-13 Thread David Hildenbrand
> 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

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

2016-06-28 Thread Heiko Carstens
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

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

2013-01-03 Thread Stephen Rothwell
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 >

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

2013-01-02 Thread Martin Schwidefsky
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