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 c431bcc5f84ac23857da47c44df8033979815d49..de3f788013d44a5eebfa075c50ba997bc70f228f 100644 (file)
--- 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 c431bcc5f84ac23857da47c44df8033979815d49..de3f788013d44a5eebfa075c50ba997bc70f228f 100644 (file)
--- 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 0764f79ae66b5b84fee157421a4933f19ceff172..36fadfa10413ca00be5aa27ea7a19c0c6f935268 100644 (file)
--- 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;
 +              }
        }