[kernel] r19047 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/bugfix/s390 patches/bugfix/x86 patches/debian patches/features/all/rt patches/features/all/wacom patches/series
Ben Hutchings
benh at alioth.debian.org
Thu May 31 03:08:13 UTC 2012
Author: benh
Date: Thu May 31 03:08:09 2012
New Revision: 19047
Log:
Update to 3.2.19
Drop patches included in it.
Defer an ABI change in mmc for now.
For the PREEMPT_RT featureset, revert one conflicting change in 3.2.19.
Added:
dists/sid/linux-2.6/debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch
dists/sid/linux-2.6/debian/patches/features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch
Deleted:
dists/sid/linux-2.6/debian/patches/bugfix/all/ethtool-null-terminate-filename-passed-to.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/kvm-ensure-all-vcpus-are-consistent-with-in-kernel-irqchip.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/kvm-lock-slots_lock-around-device-assignment.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/kvm-mmu_notifier-flush-tlbs-before-releasing-mmu_lock.patch
dists/sid/linux-2.6/debian/patches/bugfix/s390/kvm-s390-do-store-status-after-handling-stop_on_stop-bit.patch
dists/sid/linux-2.6/debian/patches/bugfix/s390/kvm-s390-sanitize-fpc-registers-for-kvm_set_fpu.patch
dists/sid/linux-2.6/debian/patches/bugfix/x86/kvm-nvmx-fix-erroneous-exception-bitmap-check.patch
dists/sid/linux-2.6/debian/patches/bugfix/x86/kvm-vmx-vmx_set_cr0-expects-kvm-srcu-locked.patch
dists/sid/linux-2.6/debian/patches/features/all/wacom/0004-Input-wacom-relax-Bamboo-stylus-ID-check.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/series/base
dists/sid/linux-2.6/debian/patches/series/base-extra
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Wed May 30 13:46:01 2012 (r19046)
+++ dists/sid/linux-2.6/debian/changelog Thu May 31 03:08:09 2012 (r19047)
@@ -1,4 +1,22 @@
-linux-2.6 (3.2.18-2) UNRELEASED; urgency=low
+linux-2.6 (3.2.19-1) UNRELEASED; urgency=low
+
+ * New upstream stable update:
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.19
+ - hpsa: Fix problem with MSA2xxx devices (Closes: #661057)
+ - IB/core: Fix mismatch between locked and pinned pages
+ - iommu: Fix off by one in dmar_get_fault_reason()
+ - vfs: make AIO use the proper rw_verify_area() area helpers
+ - HID: logitech: read all 32 bits of report type bitfield (Closes: #671292)
+ - USB: Remove races in devio.c
+ - ext{3,4}: Fix error handling on inode bitmap corruption
+ - uvcvideo: Fix ENUMINPUT handling
+ - dl2k: Clean up rio_ioctl (CVE-2012-2313)
+ - [x86] MCE: Fix vm86 handling for 32bit mce handler
+ - [x86] mce: Fix check for processor context when machine check was taken.
+ - ethtool: Null-terminate filename passed to ethtool_ops::flash_device
+ - NFSv4: Fix buffer overflows in ACL support (CVE-2012-2375)
+ + Avoid reading past buffer when calling GETACL
+ + Avoid beyond bounds copy while caching ACL
[ Ben Hutchings ]
* be2net: Backport most changes up to Linux 3.5-rc1, thanks to
Added: dists/sid/linux-2.6/debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/mmc-Avoid-ABI-change-in-3.2.19.patch Thu May 31 03:08:09 2012 (r19047)
@@ -0,0 +1,34 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 31 May 2012 04:04:55 +0100
+Subject: [PATCH] mmc: Avoid ABI change in 3.2.19
+
+---
+ include/linux/mmc/host.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
+index deb6282..20caeb0 100644
+--- a/include/linux/mmc/host.h
++++ b/include/linux/mmc/host.h
+@@ -303,7 +303,6 @@ struct mmc_host {
+
+ unsigned int sdio_irqs;
+ struct task_struct *sdio_irq_thread;
+- bool sdio_irq_pending;
+ atomic_t sdio_irq_thread_abort;
+
+ mmc_pm_flag_t pm_flags; /* requested pm features */
+@@ -315,6 +314,10 @@ struct mmc_host {
+ #ifdef CONFIG_REGULATOR
+ bool regulator_enabled; /* regulator state */
+ #endif
++#if !(defined(__GENKSYMS__) && defined(CONFIG_REGULATOR))
++ /* Use the hole after regulator_enabled to avoid an ABI change */
++ bool sdio_irq_pending;
++#endif
+
+ struct dentry *debugfs_root;
+
+--
+1.7.10
+
Added: dists/sid/linux-2.6/debian/patches/features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch Thu May 31 03:08:09 2012 (r19047)
@@ -0,0 +1,35 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 31 May 2012 02:58:44 +0100
+Subject: [PATCH] Revert "workqueue: skip nr_running sanity check in
+ worker_enter_idle() if trustee is active"
+
+This reverts commit 5d79c6f64a904afc92a329f80abe693e3ae105fe.
+It conflicts with, and appears to be unnecessary for, the PREEMPT_RT
+series.
+---
+ kernel/workqueue.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/kernel/workqueue.c b/kernel/workqueue.c
+index 7947e16..bb425b1 100644
+--- a/kernel/workqueue.c
++++ b/kernel/workqueue.c
+@@ -1215,13 +1215,8 @@ static void worker_enter_idle(struct worker *worker)
+ } else
+ wake_up_all(&gcwq->trustee_wait);
+
+- /*
+- * Sanity check nr_running. Because trustee releases gcwq->lock
+- * between setting %WORKER_ROGUE and zapping nr_running, the
+- * warning may trigger spuriously. Check iff trustee is idle.
+- */
+- WARN_ON_ONCE(gcwq->trustee_state == TRUSTEE_DONE &&
+- gcwq->nr_workers == gcwq->nr_idle &&
++ /* sanity check nr_running */
++ WARN_ON_ONCE(gcwq->nr_workers == gcwq->nr_idle &&
+ atomic_read(get_gcwq_nr_running(gcwq->cpu)));
+ }
+
+--
+1.7.10
+
Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base Wed May 30 13:46:01 2012 (r19046)
+++ dists/sid/linux-2.6/debian/patches/series/base Thu May 31 03:08:09 2012 (r19047)
@@ -189,23 +189,14 @@
+ debian/skbuff-avoid-ABI-change-in-3.2.17.patch
+ debian/usb-hcd-avoid-ABI-change-in-3.2.17.patch
+ debian/fork-avoid-ABI-change-in-3.2.18.patch
++ debian/mmc-Avoid-ABI-change-in-3.2.19.patch
+ bugfix/all/ext4-Report-max_batch_time-option-correctly.patch
-# KVM fixes queued for 3.2.19
-+ bugfix/all/kvm-mmu_notifier-flush-tlbs-before-releasing-mmu_lock.patch
-+ bugfix/all/kvm-ensure-all-vcpus-are-consistent-with-in-kernel-irqchip.patch
-+ bugfix/all/kvm-lock-slots_lock-around-device-assignment.patch
-+ bugfix/x86/kvm-nvmx-fix-erroneous-exception-bitmap-check.patch
-+ bugfix/x86/kvm-vmx-vmx_set_cr0-expects-kvm-srcu-locked.patch
-+ bugfix/s390/kvm-s390-do-store-status-after-handling-stop_on_stop-bit.patch
-+ bugfix/s390/kvm-s390-sanitize-fpc-registers-for-kvm_set_fpu.patch
-
# Update wacom driver to 3.5ish
+ features/all/wacom/0001-Input-wacom-cleanup-feature-report-for-bamboos.patch
+ features/all/wacom/0002-Input-wacom-remove-unused-bamboo-HID-parsing.patch
+ features/all/wacom/0003-Input-wacom-add-some-comments-to-wacom_parse_hid.patch
-+ features/all/wacom/0004-Input-wacom-relax-Bamboo-stylus-ID-check.patch
+ features/all/wacom/0005-Input-wacom-read-3rd-gen-Bamboo-Touch-HID-data.patch
+ features/all/wacom/0006-Input-wacom-3rd-gen-Bamboo-P-Touch-packet-support.patch
+ features/all/wacom/0007-Input-wacom-ignore-unwanted-bamboo-packets.patch
@@ -234,7 +225,6 @@
+ features/all/rt2x00-add-rt5372-chipset-support.patch
+ bugfix/all/acpi-battery-only-refresh-the-sysfs-files-when-pertinent.patch
-+ bugfix/all/ethtool-null-terminate-filename-passed-to.patch
# Update be2net driver to 3.5ish
+ features/all/be2net/0001-sweep-the-floors-and-convert-some-.get_drvinfo-routi.patch
Modified: dists/sid/linux-2.6/debian/patches/series/base-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base-extra Wed May 30 13:46:01 2012 (r19046)
+++ dists/sid/linux-2.6/debian/patches/series/base-extra Thu May 31 03:08:09 2012 (r19047)
@@ -222,6 +222,7 @@
+ features/all/rt/0223-workqueue-use-get-cpu-light.patch.patch featureset=rt
+ features/all/rt/0224-epoll.patch.patch featureset=rt
+ features/all/rt/0225-mm-vmalloc.patch.patch featureset=rt
++ features/all/rt/revert-workqueue-skip-nr_running-sanity-check-in-wor.patch featureset=rt
+ features/all/rt/0226-workqueue-Fix-cpuhotplug-trainwreck.patch featureset=rt
+ features/all/rt/0227-workqueue-Fix-PF_THREAD_BOUND-abuse.patch featureset=rt
+ features/all/rt/0228-workqueue-Use-get_cpu_light-in-flush_gcwq.patch featureset=rt
More information about the Kernel-svn-changes
mailing list