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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20220404080948.0590992a@canb.auug.org.au>
Date:   Mon, 4 Apr 2022 08:09:48 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Masahiro Yamada <masahiroy@...nel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the kbuild tree with Linus' tree

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;

Content of type "application/pgp-signature" skipped