From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Carstens Subject: Re: linux-next: manual merge of the kvm tree with the s390 tree Date: Wed, 29 Jun 2016 07:47:50 +0200 Message-ID: <20160629054750.GA3458@osiris> References: <20160629143658.204b8d07@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Marcelo Tosatti , Gleb Natapov , kvm@vger.kernel.org, Martin Schwidefsky , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Janosch Frank , Christian Borntraeger To: Stephen Rothwell Return-path: Content-Disposition: inline In-Reply-To: <20160629143658.204b8d07@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-Id: kvm.vger.kernel.org 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 and commit: > > e65f30e0cb29 ("s390: hypfs: Move diag implementation and data definitions") > > from the kvm tree. > > I fixed it up (my fixup patch now looks like below) and can carry the > fix as necessary. This is now fixed as far as linux-next is concerned, > but any non trivial conflicts should be mentioned to your upstream > maintainer when your tree is submitted for merging. You may also want > to consider cooperating with the maintainer of the conflicting tree to > minimise any particularly complex conflicts. > > From: Stephen Rothwell > Date: Tue, 14 Jun 2016 14:47:33 +1000 > Subject: [PATCH] s390: merge fix up for __diag204 move > > Signed-off-by: Stephen Rothwell > --- > arch/s390/kernel/diag.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) The fix looks good. Thanks!