Merge mainline.

diff --cc Makefile.util.def
Simple merge

diff --cc grub-core/Makefile.core.def
Simple merge

diff --cc grub-core/commands/ls.c
index 9bccda3498772adeebe6cfa85ea0c5e170767912,5fc648a9b6fa3f79faf04498696ce4dc28336b0a..20a75733ce2cadb9141e13e10a2655397fe8eb0a
--- 1/grub-core/commands/ls.c
--- 2/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@@ -31,8 -31,9 +31,10 @@@
  #include <grub/extcmd.h>
  #include <grub/datetime.h>
  #include <grub/i18n.h>
 +#include <grub/net.h>
  
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
  static const struct grub_arg_option options[] =
    {
      {"long", 'l', 0, N_("Show a long list with more detailed information."), 0, 0},

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

diff --cc grub-core/kern/file.c
Simple merge

diff --cc grub-core/loader/i386/multiboot_mbi.c
Simple merge

diff --cc include/grub/err.h
index 211fafa706a9f96139190ca0904d27a65f9dace7,69bc6ec79e0775330c0b0c3d3f42a0fb08796a43..40f39dd5dd4957f3901ce61872e6c57e957573d7
--- 1/include/grub/err.h
--- 2/include/grub/err.h
+++ b/include/grub/err.h
@@@ -56,10 -56,7 +56,11 @@@ typedef enu
      GRUB_ERR_IO,
      GRUB_ERR_ACCESS_DENIED,
      GRUB_ERR_EXTRACTOR,
-     GRUB_ERR_WAIT
 +    GRUB_ERR_NET_BAD_ADDRESS,
 +    GRUB_ERR_NET_ROUTE_LOOP,
 +    GRUB_ERR_NET_NO_ROUTE,
++    GRUB_ERR_WAIT,
+     GRUB_ERR_BUG
    }
  grub_err_t;