From c7af2f135f72a51f9efac285736b31e937dcdbf3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 2 Aug 2016 22:17:59 +0200 Subject: [PATCH] Synchronise with v4.0 Signed-off-by: "Yann E. MORIN" --- .version | 2 +- libs/parser/confdata.c | 1 + scripts/ksync.log | 3 +++ utils/diff | 1 - utils/merge | 5 +++++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.version b/.version index 718a74e..dc46979 100644 --- 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 f88d90f..28df18d 100644 --- 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 e411e95..502a3b6 100644 --- 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 6d67283..0db267d 100755 --- 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 81b0c61..2ab91b9 100755 --- 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; -- 2.39.5