Linux-Next discussions
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: merge conflict between kvms390/next and s390/features
Date: Wed, 8 Jun 2016 09:27:00 +1000	[thread overview]
Message-ID: <20160608092700.79acdec1@canb.auug.org.au> (raw)
In-Reply-To: <201606071309.u57D4PtK035410@mx0a-001b2d01.pphosted.com>

Hi Martin,

On Tue, 7 Jun 2016 15:07:55 +0200 Martin Schwidefsky <schwidefsky@de.ibm.com> wrote:
>
> we got a report of a compile error due to a clash between the features branch
> and the kvm branch for s390. Fixed with the following patch:
> --
> From 39e60f02654946c40a3d2b78239316c431588145 Mon Sep 17 00:00:00 2001
> From: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Date: Tue, 7 Jun 2016 14:49:43 +0200
> Subject: [PATCH] s390: fix merge conflict in arch/s390/kvm/kvm-s390.c

Thanks for the resolution, I will apply this when I merge the kvms390
tree today.  Someone needs to remember to tell Linus when these two
trees meet in his tree.

-- 
Cheers,
Stephen Rothwell

       reply	other threads:[~2016-06-07 23:27 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <201606071309.u57D4PtK035410@mx0a-001b2d01.pphosted.com>
2016-06-07 23:27 ` Stephen Rothwell [this message]
2016-06-07 13:07 linux-next: merge conflict between kvms390/next and s390/features Martin Schwidefsky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160608092700.79acdec1@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-next@vger.kernel.org \
    --cc=schwidefsky@de.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox