From caf67e0739a737bcfdfbde505664f2880c79b5ed Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mar 22 2016 22:01:56 +0000 Subject: Linux v4.5-11312-g01cde1538e1d - nfs, overlayfs, fuse, xen, i2c, target, pci, sound, iommu merges --- diff --git a/ALSA-hda-Fix-forgotten-HDMI-monitor_present-update.patch b/ALSA-hda-Fix-forgotten-HDMI-monitor_present-update.patch deleted file mode 100644 index 892cd5b..0000000 --- a/ALSA-hda-Fix-forgotten-HDMI-monitor_present-update.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e36b3efcd07ab5c323e82319577d972ebddcbed1 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Fri, 18 Mar 2016 18:01:53 +0100 -Subject: [PATCH 2/3] ALSA: hda - Fix forgotten HDMI monitor_present update - -We forgot to copy monitor_present value when updating the ELD -information. This won't change the ELD retrieval and the jack -notification behavior, but appears only in the proc output. In that -sense, it's no fatal error, but a bug is a bug is a bug. - -Cc: -Signed-off-by: Takashi Iwai ---- - sound/pci/hda/patch_hdmi.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index 8cdb804aa9cf..e7d9453ecd10 100644 ---- a/sound/pci/hda/patch_hdmi.c -+++ b/sound/pci/hda/patch_hdmi.c -@@ -1358,6 +1358,7 @@ static void update_eld(struct hda_codec *codec, - eld->eld_size) != 0) - eld_changed = true; - -+ pin_eld->monitor_present = eld->monitor_present; - pin_eld->eld_valid = eld->eld_valid; - pin_eld->eld_size = eld->eld_size; - if (eld->eld_valid) --- -2.5.0 - diff --git a/ALSA-hda-Fix-spurious-kernel-WARNING-on-Baytrail-HDM.patch b/ALSA-hda-Fix-spurious-kernel-WARNING-on-Baytrail-HDM.patch deleted file mode 100644 index 5c9bda8..0000000 --- a/ALSA-hda-Fix-spurious-kernel-WARNING-on-Baytrail-HDM.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1f2109de8368f08a353d7862f462b943a5ac4b4a Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Fri, 18 Mar 2016 19:45:13 +0100 -Subject: [PATCH 3/3] ALSA: hda - Fix spurious kernel WARNING on Baytrail HDMI -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -snd_hdac_sync_audio_rate() call is mandatory only for HSW and later -models, but we call the function unconditionally blindly assuming that -the function doesn't do anything harmful. But since recently, the -function checks the validity of the passed pin NID, and eventually -spews the warning if an unexpected pin is passed. This is seen on old -chips like Baytrail. - -The fix is to limit the call of this function again only for the chips -with the proper binding. This can be identified by the same flag as -the eld notifier. - -Reported-by: Ville Syrjälä -Tested-by: Ville Syrjälä -Cc: # v4.5 -Signed-off-by: Takashi Iwai ---- - sound/pci/hda/patch_hdmi.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index e7d9453ecd10..56d3575ee6cc 100644 ---- a/sound/pci/hda/patch_hdmi.c -+++ b/sound/pci/hda/patch_hdmi.c -@@ -1741,7 +1741,8 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo, - - /* Call sync_audio_rate to set the N/CTS/M manually if necessary */ - /* Todo: add DP1.2 MST audio support later */ -- snd_hdac_sync_audio_rate(&codec->bus->core, pin_nid, runtime->rate); -+ if (codec_has_acomp(codec)) -+ snd_hdac_sync_audio_rate(&codec->bus->core, pin_nid, runtime->rate); - - non_pcm = check_non_pcm_per_cvt(codec, cvt_nid); - mutex_lock(&per_pin->lock); --- -2.5.0 - diff --git a/ALSA-hda-Really-restrict-i915-notifier-to-HSW.patch b/ALSA-hda-Really-restrict-i915-notifier-to-HSW.patch deleted file mode 100644 index 2224e7f..0000000 --- a/ALSA-hda-Really-restrict-i915-notifier-to-HSW.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 3fb329b2c3b6c2f009aa1255d2436ec49e49877f Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Fri, 18 Mar 2016 15:10:08 +0100 -Subject: [PATCH 1/3] ALSA: hda - Really restrict i915 notifier to HSW+ -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The commit [b62232d429fa: ALSA: hda - Limit i915 HDMI binding only for -HSW and later] tried to limit the usage of i915 audio notifier to the -recent Intel models and switch to the old method on pre-Haswell -models. However, it assumed that the i915 component binding hasn't -been done on such models, and the assumption was wrong: namely, -Baytrail had already the i915 component binding due to powerwell -control. Thus, the workaround wasn't applied to Baytrail. - -For fixing this properly, this patch introduces a new flag indicating -the usage of audio notifier and codec_has_acomp() refers to this flag -instead of checking the existence of audio component. - -Reported-by: Ville Syrjälä -Cc: # v4.5 -Signed-off-by: Takashi Iwai ---- - sound/pci/hda/patch_hdmi.c | 24 +++++++++++++++++------- - 1 file changed, 17 insertions(+), 7 deletions(-) - -diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index 49ee4e55dd16..8cdb804aa9cf 100644 ---- a/sound/pci/hda/patch_hdmi.c -+++ b/sound/pci/hda/patch_hdmi.c -@@ -152,6 +152,7 @@ struct hdmi_spec { - struct hda_pcm_stream pcm_playback; - - /* i915/powerwell (Haswell+/Valleyview+) specific */ -+ bool use_acomp_notifier; /* use i915 eld_notify callback for hotplug */ - struct i915_audio_component_audio_ops i915_audio_ops; - bool i915_bound; /* was i915 bound in this driver? */ - -@@ -159,8 +160,11 @@ struct hdmi_spec { - }; - - #ifdef CONFIG_SND_HDA_I915 --#define codec_has_acomp(codec) \ -- ((codec)->bus->core.audio_component != NULL) -+static inline bool codec_has_acomp(struct hda_codec *codec) -+{ -+ struct hdmi_spec *spec = codec->spec; -+ return spec->use_acomp_notifier; -+} - #else - #define codec_has_acomp(codec) false - #endif -@@ -2248,12 +2252,18 @@ static int patch_generic_hdmi(struct hda_codec *codec) - codec->spec = spec; - hdmi_array_init(spec, 4); - -+#ifdef CONFIG_SND_HDA_I915 - /* Try to bind with i915 for Intel HSW+ codecs (if not done yet) */ -- if (!codec_has_acomp(codec) && -- (codec->core.vendor_id >> 16) == 0x8086 && -- is_haswell_plus(codec)) -- if (!snd_hdac_i915_init(&codec->bus->core)) -- spec->i915_bound = true; -+ if ((codec->core.vendor_id >> 16) == 0x8086 && -+ is_haswell_plus(codec)) { -+ if (!codec->bus->core.audio_component) -+ if (!snd_hdac_i915_init(&codec->bus->core)) -+ spec->i915_bound = true; -+ /* use i915 audio component notifier for hotplug */ -+ if (codec->bus->core.audio_component) -+ spec->use_acomp_notifier = true; -+ } -+#endif - - if (is_haswell_plus(codec)) { - intel_haswell_enable_all_pins(codec, true); --- -2.5.0 - diff --git a/config-arm-generic b/config-arm-generic index eb9af25..035e5c4 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -42,6 +42,8 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_ARM_PMU=y +# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set + # ARM AMBA generic HW CONFIG_ARM_AMBA=y CONFIG_KERNEL_MODE_NEON=y diff --git a/config-generic b/config-generic index 85d0d97..ba36529 100644 --- a/config-generic +++ b/config-generic @@ -109,6 +109,7 @@ CONFIG_PCIE_ECRC=y CONFIG_PCIEAER_INJECT=m CONFIG_HOTPLUG_PCI=y # CONFIG_HOTPLUG_PCI_CPCI is not set +# CONFIG_HOTPLUG_PCI_SHPC is not set CONFIG_HOTPLUG_PCI_PCIE=y # CONFIG_PCIE_DW_PLAT is not set @@ -2694,6 +2695,7 @@ CONFIG_I2C_CHARDEV=m # CONFIG_I2C_MUX_PCA9541 is not set # CONFIG_I2C_MUX_PINCTRL is not set # CONFIG_I2C_MUX_REG is not set +# CONFIG_I2C_DEMUX_PINCTRL is not set # CONFIG_I2C_CADENCE is not set # diff --git a/gitrev b/gitrev index 0d8eec6..8b3a3b4 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -968f3e374faf41e5e6049399eb7302777a09a1e8 +01cde1538e1dff4254e340f606177a870131a01f diff --git a/kernel.spec b/kernel.spec index b736df3..8fd7f91 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 19 +%define gitrev 20 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -625,10 +625,6 @@ Patch677: digi_acceleport-do-sanity-checking-for-the-number-of.patch Patch678: ims-pcu-sanity-check-against-missing-interfaces.patch -Patch680: ALSA-hda-Really-restrict-i915-notifier-to-HSW.patch -Patch681: ALSA-hda-Fix-forgotten-HDMI-monitor_present-update.patch -Patch682: ALSA-hda-Fix-spurious-kernel-WARNING-on-Baytrail-HDM.patch - #rhbz 1315013 Patch683: 0001-uas-Limit-qdepth-at-the-scsi-host-level.patch @@ -2166,6 +2162,10 @@ fi # # %changelog +* Tue Mar 22 2016 Josh Boyer - 4.6.0-0.rc0.git20.1 +- Linux v4.5-11312-g01cde1538e1d +- nfs, overlayfs, fuse, xen, i2c, target, pci, sound, iommu merges + * Tue Mar 22 2016 Josh Boyer - CVE-2016-3136 mct_u232: oops on invalid USB descriptors (rhbz 1317007 1317010) - CVE-2016-2187 gtco: oops on invalid USB descriptors (rhbz 1317017 1317010) diff --git a/sources b/sources index 1e72eb6..483d4a4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz 6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz -3b981326c3ee3dd9956dc8f024544338 patch-4.5-git19.xz +7a533068cda79a2a7a54404db0c745d5 patch-4.5-git20.xz