Linux v3.13-10637-ge7651b8

- Enable ZRAM/ZSMALLOC (rhbz 1058072)
- Turn EXYNOS_HDMI back on now that it should build

7 files changed, 122 insertions, 7 deletions

diff --git a/config-armv7-lpae b/config-armv7-lpae
index f0e135490..5ec30d1e8 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -91,7 +91,7 @@ CONFIG_DRM_EXYNOS=m
 CONFIG_DRM_EXYNOS_IOMMU=y
 CONFIG_DRM_EXYNOS_DMABUF=y
 CONFIG_DRM_EXYNOS_FIMD=y
-# CONFIG_DRM_EXYNOS_HDMI is not set
+CONFIG_DRM_EXYNOS_HDMI=y
 CONFIG_DRM_EXYNOS_VIDI=y
 CONFIG_DRM_EXYNOS_G2D=y
 CONFIG_DRM_EXYNOS_IPP=y
diff --git a/config-generic b/config-generic
index 809b4832c..2f24255a3 100644
--- a/config-generic
+++ b/config-generic
@@ -315,6 +315,8 @@ CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
 # CONFIG_PARIDE is not set
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
 
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
@@ -4908,7 +4910,6 @@ CONFIG_RTL8192E=m
 # CONFIG_RTL8192U is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_SPECTRA is not set
-# CONFIG_ZRAM is not set
 # CONFIG_EASYCAP is not set
 # CONFIG_SOLO6X10 is not set
 # CONFIG_ACPI_QUICKSTART is not set
@@ -4933,7 +4934,6 @@ CONFIG_ALTERA_STAPL=m
 # CONFIG_RTS5139 is not set
 # CONFIG_NVEC_LEDS is not set
 # CONFIG_VT6655 is not set
-# CONFIG_ZSMALLOC is not set
 # CONFIG_RAMSTER is not set
 # CONFIG_USB_WPAN_HCD is not set
 # CONFIG_WIMAX_GDM72XX is not set 
@@ -5026,6 +5026,8 @@ CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
 CONFIG_ZSWAP=y
+CONFIG_ZSMALLOC=y
+# CONFIG_PGTABLE_MAPPING is not set
 
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_KEYBOARD_GPIO is not set
diff --git a/config-powerpc64 b/config-powerpc64
index 1bf563f5b..4b8ba84aa 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -163,7 +163,8 @@ CONFIG_PSERIES_ENERGY=m
 
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_PSERIES_IDLE=y
+CONFIG_PSERIES_CPUIDLE=y
+CONFIG_POWERNV_CPUIDLE=y
 
 CONFIG_PPC_ICSWX=y
 CONFIG_IO_EVENT_IRQ=y
diff --git a/config-powerpc64p7 b/config-powerpc64p7
index 592476426..4fe09eee2 100644
--- a/config-powerpc64p7
+++ b/config-powerpc64p7
@@ -154,7 +154,8 @@ CONFIG_PSERIES_ENERGY=m
 
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_PSERIES_IDLE=y
+CONFIG_PSERIES_CPUIDLE=y
+CONFIG_POWERNV_CPUIDLE=y
 
 CONFIG_PPC_ICSWX=y
 CONFIG_IO_EVENT_IRQ=y
