From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Cornelia Huck <cornelia.huck@de.ibm.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Harald Freudenberger <freude@linux.vnet.ibm.com>,
"Jason J. Herne" <jjherne@linux.vnet.ibm.com>
Subject: Re: linux-next: manual merge of the kvms390 tree with the s390 tree
Date: Thu, 27 Apr 2017 08:47:22 +0200 [thread overview]
Message-ID: <4dbc5e97-2577-d3b7-466c-24cba3a3fdca@de.ibm.com> (raw)
In-Reply-To: <20170427132917.3843cedc@canb.auug.org.au>
On 04/27/2017 05:29 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> arch/s390/include/asm/cpacf.h
>
> between commit:
>
> 985a9d20daa6 ("s390/crypto: Renaming PPNO to PRNO.")
>
> from the s390 tree and commit:
>
> 152c1c8d60eb ("s390/cpacf: Introduce kma instruction")
>
> from the kvms390 tree.
>
> I fixed it up (see 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.
>
Correct fix, thanks. It should be ok again tomorrow as Martin has merged
my topic branch.
next prev parent reply other threads:[~2017-04-27 6:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-27 3:29 linux-next: manual merge of the kvms390 tree with the s390 tree Stephen Rothwell
2017-04-27 6:47 ` Christian Borntraeger [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-23 1:12 Stephen Rothwell
2023-01-23 7:07 ` Christian Borntraeger
2023-01-23 19:02 ` Anthony Krowiak
2023-01-24 11:19 ` Christian Borntraeger
2023-01-24 14:43 ` Anthony Krowiak
2022-11-08 2:41 Stephen Rothwell
2017-06-22 2:59 Stephen Rothwell
2017-07-03 1:55 ` Stephen Rothwell
2016-11-23 3:45 Stephen Rothwell
2016-11-23 8:24 ` Christian Borntraeger
2016-11-23 9:17 ` Heiko Carstens
2016-06-14 4:51 Stephen Rothwell
2016-06-14 4:52 ` Heiko Carstens
2016-06-14 8:45 ` Christian Borntraeger
2015-07-22 2:31 Stephen Rothwell
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=4dbc5e97-2577-d3b7-466c-24cba3a3fdca@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=cornelia.huck@de.ibm.com \
--cc=freude@linux.vnet.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=jjherne@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).