Subject: linux-next: manual merge of the tip tree with the s390 tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 20 Aug 2015 15:32:38 +1000

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/s390/lib/uaccess.c

between commit:

  cabc4abe8e36 ("s390/uaccess: remove uaccess_primary kernel parameter")

from the s390 tree and commit:

  ed79e946732e ("s390/uaccess, locking/static_keys: employ static_branch_likely()")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/s390/lib/uaccess.c
index 0d002a746bec,93cb1d09493d..000000000000
--- a/arch/s390/lib/uaccess.c
+++ b/arch/s390/lib/uaccess.c
@@@ -370,10 -370,23 +370,10 @@@ long __strncpy_from_user(char *dst, con
  }
  EXPORT_SYMBOL(__strncpy_from_user);
  
 -/*
 - * The "old" uaccess variant without mvcos can be enforced with the
 - * uaccess_primary kernel parameter. This is mainly for debugging purposes.
 - */
 -static int uaccess_primary __initdata;
 -
 -static int __init parse_uaccess_pt(char *__unused)
 -{
 -	uaccess_primary = 1;
 -	return 0;
 -}
 -early_param("uaccess_primary", parse_uaccess_pt);
 -
  static int __init uaccess_init(void)
  {
 -	if (!uaccess_primary && test_facility(27))
 +	if (test_facility(27))
- 		static_key_slow_inc(&have_mvcos);
+ 		static_branch_enable(&have_mvcos);
  	return 0;
  }
  early_initcall(uaccess_init);