From fcd30b7c12966a1d9f7159d2df518f2330f2bae1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 19 Jul 2013 16:56:45 -0700 Subject: [PATCH] lots of little fixes for quilt and to fix build issues --- ...xtended-sleep-registers-unless-hw-reduced-bit-is-set.patch | 2 +- ...xtended-sleep-registers-unless-hw-reduced-bit-is-set.patch | 2 +- .../cifs-use-sensible-file-nlink-values-if-unprovided.patch | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 References: https://bugzilla.kernel.org/show_bug.cgi?id=54181 References: https://bugs.acpica.org/show_bug.cgi?id=1020 -Reported-by: Daniel Rowe Bisected-by: Brint E. Kriebel Signed-off-by: Lv Zheng Signed-off-by: Bob Moore 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 References: https://bugzilla.kernel.org/show_bug.cgi?id=54181 References: https://bugs.acpica.org/show_bug.cgi?id=1020 -Reported-by: Daniel Rowe Bisected-by: Brint E. Kriebel Signed-off-by: Lv Zheng Signed-off-by: Bob Moore 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 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; + } } -- 2.47.3