[kernel] r19721 - in dists/trunk/linux/debian: . patches patches/bugfix/all
Ben Hutchings
benh at alioth.debian.org
Sat Jan 12 00:38:41 UTC 2013
Author: benh
Date: Sat Jan 12 00:38:40 2013
New Revision: 19721
Log:
Update to 3.7.2
Deleted:
dists/trunk/linux/debian/patches/bugfix/all/ALSA-usb-audio-Avoid-autopm-calls-after-disconnectio.patch
dists/trunk/linux/debian/patches/bugfix/all/ALSA-usb-audio-Fix-missing-autopm-for-MIDI-input.patch
dists/trunk/linux/debian/patches/bugfix/all/exec-do-not-leave-bprm-interp-on-stack.patch
dists/trunk/linux/debian/patches/bugfix/all/hid-add-apple-wireless-keyboard-2011-ansi-to-special-driver-list.patch
Modified:
dists/trunk/linux/debian/changelog
dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
dists/trunk/linux/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch
dists/trunk/linux/debian/patches/series
Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog Tue Jan 8 03:27:57 2013 (r19720)
+++ dists/trunk/linux/debian/changelog Sat Jan 12 00:38:40 2013 (r19721)
@@ -1,4 +1,7 @@
-linux (3.7.1-1~experimental.3) UNRELEASED; urgency=low
+linux (3.7.2-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream stable update:
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.7.2
[ Ben Hutchings ]
* [ia64] nouveau: Disable another bit of ACPI support (fixes FTBFS)
Modified: dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch Tue Jan 8 03:27:57 2013 (r19720)
+++ dists/trunk/linux/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch Sat Jan 12 00:38:40 2013 (r19721)
@@ -1533,10 +1533,10 @@
hdr = (struct b43_fw_header *)(blob->data);
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
-@@ -1529,11 +1529,8 @@ static int do_request_fw(struct b43legac
- "b43legacy%s/%s.fw",
- modparam_fwpostfix, name);
- err = request_firmware(fw, path, dev->dev->dev);
+@@ -1554,11 +1554,8 @@ static int do_request_fw(struct b43legac
+ } else {
+ err = request_firmware(fw, path, dev->dev->dev);
+ }
- if (err) {
- b43legacyerr(dev->wl, "Firmware file \"%s\" not found "
- "or load failed.\n", path);
@@ -1794,7 +1794,7 @@
if (ret) {
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
-@@ -931,7 +931,6 @@ static void p54u_load_firmware_cb(const
+@@ -935,7 +935,6 @@ static void p54u_load_firmware_cb(const
err = p54u_start_ops(priv);
} else {
err = -ENOENT;
@@ -2747,7 +2747,7 @@
/* The FPGA is a Xilinx Spartan IIE XC2S50E */
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
-@@ -3280,10 +3280,8 @@ static void azx_firmware_cb(const struct
+@@ -3289,10 +3289,8 @@ static void azx_firmware_cb(const struct
struct azx *chip = card->private_data;
struct pci_dev *pci = chip->pci;
Modified: dists/trunk/linux/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch Tue Jan 8 03:27:57 2013 (r19720)
+++ dists/trunk/linux/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch Sat Jan 12 00:38:40 2013 (r19721)
@@ -19,7 +19,7 @@
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
-@@ -500,14 +500,23 @@ static ssize_t firmware_loading_store(st
+@@ -502,14 +502,23 @@ static ssize_t firmware_loading_store(st
* is completed.
* */
fw_map_pages_buf(fw_buf);
@@ -45,17 +45,17 @@
fw_load_abort(fw_priv);
break;
}
-@@ -671,6 +680,9 @@ static void firmware_class_timeout(u_lon
- {
- struct firmware_priv *fw_priv = (struct firmware_priv *) data;
-
+@@ -679,6 +688,9 @@ static void firmware_class_timeout_work(
+ mutex_unlock(&fw_lock);
+ return;
+ }
+ dev_err(fw_priv->dev.parent,
+ "firmware: agent did not handle request for %s\n",
+ fw_priv->buf->fw_id);
fw_load_abort(fw_priv);
+ mutex_unlock(&fw_lock);
}
-
-@@ -798,7 +810,8 @@ _request_firmware_prepare(const struct f
+@@ -807,7 +819,8 @@ _request_firmware_prepare(const struct f
}
if (fw_get_builtin_firmware(firmware, name)) {
@@ -65,7 +65,7 @@
return NULL;
}
-@@ -874,25 +887,28 @@ static int _request_firmware_load(struct
+@@ -885,25 +898,28 @@ static int _request_firmware_load(struct
retval = device_add(f_dev);
if (retval) {
@@ -96,9 +96,9 @@
- dev_dbg(f_dev, "firmware: requesting %s\n", buf->fw_id);
+ dev_dbg(f_dev->parent, "firmware: requesting %s\n", buf->fw_id);
if (timeout != MAX_SCHEDULE_TIMEOUT)
- mod_timer(&fw_priv->timeout,
- round_jiffies_up(jiffies + timeout));
-@@ -906,8 +922,15 @@ static int _request_firmware_load(struct
+ schedule_delayed_work(&fw_priv->timeout_work, timeout);
+
+@@ -916,8 +932,15 @@ static int _request_firmware_load(struct
handle_fw:
mutex_lock(&fw_lock);
@@ -115,7 +115,7 @@
/*
* add firmware name into devres list so that we can auto cache
-@@ -986,6 +1009,9 @@ request_firmware(const struct firmware *
+@@ -996,6 +1019,9 @@ request_firmware(const struct firmware *
}
if (ret)
_request_firmware_cleanup(firmware_p);
@@ -125,7 +125,7 @@
return ret;
}
-@@ -1035,7 +1061,7 @@ static void request_firmware_work_func(s
+@@ -1045,7 +1071,7 @@ static void request_firmware_work_func(s
ret = _request_firmware_load(fw_priv, fw_work->uevent, timeout);
usermodehelper_read_unlock();
} else {
Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series Tue Jan 8 03:27:57 2013 (r19720)
+++ dists/trunk/linux/debian/patches/series Sat Jan 12 00:38:40 2013 (r19721)
@@ -44,7 +44,6 @@
debian/iwlwifi-do-not-request-unreleased-firmware.patch
debian/cirrus-disable-modeset-by-default.patch
debian/fs-enable-link-security-restrictions-by-default.patch
-bugfix/all/hid-add-apple-wireless-keyboard-2011-ansi-to-special-driver-list.patch
bugfix/arm/lis3l02dq-fix-building-without-irq-to-gpio.patch
bugfix/arm/omap-musb-choice.patch
bugfix/x86/asus-laptop-Do-not-call-HWRS-on-init.patch
@@ -57,7 +56,6 @@
bugfix/all/firmware_class-log-every-success-and-failure.patch
bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
-bugfix/all/exec-do-not-leave-bprm-interp-on-stack.patch
bugfix/all/exec-use-ELOOP-for-max-recursion-depth.patch
bugfix/all/megaraid_sas-fix-memory-leak-if-SGL-has-zero-length-entries.patch
bugfix/all/pps-ptp-Remove-dependencies-on-EXPERIMENTAL.patch
@@ -70,5 +68,3 @@
debian/mgag200-disable-autoload.patch
clean-modules-without-link-vmlinux.sh.patch
bugfix/all/ath6kl-do-not-use-virt_addr_valid.patch
-bugfix/all/ALSA-usb-audio-Avoid-autopm-calls-after-disconnectio.patch
-bugfix/all/ALSA-usb-audio-Fix-missing-autopm-for-MIDI-input.patch
More information about the Kernel-svn-changes
mailing list