From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 28 Feb 2013 21:52:20 +0000 (-0800)
Subject: 3.4-stable patches
X-Git-Tag: v3.8.2~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48e8e7a43ed510e7eaadc3856902f32497d6e232;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	alsa-hda-hdmi-make-jacks-phantom-if-they-re-not-detectable.patch
	quota-autoload-the-quota_v2-module-for-qfmt_vfs_v1-quota-format.patch
---

diff --git a/queue-3.4/alsa-hda-hdmi-make-jacks-phantom-if-they-re-not-detectable.patch b/queue-3.4/alsa-hda-hdmi-make-jacks-phantom-if-they-re-not-detectable.patch
new file mode 100644
index 00000000000..4820f05b193
--- /dev/null
+++ b/queue-3.4/alsa-hda-hdmi-make-jacks-phantom-if-they-re-not-detectable.patch
@@ -0,0 +1,37 @@
+From 30efd8debd1ef30be342d374f01e993509f5b76b Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson@canonical.com>
+Date: Fri, 22 Feb 2013 10:16:28 +0100
+Subject: ALSA: hda - hdmi: Make jacks phantom, if they're not detectable
+
+From: David Henningsson <david.henningsson@canonical.com>
+
+commit 30efd8debd1ef30be342d374f01e993509f5b76b upstream.
+
+Just as for analog codecs, a jack that isn't suitable for detection
+(in this case, NO_PRESENCE was set) should be a phantom Jack
+instead of a normal one.
+
+Thanks to Raymond Yau for spotting.
+
+BugLink: https://bugs.launchpad.net/bugs/961286
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=903869
+Signed-off-by: David Henningsson <david.henningsson@canonical.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_hdmi.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -1244,6 +1244,9 @@ static int generic_hdmi_build_jack(struc
+ 
+ 	if (pcmdev > 0)
+ 		sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev);
++	if (!is_jack_detectable(codec, per_pin->pin_nid))
++		strncat(hdmi_str, " Phantom",
++			sizeof(hdmi_str) - strlen(hdmi_str) - 1);
+ 
+ 	return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0);
+ }
diff --git a/queue-3.4/quota-autoload-the-quota_v2-module-for-qfmt_vfs_v1-quota-format.patch b/queue-3.4/quota-autoload-the-quota_v2-module-for-qfmt_vfs_v1-quota-format.patch
new file mode 100644
index 00000000000..802b7c9c6b6
--- /dev/null
+++ b/queue-3.4/quota-autoload-the-quota_v2-module-for-qfmt_vfs_v1-quota-format.patch
@@ -0,0 +1,32 @@
+From c3ad83d9efdfe6a86efd44945a781f00c879b7b4 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Thu, 24 Jan 2013 23:24:56 -0500
+Subject: quota: autoload the quota_v2 module for QFMT_VFS_V1 quota format
+
+From: Theodore Ts'o <tytso@mit.edu>
+
+commit c3ad83d9efdfe6a86efd44945a781f00c879b7b4 upstream.
+
+Otherwise, ext4 file systems with the quota featured enable will get a
+very confusing "No such process" error message if the quota code is
+built as a module and the quota_v2 module has not been loaded.
+
+Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
+Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
+Acked-by: Jan Kara <jack@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/quota.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/include/linux/quota.h
++++ b/include/linux/quota.h
+@@ -417,6 +417,7 @@ struct quota_module_name {
+ #define INIT_QUOTA_MODULE_NAMES {\
+ 	{QFMT_VFS_OLD, "quota_v1"},\
+ 	{QFMT_VFS_V0, "quota_v2"},\
++	{QFMT_VFS_V1, "quota_v2"},\
+ 	{0, NULL}}
+ 
+ #endif /* __KERNEL__ */
diff --git a/queue-3.4/series b/queue-3.4/series
new file mode 100644
index 00000000000..1ae7ddb53d4
--- /dev/null
+++ b/queue-3.4/series
@@ -0,0 +1,2 @@
+alsa-hda-hdmi-make-jacks-phantom-if-they-re-not-detectable.patch
+quota-autoload-the-quota_v2-module-for-qfmt_vfs_v1-quota-format.patch