linux-next: manual merge of the kbuild tree with Linus' tree

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

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

Hi all,

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

  scripts/kconfig/confdata.c

between commit:

  b6ad541697ea ("kconfig: remove stale comment about removed kconfig_print_symbol()")

from Linus' tree and commit:

  55de8686df7e ("kconfig: change .config format to use =n instead of "is not set"")

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

I think that maybe the kbuild tree needs to be fixed up to match what
has actually been merged by Linus.
-- 
Cheers,
Stephen Rothwell

diff --cc scripts/kconfig/confdata.c
index c4340c90e172,0c711a1bdc96..000000000000
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@@ -658,9 -658,14 +658,7 @@@ static char *escape_string_value(const 
  	return out;
  }
  
- enum output_n { OUTPUT_N, OUTPUT_N_AS_UNSET, OUTPUT_N_NONE };
- 
- static void __print_symbol(FILE *fp, struct symbol *sym, enum output_n output_n,
 -/*
 - * Kconfig configuration printer
 - *
 - * This printer is used when generating the resulting configuration after
 - * kconfig invocation and `defconfig' files. Unset symbol might be omitted by
 - * passing a non-NULL argument to the printer.
 - */
+ static void __print_symbol(FILE *fp, struct symbol *sym, bool output_n,
  			   bool escape_string)
  {
  	const char *val;

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