linux-next: manual merge of the kspp tree with the mm tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1543 bytes --]

Hi all,

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

  include/linux/string_choices.h

between commit:

  533f2ca2a8a2 ("lib/string_choices: add str_true_false()/str_false_true() helper")

from the mm-nonmm-unstable branch of the mm tree and commits:

  a98ae7f045b2 ("lib/string_choices: Add str_up_down() helper")
  f5c1ca3a15fd ("string_choices: Add wrapper for str_down_up()")

from the kspp 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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/string_choices.h
index 4a2432313b8e,1320bcdcb89c..000000000000
--- a/include/linux/string_choices.h
+++ b/include/linux/string_choices.h
@@@ -42,12 -42,12 +42,18 @@@ static inline const char *str_yes_no(bo
  	return v ? "yes" : "no";
  }
  
 +static inline const char *str_true_false(bool v)
 +{
 +	return v ? "true" : "false";
 +}
 +#define str_false_true(v)		str_true_false(!(v))
 +
+ static inline const char *str_up_down(bool v)
+ {
+ 	return v ? "up" : "down";
+ }
+ #define str_down_up(v)		str_up_down(!(v))
+ 
  /**
   * str_plural - Return the simple pluralization based on English counts
   * @num: Number used for deciding pluralization

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]