[kernel] r19475 - in dists/sid/linux/debian: . patches patches/bugfix/all patches/bugfix/x86 patches/features/x86/hyperv
Ben Hutchings
benh at alioth.debian.org
Thu Nov 1 05:23:26 UTC 2012
Author: benh
Date: Thu Nov 1 05:23:25 2012
New Revision: 19475
Log:
Update to 3.2.33
Deleted:
dists/sid/linux/debian/patches/bugfix/all/SUNRPC-Set-alloc_slot-for-backchannel-tcp-ops.patch
dists/sid/linux/debian/patches/bugfix/all/kernel-sys.c-fix-stack-memory-content-leak-via-UNAME.patch
dists/sid/linux/debian/patches/bugfix/x86/ALSA-hda-Fix-oops-caused-by-recent-commit-Fix-intern.patch
dists/sid/linux/debian/patches/bugfix/x86/SCSI-storvsc-Account-for-in-transit-packets-in-the-R.patch
dists/sid/linux/debian/patches/drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch
dists/sid/linux/debian/patches/e1000-fix-vlan-processing-regression.patch
Modified:
dists/sid/linux/debian/changelog
dists/sid/linux/debian/patches/features/x86/hyperv/0006-Staging-hv-storvsc-Fix-error-handling-storvsc_host_r.patch
dists/sid/linux/debian/patches/features/x86/hyperv/0067-Staging-hv-storvsc-Move-the-storage-driver-out-of-th.patch
dists/sid/linux/debian/patches/series
Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog Thu Nov 1 05:03:05 2012 (r19474)
+++ dists/sid/linux/debian/changelog Thu Nov 1 05:23:25 2012 (r19475)
@@ -1,11 +1,15 @@
-linux (3.2.32-2) UNRELEASED; urgency=low
+linux (3.2.33-1) UNRELEASED; urgency=low
+ * New upstream stable update:
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.33
+ - e1000: fix vlan processing regression (Closes: #690956)
+ - [x86] drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13
+ (Closes: #691122)
+
+ [ Ben Hutchings ]
* [x86] udeb: Re-add isci to scsi-extra-modules (Closes: #690886;
regression of #652897 in version 3.2~rc7-1~experimental.1 due to
mis-merge)
- * e1000: fix vlan processing regression (Closes: #690956)
- * [x86] drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13
- (Closes: #691122)
* udeb: Add 8021q to nic-extra-modules (Closes: #689159)
-- Ben Hutchings <ben at decadent.org.uk> Wed, 24 Oct 2012 14:15:57 +0100
Modified: dists/sid/linux/debian/patches/features/x86/hyperv/0006-Staging-hv-storvsc-Fix-error-handling-storvsc_host_r.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/x86/hyperv/0006-Staging-hv-storvsc-Fix-error-handling-storvsc_host_r.patch Thu Nov 1 05:03:05 2012 (r19474)
+++ dists/sid/linux/debian/patches/features/x86/hyperv/0006-Staging-hv-storvsc-Fix-error-handling-storvsc_host_r.patch Thu Nov 1 05:23:25 2012 (r19475)
@@ -16,11 +16,9 @@
drivers/staging/hv/storvsc_drv.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
-diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
-index e16c7a3..a145245 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
-@@ -1019,7 +1019,7 @@ static int storvsc_host_reset(struct hv_device *device)
+@@ -1019,7 +1019,7 @@ static int storvsc_host_reset(struct hv_
stor_device = get_out_stor_device(device);
if (!stor_device)
@@ -29,7 +27,7 @@
request = &stor_device->reset_request;
vstor_packet = &request->vstor_packet;
-@@ -1036,13 +1036,11 @@ static int storvsc_host_reset(struct hv_device *device)
+@@ -1036,13 +1036,11 @@ static int storvsc_host_reset(struct hv_
VM_PKT_DATA_INBAND,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if (ret != 0)
@@ -46,9 +44,9 @@
/*
-@@ -1050,8 +1048,7 @@ static int storvsc_host_reset(struct hv_device *device)
- * should have been flushed out and return to us
+@@ -1055,8 +1053,7 @@ static int storvsc_host_reset(struct hv_
*/
+ storvsc_wait_to_drain(stor_device);
-cleanup:
- return ret;
@@ -56,7 +54,7 @@
}
-@@ -1060,16 +1057,11 @@ cleanup:
+@@ -1065,16 +1062,11 @@ cleanup:
*/
static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
{
@@ -74,6 +72,3 @@
}
---
-1.7.9.5
-
Modified: dists/sid/linux/debian/patches/features/x86/hyperv/0067-Staging-hv-storvsc-Move-the-storage-driver-out-of-th.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/x86/hyperv/0067-Staging-hv-storvsc-Move-the-storage-driver-out-of-th.patch Thu Nov 1 05:03:05 2012 (r19474)
+++ dists/sid/linux/debian/patches/features/x86/hyperv/0067-Staging-hv-storvsc-Move-the-storage-driver-out-of-th.patch Thu Nov 1 05:23:25 2012 (r19475)
@@ -19,28 +19,13 @@
Signed-off-by: K. Y. Srinivasan <kys at microsoft.com>
Acked-by: James Bottomley <JBottomley at Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+[bwh: Adjusted to apply after commit 5c1b10ab7f93d24f29b5630286e323d1c5802d5c
+ ('storvsc: Account for in-transit packets in the RESET path') backported
+ in 3.2.33, moving that fix to the new file]
---
- drivers/scsi/Kconfig | 7 +
- drivers/scsi/Makefile | 3 +
- drivers/scsi/storvsc_drv.c | 1548 ++++++++++++++++++++++++++++++++++++++
- drivers/staging/Kconfig | 2 -
- drivers/staging/Makefile | 1 -
- drivers/staging/hv/Kconfig | 5 -
- drivers/staging/hv/Makefile | 3 -
- drivers/staging/hv/TODO | 5 -
- drivers/staging/hv/storvsc_drv.c | 1548 --------------------------------------
- 9 files changed, 1558 insertions(+), 1564 deletions(-)
- create mode 100644 drivers/scsi/storvsc_drv.c
- delete mode 100644 drivers/staging/hv/Kconfig
- delete mode 100644 drivers/staging/hv/Makefile
- delete mode 100644 drivers/staging/hv/TODO
- delete mode 100644 drivers/staging/hv/storvsc_drv.c
-
-diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
-index 06ea3bc..4910269 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
-@@ -662,6 +662,13 @@ config VMWARE_PVSCSI
+@@ -663,6 +663,13 @@ config VMWARE_PVSCSI
To compile this driver as a module, choose M here: the
module will be called vmw_pvscsi.
@@ -54,11 +39,9 @@
config LIBFC
tristate "LibFC module"
select SCSI_FC_ATTRS
-diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
-index 2b88749..e4c1a69 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
-@@ -142,6 +142,7 @@ obj-$(CONFIG_SCSI_BNX2_ISCSI) += libiscsi.o bnx2i/
+@@ -142,6 +142,7 @@ obj-$(CONFIG_SCSI_BNX2_ISCSI) += libiscs
obj-$(CONFIG_BE2ISCSI) += libiscsi.o be2iscsi/
obj-$(CONFIG_SCSI_PMCRAID) += pmcraid.o
obj-$(CONFIG_VMWARE_PVSCSI) += vmw_pvscsi.o
@@ -66,7 +49,7 @@
obj-$(CONFIG_ARM) += arm/
-@@ -170,6 +171,8 @@ scsi_mod-$(CONFIG_SCSI_PROC_FS) += scsi_proc.o
+@@ -170,6 +171,8 @@ scsi_mod-$(CONFIG_SCSI_PROC_FS) += scsi_
scsi_mod-y += scsi_trace.o
scsi_mod-$(CONFIG_PM) += scsi_pm.o
@@ -75,12 +58,9 @@
scsi_tgt-y += scsi_tgt_lib.o scsi_tgt_if.o
sd_mod-objs := sd.o
-diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
-new file mode 100644
-index 0000000..695ffc3
--- /dev/null
+++ b/drivers/scsi/storvsc_drv.c
-@@ -0,0 +1,1548 @@
+@@ -0,0 +1,1553 @@
+/*
+ * Copyright (c) 2009, Microsoft Corporation.
+ *
@@ -1294,7 +1274,12 @@
+ /*
+ * At this point, all outstanding requests in the adapter
+ * should have been flushed out and return to us
++ * There is a potential race here where the host may be in
++ * the process of responding when we return from here.
++ * Just wait for all in-transit packets to be accounted for
++ * before we return from here.
+ */
++ storvsc_wait_to_drain(stor_device);
+
+ return SUCCESS;
+}
@@ -1629,8 +1614,6 @@
+MODULE_DESCRIPTION("Microsoft Hyper-V virtual storage driver");
+module_init(storvsc_drv_init);
+module_exit(storvsc_drv_exit);
-diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
-index 25cdff3..ea57692 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -80,8 +80,6 @@ source "drivers/staging/vt6655/Kconfig"
@@ -1642,11 +1625,9 @@
source "drivers/staging/vme/Kconfig"
source "drivers/staging/sep/Kconfig"
-diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
-index a25f3f2..d9e474d 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
-@@ -31,7 +31,6 @@ obj-$(CONFIG_USB_SERIAL_QUATECH_USB2) += quatech_usb2/
+@@ -31,7 +31,6 @@ obj-$(CONFIG_USB_SERIAL_QUATECH_USB2) +=
obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
obj-$(CONFIG_VT6655) += vt6655/
obj-$(CONFIG_VT6656) += vt6656/
@@ -1654,9 +1635,6 @@
obj-$(CONFIG_VME_BUS) += vme/
obj-$(CONFIG_DX_SEP) += sep/
obj-$(CONFIG_IIO) += iio/
-diff --git a/drivers/staging/hv/Kconfig b/drivers/staging/hv/Kconfig
-deleted file mode 100644
-index 60ac479..0000000
--- a/drivers/staging/hv/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
@@ -1665,18 +1643,12 @@
- depends on HYPERV && SCSI
- help
- Select this option to enable the Hyper-V virtual storage driver.
-diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
-deleted file mode 100644
-index af95a6b..0000000
--- a/drivers/staging/hv/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o
-
-hv_storvsc-y := storvsc_drv.o
-diff --git a/drivers/staging/hv/TODO b/drivers/staging/hv/TODO
-deleted file mode 100644
-index dea7d92..0000000
--- a/drivers/staging/hv/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
@@ -1685,12 +1657,9 @@
-
-Please send patches for this code to Greg Kroah-Hartman <gregkh at suse.de>,
-Haiyang Zhang <haiyangz at microsoft.com>, and K. Y. Srinivasan <kys at microsoft.com>
-diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
-deleted file mode 100644
-index 695ffc3..0000000
--- a/drivers/staging/hv/storvsc_drv.c
+++ /dev/null
-@@ -1,1548 +0,0 @@
+@@ -1,1553 +0,0 @@
-/*
- * Copyright (c) 2009, Microsoft Corporation.
- *
@@ -2904,7 +2873,12 @@
- /*
- * At this point, all outstanding requests in the adapter
- * should have been flushed out and return to us
+- * There is a potential race here where the host may be in
+- * the process of responding when we return from here.
+- * Just wait for all in-transit packets to be accounted for
+- * before we return from here.
- */
+- storvsc_wait_to_drain(stor_device);
-
- return SUCCESS;
-}
@@ -3239,6 +3213,3 @@
-MODULE_DESCRIPTION("Microsoft Hyper-V virtual storage driver");
-module_init(storvsc_drv_init);
-module_exit(storvsc_drv_exit);
---
-1.7.9.5
-
Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series Thu Nov 1 05:03:05 2012 (r19474)
+++ dists/sid/linux/debian/patches/series Thu Nov 1 05:23:25 2012 (r19475)
@@ -399,14 +399,8 @@
features/arm/ahci-Add-JMicron-362-device-IDs.patch
bugfix/all/speakup-lower-default-software-speech-rate.patch
debian/perf-hide-abi-change-in-3.2.30.patch
-bugfix/all/SUNRPC-Set-alloc_slot-for-backchannel-tcp-ops.patch
debian/iwlwifi-do-not-request-unreleased-firmware.patch
debian/hid-avoid-ABI-change-in-3.2.31.patch
debian/xfrm-avoid-ABI-change-in-3.2.31.patch
-bugfix/x86/SCSI-storvsc-Account-for-in-transit-packets-in-the-R.patch
-bugfix/all/kernel-sys.c-fix-stack-memory-content-leak-via-UNAME.patch
bugfix/all/use-clamp_t-in-UNAME26-fix.patch
-bugfix/x86/ALSA-hda-Fix-oops-caused-by-recent-commit-Fix-intern.patch
debian/fs-writeback-avoid-ABI-change-in-3.2.32.patch
-e1000-fix-vlan-processing-regression.patch
-drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch
More information about the Kernel-svn-changes
mailing list