On Tue, Jun 14, 2016 at 02:51:17PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> arch/s390/hypfs/hypfs_diag.c
>
> between commit:
>
> 6c22c9863760 ("s390: avoid extable collisions")
>
> from the s390 tree and commit:
>
> e65f30e0cb29 ("s390: hypfs: Move diag implementation and data definitions")
>
> from the kvms390 tree.
>
> I fixed it up (using the kvms390 version and then adding the following
> patch) 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 <s...@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 <s...@canb.auug.org.au>
> ---
> arch/s390/kernel/diag.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c
> index a44faf4a0454..2289d6f8bec0 100644
> --- a/arch/s390/kernel/diag.c
> +++ b/arch/s390/kernel/diag.c
> @@ -169,7 +169,7 @@ static inline int __diag204(unsigned long subcode,
> unsigned long size, void *add
>
> 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)
The patch looks good. Thank you!
