linux3.10: update to 3.10.7.
This commit is contained in:
parent
f6e4b97a36
commit
e2cf3e80ee
|
@ -1,24 +0,0 @@
|
|||
[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
|
||||
|
||||
If a device has the skip_vpd_pages flag set we should simply fail the
|
||||
scsi_get_vpd_page() call.
|
||||
|
||||
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
||||
Acked-by: Alan Stern <stern@rowland.harvard.edu>
|
||||
Tested-by: Stuart Foster <smf.linux@ntlworld.com>
|
||||
Cc: stable@vger.kernel.org
|
||||
|
||||
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
|
||||
index 3b1ea34..eaa808e 100644
|
||||
--- drivers/scsi/scsi.c
|
||||
+++ drivers/scsi/scsi.c
|
||||
@@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf,
|
||||
{
|
||||
int i, result;
|
||||
|
||||
+ if (sdev->skip_vpd_pages)
|
||||
+ goto fail;
|
||||
+
|
||||
/* Ask for all the pages supported by this device */
|
||||
result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
|
||||
if (result)
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'linux3.10'
|
||||
#
|
||||
pkgname=linux3.10
|
||||
version=3.10.6
|
||||
version=3.10.7
|
||||
revision=1
|
||||
wrksrc="linux-${version}"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
|
@ -9,7 +9,7 @@ homepage="http://www.kernel.org"
|
|||
license="GPL-2"
|
||||
short_desc="The Linux kernel and modules (3.10 series)"
|
||||
distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
|
||||
checksum=ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf
|
||||
checksum=21da633d8e92040980220b3b39b2a8cfd149a4c9c12a5f2ddedde7f8e071c795
|
||||
|
||||
only_for_archs="i686 x86_64"
|
||||
makedepends="bc perl kmod>=11_2 openssl which elfutils"
|
||||
|
|
Loading…
Reference in New Issue