[linux] 01/01: Update to 4.5-rc7

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 54a4358d990371644ef50d60da0fe97d9ba9a847
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Mar 7 03:05:13 2016 +0000

    Update to 4.5-rc7
---
 debian/changelog                                               |  2 +-
 .../firmware-remove-redundant-log-messages-from-drivers.patch  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24ef89c..f285fc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
diff --git a/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch b/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
index 2e2ffa4..106886f 100644
--- a/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
+++ b/debian/patches/bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch
@@ -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;
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git