merge mainline into nestpart

diff --cc conf/any-emu.rmk
Simple merge

diff --cc conf/common.rmk
Simple merge

diff --cc kern/disk.c
Simple merge

diff --cc util/hostdisk.c
index 0bccf4ca7b941eb6884fb31574c02a5c582990ff,5c56b75795914a3c0acfd0d77ef4c609218ef69b..9ecb5b324c87e4da9f87317f8a5c3ffaa74ec6b7
--- 1/util/hostdisk.c
--- 2/util/hostdisk.c
+++ b/util/hostdisk.c
@@@ -334,13 -334,11 +334,14 @@@ open_device (const grub_disk_t disk, gr
    {
      int is_partition = 0;
      char dev[PATH_MAX];
 +    grub_disk_addr_t part_start = 0;
 +
 +    part_start = grub_partition_get_start (disk->partition);
  
      strcpy (dev, map[disk->id].device);
-     if (disk->partition && strncmp (map[disk->id].device, "/dev/", 5) == 0)
 -    if (disk->partition && sector >= disk->partition->start
++    if (disk->partition && sector >= part_start
+       && strncmp (map[disk->id].device, "/dev/", 5) == 0)
 -      is_partition = linux_find_partition (dev, disk->partition->start);
 +      is_partition = linux_find_partition (dev, part_start);
  
      /* Open the partition.  */
      grub_dprintf ("hostdisk", "opening the device `%s' in open_device()\n", dev);