Merge remote-tracking branch 'origin/master'

14 files changed, 227 insertions, 113 deletions

diff --git a/0001-Input-synaptics-handle-spurious-release-of-trackstic.patch b/0001-Input-synaptics-handle-spurious-release-of-trackstic.patch
new file mode 100644
index 000000000..52b082b36
--- /dev/null
+++ b/0001-Input-synaptics-handle-spurious-release-of-trackstic.patch
@@ -0,0 +1,31 @@
+From cb6fcfe5a7e9197ceb7e9eec56e9c526e4e76354 Mon Sep 17 00:00:00 2001
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Date: Mon, 14 Mar 2016 19:37:12 +0100
+Subject: [PATCH] Input: synaptics - handle spurious release of trackstick
+ buttons, again
+
+Looks like the fimware 8.2 stall has the extra buttons spurious release
+bug.
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+---
+ drivers/input/mouse/synaptics.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index 6025eb4..4ef8d7a 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -863,7 +863,8 @@ static void synaptics_report_ext_buttons(struct psmouse *psmouse,
+ 		return;
+ 
+ 	/* Bug in FW 8.1, buttons are reported only when ExtBit is 1 */
+-	if (SYN_ID_FULL(priv->identity) == 0x801 &&
++	if ((SYN_ID_FULL(priv->identity) == 0x801 ||
++	     SYN_ID_FULL(priv->identity) == 0x802) &&
+ 	    !((psmouse->packet[0] ^ psmouse->packet[3]) & 0x02))
+ 		return;
+ 
+-- 
+2.5.0
+
diff --git a/0001-uas-Limit-qdepth-at-the-scsi-host-level.patch b/0001-uas-Limit-qdepth-at-the-scsi-host-level.patch
new file mode 100644
index 000000000..b6c446829
--- /dev/null
+++ b/0001-uas-Limit-qdepth-at-the-scsi-host-level.patch
@@ -0,0 +1,45 @@
+From 79abe2bd501d628b165f323098d6972d69bd13d7 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 16 Mar 2016 13:20:51 +0100
+Subject: [PATCH] uas: Limit qdepth at the scsi-host level
+
+Commit 64d513ac31bd ("scsi: use host wide tags by default") causes
+the scsi-core to queue more cmnds then we can handle on devices with
+multiple LUNs, limit the qdepth at the scsi-host level instead of
+per slave to fix this.
+
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1315013
+Cc: stable@vger.kernel.org # 4.4.x and 4.5.x
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/usb/storage/uas.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
+index c90a7e4..b5cb7ab 100644
+--- a/drivers/usb/storage/uas.c
++++ b/drivers/usb/storage/uas.c
+@@ -800,7 +800,6 @@ static int uas_slave_configure(struct scsi_device *sdev)
+ 	if (devinfo->flags & US_FL_BROKEN_FUA)
+ 		sdev->broken_fua = 1;
+ 
+-	scsi_change_queue_depth(sdev, devinfo->qdepth - 2);
+ 	return 0;
+ }
+ 
+@@ -932,6 +931,12 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id)
+ 	if (result)
+ 		goto set_alt0;
+ 
++	/*
++	 * 1 tag is reserved for untagged commands +
++	 * 1 tag to avoid of by one errors in some bridge firmwares
++	 */
++	shost->can_queue = devinfo->qdepth - 2;
++
+ 	usb_set_intfdata(intf, shost);
+ 	result = scsi_add_host(shost, &intf->dev);
+ 	if (result)
+-- 
+2.7.3
+
diff --git a/ARM-mvebu-change-order-of-ethernet-DT-nodes-on-Armada-38x.patch b/ARM-mvebu-change-order-of-ethernet-DT-nodes-on-Armada-38x.patch
deleted file mode 100644
index cff3d3339..000000000
--- a/ARM-mvebu-change-order-of-ethernet-DT-nodes-on-Armada-38x.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From patchwork Wed Jan 27 15:08:19 2016
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [1/2] ARM: mvebu: change order of ethernet DT nodes on Armada 38x
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-X-Patchwork-Id: 8134751
-Message-Id: <1453907300-28283-2-git-send-email-thomas.petazzoni@free-electrons.com>
-To: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
-	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
-	Gregory Clement <gregory.clement@free-electrons.com>
-Cc: Nadav Haklai <nadavh@marvell.com>, Lior Amsalem <alior@marvell.com>,
-	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
-	linux-arm-kernel@lists.infradead.org
-Date: Wed, 27 Jan 2016 16:08:19 +0100
-
-On Armada 38x, the available network interfaces are:
-
- - port 0, at 0x70000
- - port 1, at 0x30000
- - port 2, at 0x34000
-
-Due to the rule saying that DT nodes should be ordered by register
-addresses, the network interfaces are probed in this order:
-
- - port 1, at 0x30000, which gets named eth0
- - port 2, at 0x34000, which gets named eth1
- - port 0, at 0x70000, which gets named eth2
-
-(if all three ports are enabled at the board level)
-
-Unfortunately, the network subsystem doesn't provide any way to rename
-network interfaces from the kernel (it can only be done from
-userspace). So, the default naming of the network interfaces is very
-confusing as it doesn't match the datasheet, nor the naming of the
-interfaces in the bootloader, nor the naming of the interfaces on
-labels printed on the board.
-
-For example, on the Armada 388 GP, the board has two ports, labelled
-GE0 and GE1. One has to know that GE0 is eth1 and GE1 is eth0, which
-isn't really obvious.
-
-In order to solve this, this patch proposes to exceptionaly violate
-the rule of "order DT nodes by register address", and put the 0x70000
-node before the 0x30000 node, so that network interfaces get named in
-a more natural way.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
----
-arch/arm/boot/dts/armada-38x.dtsi | 30 +++++++++++++++++++++---------
- 1 file changed, 21 insertions(+), 9 deletions(-)
-
-diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
-index e8b7f67..b50784d 100644
---- a/arch/arm/boot/dts/armada-38x.dtsi
-+++ b/arch/arm/boot/dts/armada-38x.dtsi
-@@ -429,6 +429,27 @@
- 				reg = <0x22000 0x1000>;
- 			};
- 
-+			/*
-+			 * As a special exception to the "order by
-+			 * register address" rule, the eth0 node is
-+			 * placed here to ensure that it gets
-+			 * registered as the first interface, since
-+			 * the network subsystem doesn't allow naming
-+			 * interfaces using DT aliases. Without this,
-+			 * the ordering of interfaces is different
-+			 * from the one used in U-Boot and the
-+			 * labeling of interfaces on the boards, which
-+			 * is very confusing for users.
-+			 */
-+			eth0: ethernet@70000 {
-+				compatible = "marvell,armada-370-neta";
-+				reg = <0x70000 0x4000>;
-+				interrupts-extended = <&mpic 8>;
-+				clocks = <&gateclk 4>;
-+				tx-csum-limit = <9800>;
-+				status = "disabled";
-+			};
-+
- 			eth1: ethernet@30000 {
- 				compatible = "marvell,armada-370-neta";
- 				reg = <0x30000 0x4000>;
-@@ -493,15 +514,6 @@
- 				};
- 			};
- 
--			eth0: ethernet@70000 {
--				compatible = "marvell,armada-370-neta";
--				reg = <0x70000 0x4000>;
--				interrupts-extended = <&mpic 8>;
--				clocks = <&gateclk 4>;
--				tx-csum-limit = <9800>;
--				status = "disabled";
--			};
--
- 			mdio: mdio@72004 {
- 				#address-cells = <1>;
- 				#size-cells = <0>;
diff --git a/Initial-AllWinner-A64-and-PINE64-support.patch b/Initial-AllWinner-A64-and-PINE64-support.patch
index 7be47d850..e9b00f70e 100644
--- a/Initial-AllWinner-A64-and-PINE64-support.patch
+++ b/Initial-AllWinner-A64-and-PINE64-support.patch
@@ -36,7 +36,7 @@ index bb9b0faa..8b39d2b 100644
 --- a/Documentation/devicetree/bindings/arm/sunxi.txt
 +++ b/Documentation/devicetree/bindings/arm/sunxi.txt
 @@ -13,3 +13,4 @@ using one of the following compatible strings:
-   allwinner,sun8i-a33
+   allwinner,sun8i-a83t
    allwinner,sun8i-h3
    allwinner,sun9i-a80
 +  allwinner,sun50i-a64
@@ -164,11 +164,11 @@ diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
 index f832b8a..3b7428a 100644
 --- a/arch/arm64/boot/dts/Makefile
 +++ b/arch/arm64/boot/dts/Makefile
-@@ -1,3 +1,4 @@
+@@ -2,3 +2,4 @@
+ dts-dirs += al
 +dts-dirs += allwinner
  dts-dirs += altera
  dts-dirs += amd
- dts-dirs += apm
 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
 new file mode 100644
 index 0000000..1e29a5a
diff --git a/config-arm-generic b/config-arm-generic
index aa0ad4933..eb9af25a0 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -48,7 +48,7 @@ CONFIG_KERNEL_MODE_NEON=y
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCN=y
 CONFIG_ARM_CCI400_PMU=y
-CONFIG_ARM_CCI500_PMU=y
+CONFIG_ARM_CCI5xx_PMU=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_GIC=y
@@ -120,6 +120,7 @@ CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_DW_HDMI=m
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_USB=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP=m
@@ -133,6 +134,7 @@ CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_ROCKCHIP_EFUSE=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_ROCKCHIP_MBOX=y
 
 # Tegra
 CONFIG_ARM_TEGRA_CPUFREQ=y
@@ -513,6 +515,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
 # drm
 # CONFIG_DRM_VMWGFX is not set
 # CONFIG_DRM_MSM_DSI is not set
+# CONFIG_DRM_HDLCD is not set
 # CONFIG_IMX_IPUV3_CORE is not set
 
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
diff --git a/config-arm64 b/config-arm64
index 394ea2d95..2300ee161 100644
--- a/config-arm64
+++ b/config-arm64
@@ -12,17 +12,21 @@ CONFIG_ARCH_SEATTLE=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_XGENE=y
+# CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BERLIN is not set
-# CONFIG_ARCH_EXYNOS7 is not set
+# CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_FSL_LS2085A is not set
 # CONFIG_ARCH_LAYERSCAPE is not set
 # CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_MESON is not set
+# CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_RENESAS is not set
 # CONFIG_ARCH_SPRD is not set
 # CONFIG_ARCH_STRATIX10 is not set
 # CONFIG_ARCH_THUNDER is not set
+# CONFIG_ARCH_VULCAN is not set
 # CONFIG_ARCH_ZYNQMP is not set
 # CONFIG_ARCH_UNIPHIER is not set
 
@@ -85,6 +89,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 
 # CONFIG_SYS_HYPERVISOR is not set
 
+CONFIG_ARM_SBSA_WATCHDOG=m
 CONFIG_RTC_DRV_EFI=y
 
 CONFIG_ACPI=y
@@ -134,6 +139,7 @@ CONFIG_EDAC_XGENE=m
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_XGENE_MSI=y
 CONFIG_I2C_XGENE_SLIMPRO=m
+CONFIG_XGENE_SLIMPRO_MBOX=m
 
 # AMD Seattle
 CONFIG_NET_SB1000=y
@@ -151,6 +157,7 @@ CONFIG_HISI_THERMAL=m
 CONFIG_STUB_CLK_HI6220=y
 CONFIG_PHY_HI6220_USB=m
 CONFIG_COMMON_RESET_HI6220=m
+CONFIG_HI6220_MBOX=m
 
 # Tegra
 CONFIG_ARCH_TEGRA_132_SOC=y
@@ -179,6 +186,9 @@ CONFIG_NVMEM_SUNXI_SID=m
 
 # ThunderX
 # CONFIG_MDIO_OCTEON is not set
+# CONFIG_MDIO_THUNDER is not set
+# CONFIG_PCI_HOST_THUNDER_PEM is not set
+# CONFIG_PCI_HOST_THUNDER_ECAM is not set
 
 CONFIG_DMI=y
 CONFIG_DMIID=y
@@ -208,8 +218,6 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
 # CONFIG_VGA_CONSOLE is not set
 
 # CONFIG_HOTPLUG_PCI_SHPC is not set
-# CONFIG_PCI_HOST_THUNDER_PEM is not set
-# CONFIG_PCI_HOST_THUNDER_ECAM is not set
 
 # CONFIG_FSL_MC_BUS is not set
 # CONFIG_FUJITSU_ES is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index aed2da718..b3904423c 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -48,6 +48,9 @@ CONFIG_CPU_SW_DOMAIN_PAN=y
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_ARM_VIRT_EXT is not set
 
+# CONFIG_DEBUG_RODATA is not set
+# CONFIG_DEBUG_ALIGN_RODATA is not set
+
 # Platforms enabled/disabled globally on ARMv7
 CONFIG_ARCH_BCM2835=y
 CONFIG_ARCH_EXYNOS=y
@@ -56,6 +59,7 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 CONFIG_ARCH_VIRT=y
+# CONFIG_ARCH_ARTPEC is not set
 # CONFIG_ARCH_BCM is not set
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_HI3xxx is not set
diff --git a/config-generic b/config-generic
index 4cd526b83..85d0d9733 100644
--- a/config-generic
+++ b/config-generic
@@ -3220,6 +3220,8 @@ CONFIG_WM831X_WATCHDOG=m
 # CONFIG_CADENCE_WATCHDOG is not set
 # CONFIG_BCM7038_WDT is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
+# CONFIG_EBC_C384_WDT is not set
+# CONFIG_NI903X_WDT is not set
 
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -3336,6 +3338,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 
 
 CONFIG_DRM=m
+CONFIG_DRM_DP_AUX_CHARDEV=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_AST=m  # do not enable on f17 or older
@@ -3346,6 +3349,7 @@ CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RADEON_UMS is not set
 CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMD_ACP=y
 # CONFIG_DRM_AMDGPU_CIK is not set
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
@@ -3358,6 +3362,7 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_I915_FBDEV=y
 # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
+CONFIG_DRM_I915_USERPTR=y
 CONFIG_DRM_VIA=m
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
@@ -4509,6 +4514,8 @@ CONFIG_MFD_VIPERBOARD=m
 #
 CONFIG_MISC_FILESYSTEMS=y
 
+# CONFIG_FS_ENCRYPTION is not set
+
 # ext4 is used for ext2 and ext3 filesystems
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
@@ -4840,6 +4847,7 @@ CONFIG_DEBUG_INFO_VTA=y
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 CONFIG_FRAME_POINTER=y
+CONFIG_STACK_VALIDATION=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_DEBUG_DRIVER is not set
 CONFIG_HEADERS_CHECK=y
diff --git a/config-powerpc64le b/config-powerpc64le
index 7d9f3fc3a..ec80e8bf4 100644
--- a/config-powerpc64le
+++ b/config-powerpc64le
@@ -2,5 +2,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 
 CONFIG_POWER7_CPU=y
 
+CONFIG_DISABLE_MPROFILE_KERNEL=y
+
 # https://fedoraproject.org/wiki/Features/Checkpoint_Restore
 CONFIG_CHECKPOINT_RESTORE=y
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 1ccddd9bd..071551574 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -26,6 +26,8 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 # https://lists.fedoraproject.org/pipermail/kernel/2013-December/004753.html
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 
+CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+
 # enable the 32-bit entry point for Baytrail
 CONFIG_EFI_MIXED=y
 
diff --git a/gitrev b/gitrev
index c7fe9f1a2..b2ccd1d5f 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-1200b6809dfd9d73bc4c7db76d288c35fa4b2ebe
+770c4c1119dbaa0e5e4c1f2e88ca8bfeb0d66b6d
diff --git a/kernel.spec b/kernel.spec
index 45adbeb71..23683651e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 13
+%define gitrev 18
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -527,8 +527,6 @@ Patch456: arm64-acpi-drop-expert-patch.patch
 # http://patchwork.ozlabs.org/patch/587554/
 Patch457: ARM-tegra-usb-no-reset.patch
 
-Patch458: ARM-mvebu-change-order-of-ethernet-DT-nodes-on-Armada-38x.patch
-
 # http://www.spinics.net/lists/arm-kernel/msg490981.html
 Patch459: geekbox-v4-device-tree-support.patch
 
@@ -648,6 +646,15 @@ 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
+
+#rhbz 1317190
+Patch684: thermal-fix.patch
+
+#rhbz 1318079
+Patch685: 0001-Input-synaptics-handle-spurious-release-of-trackstic.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2173,6 +2180,34 @@ fi
 #
 # 
 %changelog
+* Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git18.1
+- Linux v4.5-10883-g770c4c1119db
+- drm, arm64-perf, arc, udf, quota merges
+
+* Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git17.1
+- Linux v4.5-9714-g53d2e6976bd4
+- xfs, f2fs, cgroup merges
+
+* Mon Mar 21 2016 Laura Abbott <labbott@fedoraproject.org>
+- uas: Limit qdepth at the scsi-host level (rhbz 1315013)
+- Fix for performance regression caused by thermal (rhbz 1317190)
+- Input: synaptics - handle spurious release of trackstick buttons, again (rhbz 1318079)
+
+* Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git16.1
+- Linux v4.5-9542-g643ad15d4741
+- pekeys, efi, objtool merges
+
+* Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git15.1
+- Linux v4.5-9406-g46e595a17dcf
+- xtensa, mailbox, vhost, all the armsoc merges
+
+* Mon Mar 21 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor aarch64 cleanups
+
+* Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git14.1
+- Linux v4.5-8524-g1e75a9f34a5e
+- watchdog, firewire, vfs, linux-arm, sh, powerpc, audit, device tree merges
+
 * Sat Mar 19 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git13.1
 - Linux v4.5-8194-g1200b6809dfd
 - net merge
diff --git a/sources b/sources
index 531f42a4d..b8dd53243 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 a60d48eee08ec0536d5efb17ca819aef  linux-4.5.tar.xz
 6f557fe90b800b615c85c2ca04da6154  perf-man-4.5.tar.gz
-88332b6b2ce510b016beecb992c60fb4  patch-4.5-git13.xz
+a3447af4912b536e6d7d170b2bf18109  patch-4.5-git18.xz
diff --git a/thermal-fix.patch b/thermal-fix.patch
new file mode 100644
index 000000000..bca27cfbe
--- /dev/null
+++ b/thermal-fix.patch
@@ -0,0 +1,77 @@
+From 81ad4276b505e987dd8ebbdf63605f92cd172b52 Mon Sep 17 00:00:00 2001
+From: Zhang Rui <rui.zhang@intel.com>
+Date: Fri, 18 Mar 2016 10:03:24 +0800
+Subject: [PATCH] Thermal: Ignore invalid trip points
+
+In some cases, platform thermal driver may report invalid trip points,
+thermal core should not take any action for these trip points.
+
+CC: <stable@vger.kernel.org> #3.18+
+Link: https://bugzilla.redhat.com/show_bug.cgi?id=1317190
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=114551
+Signed-off-by: Zhang Rui <rui.zhang@intel.com>
+---
+ drivers/thermal/thermal_core.c | 13 ++++++++++++-
+ include/linux/thermal.h        |  2 ++
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
+index a0a8fd1..d4b5465 100644
+--- a/drivers/thermal/thermal_core.c
++++ b/drivers/thermal/thermal_core.c
+@@ -454,6 +454,10 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
+ {
+ 	enum thermal_trip_type type;
+ 
++	/* Ignore disabled trip points */
++	if (test_bit(trip, &tz->trips_disabled))
++		return;
++
+ 	tz->ops->get_trip_type(tz, trip, &type);
+ 
+ 	if (type == THERMAL_TRIP_CRITICAL || type == THERMAL_TRIP_HOT)
+@@ -1800,6 +1804,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
+ {
+ 	struct thermal_zone_device *tz;
+ 	enum thermal_trip_type trip_type;
++	int trip_temp;
+ 	int result;
+ 	int count;
+ 	int passive = 0;
+@@ -1871,9 +1876,15 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
+ 		goto unregister;
+ 
+ 	for (count = 0; count < trips; count++) {
+-		tz->ops->get_trip_type(tz, count, &trip_type);
++		if (tz->ops->get_trip_type(tz, count, &trip_type))
++			set_bit(count, &tz->trips_disabled);
+ 		if (trip_type == THERMAL_TRIP_PASSIVE)
+ 			passive = 1;
++		if (tz->ops->get_trip_temp(tz, count, &trip_temp))
++			set_bit(count, &tz->trips_disabled);
++		/* Check for bogus trip points */
++		if (trip_temp == 0)
++			set_bit(count, &tz->trips_disabled);
+ 	}
+ 
+ 	if (!passive) {
+diff --git a/include/linux/thermal.h b/include/linux/thermal.h
+index 9c48199..a55d052 100644
+--- a/include/linux/thermal.h
++++ b/include/linux/thermal.h
+@@ -156,6 +156,7 @@ struct thermal_attr {
+  * @trip_hyst_attrs:	attributes for trip points for sysfs: trip hysteresis
+  * @devdata:	private pointer for device private data
+  * @trips:	number of trip points the thermal zone supports
++ * @trips_disabled;	bitmap for disabled trips
+  * @passive_delay:	number of milliseconds to wait between polls when
+  *			performing passive cooling.
+  * @polling_delay:	number of milliseconds to wait between polls when
+@@ -191,6 +192,7 @@ struct thermal_zone_device {
+ 	struct thermal_attr *trip_hyst_attrs;
+ 	void *devdata;
+ 	int trips;
++	unsigned long trips_disabled;	/* bitmap for disabled trips */
+ 	int passive_delay;
+ 	int polling_delay;
+ 	int temperature;