merge with mainline

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

diff --cc script/parser.y
index e5de35cf453892967b5767ef17c5311170235dde,e85ba624dd8e553c5527d719cd6a24bacdac0a22..672d9dc88c4dd0bb0cb23300786b5ed727e2073c
--- 1/script/parser.y
--- 2/script/parser.y
+++ b/script/parser.y
@@@ -20,6 -20,6 +20,7 @@@
  %{
  #include <grub/script_sh.h>
  #include <grub/mm.h>
++#include <grub/misc.h>
  
  #define YYFREE          grub_free
  #define YYMALLOC        grub_malloc