diff --git a/fix-exynos-hdmi-build.patch b/fix-exynos-hdmi-build.patch
new file mode 100644
index 000000000..000485376
--- /dev/null
+++ b/fix-exynos-hdmi-build.patch
@@ -0,0 +1,104 @@
+                                                                                                                                                                                                                                                               
+Delivered-To: jwboyer@gmail.com
+Received: by 10.76.27.197 with SMTP id v5csp80417oag;
+        Thu, 30 Jan 2014 22:14:25 -0800 (PST)
+X-Received: by 10.67.8.102 with SMTP id dj6mr18890418pad.10.1391148865030;
+        Thu, 30 Jan 2014 22:14:25 -0800 (PST)
+Return-Path: <sachin.kamat@linaro.org>
+Received: from bastion.fedoraproject.org (bastion02.fedoraproject.org. [209.132.181.3])
+        by mx.google.com with ESMTP id ui8si9189230pac.148.2014.01.30.22.14.24
+        for <jwboyer@gmail.com>;
+        Thu, 30 Jan 2014 22:14:25 -0800 (PST)
+Received-SPF: neutral (google.com: 209.132.181.3 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.132.181.3;
+Authentication-Results: mx.google.com;
+       spf=neutral (google.com: 209.132.181.3 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org
+Received: by bastion02.phx2.fedoraproject.org (Postfix)
+	id 4AC1340335; Fri, 31 Jan 2014 06:14:24 +0000 (UTC)
+Delivered-To: jwboyer@fedoraproject.org
+Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.19])
+	by bastion02.phx2.fedoraproject.org (Postfix) with ESMTP id 9B3D740215
+	for <jwboyer@fedoraproject.org>; Fri, 31 Jan 2014 06:14:23 +0000 (UTC)
+Received: from mail-pb0-f48.google.com (mail-pb0-f48.google.com [209.85.160.48])
+	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0V6EM4n000397
+	for <jwboyer@fedoraproject.org>; Fri, 31 Jan 2014 01:14:22 -0500
+Received: by mail-pb0-f48.google.com with SMTP id rr13so4032576pbb.21
+        for <jwboyer@fedoraproject.org>; Thu, 30 Jan 2014 22:14:22 -0800 (PST)
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=1e100.net; s=20130820;
+        h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
+         :content-type:content-transfer-encoding;
+        bh=BGRkmAtr6oCuCVzH3/VAO4vZHPWjXG3HvWVgh3iYoyc=;
+        b=BV8FNC6/36vQ7hzewqa1KDU2eZ5djh+grZwutUPwJvgdFm9Unvryca/uZ10/pYNbtR
+         fh2+Zd0EnkUdtzeZbpNKm4NyEhs41JxVAP4Qda7ySJDwQ/plJLdFMD3HJhrV3s8nLbK0
+         bqbYK2daVba2fuZkU3dR31JB4rRHo1mSKjgjM+5BnhbVswUE4Dr+6qa7hcQP2kKFzfSQ
+         PM1t2bWEt95Tas4qSt3LJpKb9nyibCKS2JuOcj9Efimu5UwxSNtRd4wkzBA2jR3S+HmG
+         Ev1TK17AmVEu7KeXFo2GR2IXyBss+qlov3L9IkaswFgDQdpDQFL/uyQJtBNSZjoESeSJ
+         f/Ow==
+X-Gm-Message-State: ALoCoQnV+4N5+WjFdFY1kKQz4MFAPtjWuLYpCVMRAOMT17Na1YgH48TOQoz14TivrxYcSpWzRgTO
+X-Received: by 10.68.191.73 with SMTP id gw9mr18958285pbc.158.1391148862198;
+        Thu, 30 Jan 2014 22:14:22 -0800 (PST)
+Received: from linaro.sisodomain.com ([115.113.119.130])
+        by mx.google.com with ESMTPSA id nu10sm23776585pbb.16.2014.01.30.22.14.18
+        for <multiple recipients>
+        (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
+        Thu, 30 Jan 2014 22:14:21 -0800 (PST)
+From: Sachin Kamat <sachin.kamat@linaro.org>
+To: dri-devel@lists.freedesktop.org
+Cc: inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com,
+        airlied@linux.ie, rahul.sharma@samsung.com, jwboyer@fedoraproject.org,
+        sachin.kamat@linaro.org, patches@linaro.org
+Subject: [PATCH 1/1] drm/exynos: Fix build error in exynos_hdmi.c
+Date: Fri, 31 Jan 2014 11:39:32 +0530
+Message-Id: <1391148572-24130-1-git-send-email-sachin.kamat@linaro.org>
+X-Mailer: git-send-email 1.7.9.5
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+X-RedHat-Spam-Score: -3.001  (BAYES_00,DCC_REPUT_00_12,RCVD_IN_DNSWL_LOW,SPF_PASS)
+X-Scanned-By: MIMEDefang 2.68 on 10.5.110.19
+
+‘hdmi_infoframe’ is already defined in include/linux/hdmi.h.
+Rename the local variable to avoid the following build error:
+drivers/gpu/drm/exynos/exynos_hdmi.c:382:8: error: ‘hdmi_infoframe’ defined as wrong kind of tag
+ struct hdmi_infoframe {
+
+Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
+Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ drivers/gpu/drm/exynos/exynos_hdmi.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
+index a0e10ae..0d4407c 100644
+--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
++++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
+@@ -379,7 +379,7 @@ static const struct hdmiphy_config hdmiphy_v14_configs[] = {
+ 	},
+ };
+ 
+-struct hdmi_infoframe {
++struct hdmi_frameinfo {
+ 	enum HDMI_PACKET_TYPE type;
+ 	u8 ver;
+ 	u8 len;
+@@ -682,7 +682,7 @@ static u8 hdmi_chksum(struct hdmi_context *hdata,
+ }
+ 
+ static void hdmi_reg_infoframe(struct hdmi_context *hdata,
+-			struct hdmi_infoframe *infoframe)
++			struct hdmi_frameinfo *infoframe)
+ {
+ 	u32 hdr_sum;
+ 	u8 chksum;
+@@ -985,7 +985,7 @@ static void hdmi_conf_reset(struct hdmi_context *hdata)
+ 
+ static void hdmi_conf_init(struct hdmi_context *hdata)
+ {
+-	struct hdmi_infoframe infoframe;
++	struct hdmi_frameinfo infoframe;
+ 
+ 	/* disable HPD interrupts from HDMI IP block, use GPIO instead */
+ 	hdmi_reg_writemask(hdata, HDMI_INTC_CON, 0, HDMI_INTC_EN_GLOBAL |
+-- 
+1.7.9.5
+
diff --git a/kernel.spec b/kernel.spec
index c6755d7f0..51399830a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 18
+%define gitrev 19
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -628,6 +628,7 @@ Patch25190: perf-fix-asm-hash-build.patch
 Patch25191: kernfs-oops-fix.patch
 
 Patch25192: imx-hdmi-fix.patch
+Patch25193: fix-exynos-hdmi-build.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -1279,6 +1280,7 @@ ApplyPatch perf-fix-asm-hash-build.patch
 ApplyPatch kernfs-oops-fix.patch
 
 ApplyPatch imx-hdmi-fix.patch
+ApplyPatch fix-exynos-hdmi-build.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2059,6 +2061,11 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Fri Jan 31 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git19.1
+- Linux v3.13-10637-ge7651b8
+- Enable ZRAM/ZSMALLOC (rhbz 1058072)
+- Turn EXYNOS_HDMI back on now that it should build
+
 * Thu Jan 30 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git18.1
 - Linux v3.13-10231-g53d8ab2
 
diff --git a/sources b/sources
index 757ded19d..afc1a660c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 0ecbaf65c00374eb4a826c2f9f37606f  linux-3.13.tar.xz
 732d1952898b28d5ccc264cad77b0619  perf-man-3.13.tar.gz
-30a2058962b52debdf9e3c95fab932f1  patch-3.13-git18.xz
+fcecf261f378716c88e4b32a26830ecd  patch-3.13-git19.xz