From e15b9f28bb9eba2b3791c0d8edbec1e534e0d1a9 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Fri, 9 Jun 2017 10:40:49 -0700 Subject: [PATCH] Linux v4.12-rc4-176-geb4125d --- arm64-hikey-fixes.patch | 36 ------------------------------------ gitrev | 2 +- kernel.spec | 7 ++++--- sources | 2 +- 4 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 arm64-hikey-fixes.patch diff --git a/arm64-hikey-fixes.patch b/arm64-hikey-fixes.patch deleted file mode 100644 index a698ac122..000000000 --- a/arm64-hikey-fixes.patch +++ /dev/null @@ -1,36 +0,0 @@ -From patchwork Sat Apr 8 07:18:40 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: reset: hi6220: Set module license so that it can be loaded -From: Jeremy Linton -X-Patchwork-Id: 9670985 -Message-Id: <20170408071840.29380-1-lintonrjeremy@gmail.com> -To: linux-kernel@vger.kernel.org -Cc: p.zabel@pengutronix.de, saberlily.xia@hisilicon.com, - puck.chen@hisilicon.com, xinliang.liu@linaro.org, - Jeremy Linton -Date: Sat, 8 Apr 2017 02:18:40 -0500 - -The hi6220_reset driver can be built as a standalone module -yet it cannot be loaded because it depends on GPL exported symbols. - -Lets set the module license so that the module loads, and things like -the on-board kirin drm starts working. - -Signed-off-by: Jeremy Linton -reviewed-by: Xinliang Liu ---- - drivers/reset/hisilicon/hi6220_reset.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c -index 35ce53e..d5e5229 100644 ---- a/drivers/reset/hisilicon/hi6220_reset.c -+++ b/drivers/reset/hisilicon/hi6220_reset.c -@@ -155,3 +155,5 @@ static int __init hi6220_reset_init(void) - } - - postcore_initcall(hi6220_reset_init); -+ -+MODULE_LICENSE("GPL v2"); diff --git a/gitrev b/gitrev index a610affa8..372b89c31 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -b29794ec95c6856b316c2295904208bf11ffddd9 +eb4125dfdb1f64a5e41da8315bff48f67e5d1712 diff --git a/kernel.spec b/kernel.spec index c3f1d4a34..c7243abd3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 4 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -591,8 +591,6 @@ Patch305: ARM-tegra-usb-no-reset.patch Patch306: AllWinner-net-emac.patch -Patch307: arm64-hikey-fixes.patch - # http://www.spinics.net/lists/devicetree/msg163238.html Patch308: bcm2837-initial-support.patch @@ -2167,6 +2165,9 @@ fi # # %changelog +* Fri Jun 09 2017 Laura Abbott - 4.12.0-0.rc4.git3.1 +- Linux v4.12-rc4-176-geb4125d + * Thu Jun 08 2017 Laura Abbott - Update install path for asm cross headers diff --git a/sources b/sources index ec8f50dd4..91dd4fa7d 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 SHA512 (patch-4.12-rc4.xz) = ccc100e68d03fdf32ba6d6d874c1e313bfb93f38f369c712e1bb61ed9d44d4ac2a98aca7ea154f0582847fe1668093b02cab6dd2996bd94a8caabc32ab4a6639 -SHA512 (patch-4.12-rc4-git2.xz) = 352c818e3bc99b4bfdf9a458d7ce0b22fd066c98fcbbbc219dffd5e71f8b8ab39e62b353339b28ca6fb3aca5226050557cfb7684d6b5baaacf040842257843c3 +SHA512 (patch-4.12-rc4-git3.xz) = 5277bf7f20c1acea473452e01b0d517109055a6c5baa46c7b104b482599a6fae70c8a1bc36bc1683a57ba4032f2108659e0c0849d4790b29b62fcfac2d5c8a57