From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 19 Jul 2013 23:56:45 +0000 (-0700)
Subject: lots of little fixes for quilt and to fix build issues
X-Git-Tag: v3.9.11~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcd30b7c12966a1d9f7159d2df518f2330f2bae1;p=thirdparty%2Fkernel%2Fstable-queue.git

lots of little fixes for quilt and to fix build issues
---

diff --git a/queue-3.10/acpica-do-not-use-extended-sleep-registers-unless-hw-reduced-bit-is-set.patch b/queue-3.10/acpica-do-not-use-extended-sleep-registers-unless-hw-reduced-bit-is-set.patch
index c431bcc5f84..de3f788013d 100644
--- a/queue-3.10/acpica-do-not-use-extended-sleep-registers-unless-hw-reduced-bit-is-set.patch
+++ b/queue-3.10/acpica-do-not-use-extended-sleep-registers-unless-hw-reduced-bit-is-set.patch
@@ -13,9 +13,9 @@ problems on some non-HW-reduced machines. As per the ACPI spec,
 they should only be used if the HW-reduced bit is set.  Lv Zheng,
 ACPICA BZ 1020.
 
+Reported-by: Daniel Rowe <bart@fathom13.com>
 References: https://bugzilla.kernel.org/show_bug.cgi?id=54181
 References: https://bugs.acpica.org/show_bug.cgi?id=1020
-Reported-by: Daniel Rowe <bart@fathom13.com>
 Bisected-by: Brint E. Kriebel <kernel@bekit.net>
 Signed-off-by: Lv Zheng <lv.zheng@intel.com>
 Signed-off-by: Bob Moore <robert.moore@intel.com>
diff --git a/queue-3.9/acpica-do-not-use-extended-sleep-registers-unless-hw-reduced-bit-is-set.patch b/queue-3.9/acpica-do-not-use-extended-sleep-registers-unless-hw-reduced-bit-is-set.patch
index c431bcc5f84..de3f788013d 100644
--- a/queue-3.9/acpica-do-not-use-extended-sleep-registers-unless-hw-reduced-bit-is-set.patch
+++ b/queue-3.9/acpica-do-not-use-extended-sleep-registers-unless-hw-reduced-bit-is-set.patch
@@ -13,9 +13,9 @@ problems on some non-HW-reduced machines. As per the ACPI spec,
 they should only be used if the HW-reduced bit is set.  Lv Zheng,
 ACPICA BZ 1020.
 
+Reported-by: Daniel Rowe <bart@fathom13.com>
 References: https://bugzilla.kernel.org/show_bug.cgi?id=54181
 References: https://bugs.acpica.org/show_bug.cgi?id=1020
-Reported-by: Daniel Rowe <bart@fathom13.com>
 Bisected-by: Brint E. Kriebel <kernel@bekit.net>
 Signed-off-by: Lv Zheng <lv.zheng@intel.com>
 Signed-off-by: Bob Moore <robert.moore@intel.com>
diff --git a/queue-3.9/cifs-use-sensible-file-nlink-values-if-unprovided.patch b/queue-3.9/cifs-use-sensible-file-nlink-values-if-unprovided.patch
index 0764f79ae66..36fadfa1041 100644
--- a/queue-3.9/cifs-use-sensible-file-nlink-values-if-unprovided.patch
+++ b/queue-3.9/cifs-use-sensible-file-nlink-values-if-unprovided.patch
@@ -30,8 +30,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  		fattr->cf_nlink = le32_to_cpu(info->NumberOfLinks);
 +		if (fattr->cf_nlink < 1) {
-+			cifs_dbg(1, "replacing bogus file nlink value %u\n",
-+				fattr->cf_nlink);
++			cFYI(1, "replacing bogus file nlink value %u\n",
++			     fattr->cf_nlink);
 +			fattr->cf_nlink = 1;
 +		}
  	}