merge mainline into yeeloongfw

kern/device.c

@@ -152,7 +152,7 @@ grub_device_iterate (int (*hook) (const char *name))
 	  grub_free (partition_name);
 	  grub_free (p);
 	  return 1;
-	}      
+	}
       grub_free (partition_name);
 
       p->next = ents;

kern/main.c

@@ -68,6 +68,9 @@ grub_load_modules (void)
 			       (header->size - sizeof (struct grub_module_header))))
 	grub_fatal ("%s", grub_errmsg);
 
+      if (grub_errno)
+	grub_print_error ();
+
       return 0;
     }