merge with mainline

diff --cc grub-core/script/execute.c
index 3962b6ba525c825a9265918a1dcbaf382f98bcf4,88057d44e77a9bdca24d1bbcb9f5f57b40d72c0b..ceda6f9c522c9054fdd5fb866a379b1df52f1f32
--- 1/grub-core/script/execute.c
--- 2/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@@ -34,10 -34,11 +34,14 @@@
  static unsigned long is_continue;
  static unsigned long active_loops;
  static unsigned long active_breaks;
+ static unsigned long function_return;
+ 
+ #define GRUB_SCRIPT_SCOPE_MALLOCED      1
+ #define GRUB_SCRIPT_SCOPE_ARGS_MALLOCED 2
  
 +#define GRUB_SCRIPT_SCOPE_MALLOCED      1
 +#define GRUB_SCRIPT_SCOPE_ARGS_MALLOCED 2
 +
  /* Scope for grub script functions.  */
  struct grub_script_scope
  {

diff --cc include/grub/script_sh.h
Simple merge