merge mainline into hints

diff --cc grub-core/commands/handler.c
index 09b8ff5d0d12a510dcc74f86fe21142a40c61629,0000000000000000000000000000000000000000..09b8ff5d0d12a510dcc74f86fe21142a40c61629
mode 100644,000000..100644
--- 1/commands/handler.c
--- /dev/null
+++ b/grub-core/commands/handler.c

diff --cc grub-core/commands/search.c
index c3626d3526ae7aabb33d425e3317228db521dec4,8a646b452f34abbda3bd9bf1be852675682737f8..9b693e76f4dc9f5fc4cb3c0180b43b123aa3a957
--- 1/commands/search.c
--- 2/grub-core/commands/search.c
+++ b/grub-core/commands/search.c
@@@ -30,11 -30,9 +30,10 @@@
  #include <grub/i18n.h>
  
  void
 -FUNC_NAME (const char *key, const char *var, int no_floppy)
 +FUNC_NAME (const char *key, const char *var, int no_floppy,
 +         const char **hints, unsigned nhints)
  {
    int count = 0;
-   char *buf = NULL;
    grub_fs_autoload_hook_t saved_autoload;
  
    auto int iterate_device (const char *name);
@@@ -141,13 -126,11 +137,11 @@@
  
        /* Retry with autoload if nothing found.  */
        if (grub_errno == GRUB_ERR_NONE && count == 0)
 -      grub_device_iterate (iterate_device);
 +      try ();
      }
    else
 -    grub_device_iterate (iterate_device);
 +    try ();
  
-   grub_free (buf);
- 
    if (grub_errno == GRUB_ERR_NONE && count == 0)
      grub_error (GRUB_ERR_FILE_NOT_FOUND, "no such device: %s", key);
  }
@@@ -177,10 -159,8 +171,8 @@@ GRUB_MOD_INIT(search_label
  {
    cmd =
      grub_register_command (COMMAND_NAME, grub_cmd_do_search,
-                          "NAME [VARIABLE] [HINTS]",
-                          "Search devices by " SEARCH_TARGET "."
-                          " If VARIABLE is specified, "
-                          "the first device found is set to a variable.");
 -                         N_("NAME [VARIABLE]"),
++                         N_("NAME [VARIABLE] [HINTS]"),
+                          HELP_MESSAGE);
  }
  
  #ifdef DO_SEARCH_FILE

diff --cc grub-core/commands/search_wrap.c
Simple merge

diff --cc grub-core/efiemu/runtime/efiemu.sh
index 5a492dc2f995c7f3dae6a1d7094abf6842fbe81f,0000000000000000000000000000000000000000..5a492dc2f995c7f3dae6a1d7094abf6842fbe81f
mode 100644,000000..100644
--- 1/efiemu/runtime/efiemu.sh
--- /dev/null
+++ b/grub-core/efiemu/runtime/efiemu.sh

diff --cc grub-core/kern/handler.c
index 2bf85313cfa1d8b393807fbb677dc3453c91593e,0000000000000000000000000000000000000000..2bf85313cfa1d8b393807fbb677dc3453c91593e
mode 100644,000000..100644
--- 1/kern/handler.c
--- /dev/null
+++ b/grub-core/kern/handler.c

diff --cc grub-core/kern/i386/ieee1275/init.c
index 7658ee1a7bb866ebedf6955cfb1a387d0c19a936,0000000000000000000000000000000000000000..7658ee1a7bb866ebedf6955cfb1a387d0c19a936
mode 100644,000000..100644
--- 1/kern/i386/ieee1275/init.c
--- /dev/null
+++ b/grub-core/kern/i386/ieee1275/init.c

diff --cc grub-core/kern/i386/loader.S
index 3e9c713273e524bc06caf0439aca75b480f4c61e,0000000000000000000000000000000000000000..3e9c713273e524bc06caf0439aca75b480f4c61e
mode 100644,000000..100644
--- 1/kern/i386/loader.S
--- /dev/null
+++ b/grub-core/kern/i386/loader.S

diff --cc grub-core/kern/i386/misc.S
index 7d57df9b9541f4d9a77beba52b30dd63c30c8c43,0000000000000000000000000000000000000000..7d57df9b9541f4d9a77beba52b30dd63c30c8c43
mode 100644,000000..100644
--- 1/kern/i386/misc.S
--- /dev/null
+++ b/grub-core/kern/i386/misc.S

diff --cc grub-core/kern/reader.c
index 271a90f5a5bccd43b000b9739304fb5819fe3377,0000000000000000000000000000000000000000..271a90f5a5bccd43b000b9739304fb5819fe3377
mode 100644,000000..100644
--- 1/kern/reader.c
--- /dev/null
+++ b/grub-core/kern/reader.c

diff --cc grub-core/loader/i386/bsd_helper.S
index 25aee3a8051be06101e64ff611fab3ab3a99fdaf,0000000000000000000000000000000000000000..25aee3a8051be06101e64ff611fab3ab3a99fdaf
mode 100644,000000..100644
--- 1/loader/i386/bsd_helper.S
--- /dev/null
+++ b/grub-core/loader/i386/bsd_helper.S

diff --cc grub-core/loader/i386/bsd_trampoline.S
index a568fff4d25fbd292aac64b1d7aa48668d90021d,0000000000000000000000000000000000000000..a568fff4d25fbd292aac64b1d7aa48668d90021d
mode 100644,000000..100644
--- 1/loader/i386/bsd_trampoline.S
--- /dev/null
+++ b/grub-core/loader/i386/bsd_trampoline.S

