Synchronise with v4.2

[kconfig-frontends] / scripts / ksync.log

diff --git a/scripts/ksync.log b/scripts/ksync.log
index 502a3b61ec455b55db5927a2e8e6875a875acd59..6bcdb8b9a6f3aa426e6c883491785de14ad370ff 100644 (file)
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -101,3 +101,14 @@ e4e458b calloc/xcalloc: Fix argument order
 09950bc merge_config.sh: Display usage if given too few arguments
 b6a2ab2 kconfig: use va_end to match corresponding va_start
 6cd176a vfs,ext2: remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAX
+4980bdf kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
+70529b1 kconfig: Get rid of the P() macro in headers
+4631574 kconfig: Remove dead code
+ad8d40c kconfig: Remove unnecessary prototypes from headers
+b9fe99c kbuild: mergeconfig: move an error check to merge_config.sh
+3a975b8 merge_config.sh: improve indentation
+bc8f8f5 merge_config.sh: rename MAKE to RUNMAKE
+0a1f00a kconfig: Do not print status messages in make -s mode
+e911503 Kconfig: Remove bad inference rules expr_eliminate_dups2()
+2e0d737 kconfig: don't silently ignore unhandled characters
+31847b6 kconfig: allow use of relations other than (in)equality