Synchronise with v4.0

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/.version b/.version
index 718a74e483e05af2ee584ed062070a15c8353887..dc46979dd12d0ca0188149ac73115808ca7d1f42 100644 (file)
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
-3.19.0 bfa76d49576599a4b9f9b7a71f23d73d6dcff735 Diseased Newt
+4.0.0 39a8804455fb23f09157341d3ba7db6d7ae6ee76 Hurr durr I'ma sheep
 0

diff --git a/libs/parser/confdata.c b/libs/parser/confdata.c
index f88d90f20228e8783b5ca39accc436140af7b3ff..28df18dd1147f60b555fea428afe42513b592410 100644 (file)
--- a/libs/parser/confdata.c
+++ b/libs/parser/confdata.c
@@ -59,6 +59,7 @@ static void conf_message(const char *fmt, ...)
        va_start(ap, fmt);
        if (conf_message_callback)
                conf_message_callback(fmt, ap);
+       va_end(ap);
 }
 
 const char *conf_get_configname(void)

diff --git a/scripts/ksync.log b/scripts/ksync.log
index e411e954f50437c9574acdccdc26ae7f51b4daf4..502a3b61ec455b55db5927a2e8e6875a875acd59 100644 (file)
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -98,3 +98,6 @@ c40724d kconfig: lxdialog: fix spelling
 3943f42 Replace mentions of "list_struct" to "list_head"
 2d56030 kconfig: Fix warning "‘jump’ may be used uninitialized"
 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

diff --git a/utils/diff b/utils/diff
index 6d672836e18722c38cce43149587db32882e6316..0db267d0adc9231de508b4cf9ca7068df8362384 100755 (executable)
--- a/utils/diff
+++ b/utils/diff
@@ -28,7 +28,6 @@ If no config files are specified, .config and .config.old are used.
 Example usage:
  $ diffconfig .config config-with-some-changes
 -EXT2_FS_XATTR  n
--EXT2_FS_XIP  n
  CRAMFS  n -> y
  EXT2_FS  y -> n
  LOG_BUF_SHIFT  14 -> 16

diff --git a/utils/merge b/utils/merge
index 81b0c61bb9e2060c18fb9dd315e8a9e0ae8a195a..2ab91b9b100dc6f6cfba663d05580e14930a3def 100755 (executable)
--- a/utils/merge
+++ b/utils/merge
@@ -77,6 +77,11 @@ while true; do
        esac
 done
 
+if [ "$#" -lt 2 ] ; then
+       usage
+       exit
+fi
+
 INITFILE=$1
 shift;