merge mainline into nestpart

partmap/bsdlabel.c

@@ -86,12 +86,12 @@ static struct grub_partition_map grub_bsdlabel_partition_map =
     .iterate = bsdlabel_partition_map_iterate,
   };
 
-GRUB_MOD_INIT(bsd_partition_map)
+GRUB_MOD_INIT(part_bsd)
 {
   grub_partition_map_register (&grub_bsdlabel_partition_map);
 }
 
-GRUB_MOD_FINI(bsd_partition_map)
+GRUB_MOD_FINI(part_bsd)
 {
   grub_partition_map_unregister (&grub_bsdlabel_partition_map);
 }