From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Marcelo Tosatti <mtosatti@redhat•com>,
Gleb Natapov <gleb@kernel•org>,
kvm@vger•kernel.org, Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Janosch Frank <frankja@linux•vnet.ibm.com>,
Christian Borntraeger <borntraeger@de•ibm.com>
Subject: linux-next: manual merge of the kvm tree with the s390 tree
Date: Wed, 29 Jun 2016 14:36:58 +1000 [thread overview]
Message-ID: <20160629143658.204b8d07@canb.auug.org.au> (raw)
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 <sfr@canb•auug.org.au>
Date: Tue, 14 Jun 2016 14:47:33 +1000
Subject: [PATCH] s390: merge fix up for __diag204 move
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/s390/kernel/diag.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c
index a44faf4a0454..a97354c8c667 100644
--- a/arch/s390/kernel/diag.c
+++ b/arch/s390/kernel/diag.c
@@ -162,25 +162,27 @@ int diag14(unsigned long rx, unsigned long ry1, unsigned long subcode)
}
EXPORT_SYMBOL(diag14);
-static inline int __diag204(unsigned long subcode, unsigned long size, void *addr)
+static inline int __diag204(unsigned long *subcode, unsigned long size, void *addr)
{
- register unsigned long _subcode asm("0") = subcode;
+ register unsigned long _subcode asm("0") = *subcode;
register unsigned long _size asm("1") = size;
asm volatile(
" diag %2,%0,0x204\n"
- "0:\n"
+ "0: nopr %%r7\n"
EX_TABLE(0b,0b)
: "+d" (_subcode), "+d" (_size) : "d" (addr) : "memory");
- if (_subcode)
- return -1;
+ *subcode = _subcode;
return _size;
}
int diag204(unsigned long subcode, unsigned long size, void *addr)
{
diag_stat_inc(DIAG_STAT_X204);
- return __diag204(subcode, size, addr);
+ size = __diag204(&subcode, size, addr);
+ if (subcode)
+ return -1;
+ return size;
}
EXPORT_SYMBOL(diag204);
--
2.8.1
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-06-29 4:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-29 4:36 Stephen Rothwell [this message]
2016-06-29 5:47 ` linux-next: manual merge of the kvm tree with the s390 tree Heiko Carstens
-- strict thread matches above, loose matches on Subject: below --
2020-05-29 6:46 Stephen Rothwell
2020-06-04 3:05 ` Stephen Rothwell
2016-07-14 4:03 Stephen Rothwell
2016-07-14 6:58 ` David Hildenbrand
2014-10-07 4:59 Stephen Rothwell
2013-06-06 3:55 Stephen Rothwell
2013-01-03 1:06 Stephen Rothwell
2013-01-03 7:31 ` Martin Schwidefsky
2013-01-03 10:56 ` Stephen Rothwell
2012-08-16 3:49 Stephen Rothwell
2011-09-21 3:55 Stephen Rothwell
2010-10-21 1:16 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=20160629143658.204b8d07@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=frankja@linux$(echo .)vnet.ibm.com \
--cc=gleb@kernel$(echo .)org \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mtosatti@redhat$(echo .)com \
--cc=schwidefsky@de$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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