diff --cc grub-core/loader/i386/efi/linux.c
index 1c256e377d3a8688824758f4378eaf70ad8ee44c,0000000000000000000000000000000000000000..1c256e377d3a8688824758f4378eaf70ad8ee44c
mode 100644,000000..100644
--- 1/loader/i386/efi/linux.c
--- /dev/null
+++ b/grub-core/loader/i386/efi/linux.c

diff --cc grub-core/loader/i386/efi/xnu.c
index a7ede1960f84fed36c11c0f24bdbe9139e88ee1c,0000000000000000000000000000000000000000..a7ede1960f84fed36c11c0f24bdbe9139e88ee1c
mode 100644,000000..100644
--- 1/loader/i386/efi/xnu.c
--- /dev/null
+++ b/grub-core/loader/i386/efi/xnu.c

diff --cc grub-core/loader/i386/ieee1275/linux.c
index b577de964633640b9d0129387782a9cdd1a1cc08,0000000000000000000000000000000000000000..b577de964633640b9d0129387782a9cdd1a1cc08
mode 100644,000000..100644
--- 1/loader/i386/ieee1275/linux.c
--- /dev/null
+++ b/grub-core/loader/i386/ieee1275/linux.c

diff --cc grub-core/loader/i386/linux_trampoline.S
index 4acea7b1161a2cd415e976760f6815ef307f249a,0000000000000000000000000000000000000000..4acea7b1161a2cd415e976760f6815ef307f249a
mode 100644,000000..100644
--- 1/loader/i386/linux_trampoline.S
--- /dev/null
+++ b/grub-core/loader/i386/linux_trampoline.S

diff --cc grub-core/loader/i386/multiboot_helper.S
index 2f9af778b9614c3b1e775b85d3679fb4c9c3930c,0000000000000000000000000000000000000000..2f9af778b9614c3b1e775b85d3679fb4c9c3930c
mode 100644,000000..100644
--- 1/loader/i386/multiboot_helper.S
--- /dev/null
+++ b/grub-core/loader/i386/multiboot_helper.S

diff --cc grub-core/loader/i386/pc/multiboot2.c
index 9bfe5d248f8f35b0f0db16b7150b4d3c956d56ab,0000000000000000000000000000000000000000..9bfe5d248f8f35b0f0db16b7150b4d3c956d56ab
mode 100644,000000..100644
--- 1/loader/i386/pc/multiboot2.c
--- /dev/null
+++ b/grub-core/loader/i386/pc/multiboot2.c

diff --cc grub-core/loader/i386/pc/xnu.c
index ebb176bb41951ecbe20d465493903ef9bb5e00c9,0000000000000000000000000000000000000000..ebb176bb41951ecbe20d465493903ef9bb5e00c9
mode 100644,000000..100644
--- 1/loader/i386/pc/xnu.c
--- /dev/null
+++ b/grub-core/loader/i386/pc/xnu.c

diff --cc grub-core/loader/ieee1275/multiboot2.c
index 8c0bc09ecb213337e19077c0879ffa1c5028e4d8,0000000000000000000000000000000000000000..8c0bc09ecb213337e19077c0879ffa1c5028e4d8
mode 100644,000000..100644
--- 1/loader/ieee1275/multiboot2.c
--- /dev/null
+++ b/grub-core/loader/ieee1275/multiboot2.c

diff --cc grub-core/loader/multiboot2.c
index dbdee9c87a8b13e453a2c5f9e86dbbd75cd5ee7f,0000000000000000000000000000000000000000..dbdee9c87a8b13e453a2c5f9e86dbbd75cd5ee7f
mode 100644,000000..100644
--- 1/loader/multiboot2.c
--- /dev/null
+++ b/grub-core/loader/multiboot2.c

diff --cc grub-core/loader/multiboot_loader.c
index 24c0c5eacd5457817c24a69ec3ba4766b525d53a,0000000000000000000000000000000000000000..24c0c5eacd5457817c24a69ec3ba4766b525d53a
mode 100644,000000..100644
--- 1/loader/multiboot_loader.c
--- /dev/null
+++ b/grub-core/loader/multiboot_loader.c

diff --cc grub-core/normal/handler.c
index b44dc7a68f11eee1041099c7a9ece25cc9bf5300,0000000000000000000000000000000000000000..b44dc7a68f11eee1041099c7a9ece25cc9bf5300
mode 100644,000000..100644
--- 1/normal/handler.c
--- /dev/null
+++ b/grub-core/normal/handler.c

diff --cc grub-core/normal/menu_viewer.c
index f870ccd53e6e42884decc57a6d530f39d42bddbb,0000000000000000000000000000000000000000..f870ccd53e6e42884decc57a6d530f39d42bddbb
mode 100644,000000..100644
--- 1/normal/menu_viewer.c
--- /dev/null
+++ b/grub-core/normal/menu_viewer.c

diff --cc grub-core/term/i386/pc/vesafb.c
index 52694ed104027149c332bca14fe836542a29ab72,0000000000000000000000000000000000000000..52694ed104027149c332bca14fe836542a29ab72
mode 100644,000000..100644
--- 1/term/i386/pc/vesafb.c
--- /dev/null
+++ b/grub-core/term/i386/pc/vesafb.c