Update to 4.5-rc7

This commit is contained in:
Ben Hutchings 2016-03-07 03:05:13 +00:00
parent 62226211b4
commit 54a4358d99
2 changed files with 6 additions and 6 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
linux (4.5~rc6-1~exp1) UNRELEASED; urgency=medium
linux (4.5~rc7-1~exp1) UNRELEASED; urgency=medium
* New upstream release candidate

View File

@ -1537,7 +1537,7 @@ upstream submission.
else
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -1206,13 +1206,8 @@ static void iwl_req_fw_callback(const st
@@ -1208,13 +1208,8 @@ static void iwl_req_fw_callback(const st
if (!pieces)
return;
@ -1899,9 +1899,9 @@ upstream submission.
}
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -4009,10 +4009,8 @@ static ssize_t ipr_store_update_fw(struc
snprintf(fname, sizeof(fname), "%s", buf);
@@ -4014,10 +4014,8 @@ static ssize_t ipr_store_update_fw(struc
if (endline)
*endline = '\0';
- if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) {
- dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname);
@ -2533,7 +2533,7 @@ upstream submission.
filename, emu->firmware->size);
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1831,10 +1831,8 @@ static void azx_firmware_cb(const struct
@@ -1829,10 +1829,8 @@ static void azx_firmware_cb(const struct
struct azx *chip = card->private_data;
struct pci_dev *pci = chip->pci;