[xen staging] xen/build: fixup path to merge_config.sh

[patchbot@xxxxxxx]

commit 90b1701905dd0cbb7efe525b1bf92007fe818b60
Author:     Stewart Hildebrand <stewart.hildebrand@xxxxxxxxxxxxxxx>
AuthorDate: Tue May 12 13:52:05 2020 -0400
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri May 15 16:51:26 2020 +0100

    xen/build: fixup path to merge_config.sh
    
    This resolves the following observed error:
    
    /bin/sh: /path/to/xen/xen/../xen/scripts/kconfig/merge_config.sh: No such 
file or directory
    
    Signed-off-by: Stewart Hildebrand <stewart.hildebrand@xxxxxxxxxxxxxxx>
    Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
---
 xen/tools/kconfig/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile
index ef2f2336c4..fd37f4386a 100644
--- a/xen/tools/kconfig/Makefile
+++ b/xen/tools/kconfig/Makefile
@@ -93,7 +93,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ 
$(srctree)/arch/$(SRCARCH)/c
 
 %.config: $(obj)/conf
        $(if $(call configfiles),, $(error No configuration exists for this 
target on this architecture))
-       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m 
.config $(configfiles)
+       $(Q)$(CONFIG_SHELL) $(srctree)/tools/kconfig/merge_config.sh -m .config 
$(configfiles)
        $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
 
 PHONY += kvmconfig
--
generated by git-patchbot for /home/xen/git/xen.git#staging