This is a note to let you know that I've just added the patch titled

    xen-blkfront: Fix one off warning about name clash

to the 3.0-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     xen-blkfront-fix-one-off-warning-about-name-clash.patch
and it can be found in the queue-3.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@kernel.org> know about it.


>From 89153b5cae9f40c224a5d321665a97bf14220c2c Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.ba...@canonical.com>
Date: Thu, 14 Jul 2011 15:30:37 +0200
Subject: xen-blkfront: Fix one off warning about name clash

From: Stefan Bader <stefan.ba...@canonical.com>

commit 89153b5cae9f40c224a5d321665a97bf14220c2c upstream.

Avoid telling users to use xvde and onwards when using xvde.

Acked-by: Stefano Stabellini <stefano.stabell...@eu.citrix.com>
Signed-off-by: Stefan Bader <stefan.ba...@canonical.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>

---
 drivers/block/xen-blkfront.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -529,7 +529,7 @@ static int xlvbd_alloc_gendisk(blkif_sec
                minor = BLKIF_MINOR_EXT(info->vdevice);
                nr_parts = PARTS_PER_EXT_DISK;
                offset = minor / nr_parts;
-               if (xen_hvm_domain() && offset <= EMULATED_HD_DISK_NAME_OFFSET 
+ 4)
+               if (xen_hvm_domain() && offset < EMULATED_HD_DISK_NAME_OFFSET + 
4)
                        printk(KERN_WARNING "blkfront: vdevice 0x%x might 
conflict with "
                                        "emulated IDE disks,\n\t choose an xvd 
device name"
                                        "from xvde on\n", info->vdevice);


Patches currently in stable-queue which might be from 
stefan.ba...@canonical.com are

queue-3.0/xen-blkfront-drop-name-and-minor-adjustments-for-emulated.patch
queue-3.0/xen-blkfront-fix-one-off-warning-about-name-clash.patch

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to