diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-10 10:03:17 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-10 10:03:17 +0200 |
commit | e2a16d6f70ee68b101ea7132fb8a547a7141f30a (patch) | |
tree | 5f7e9525d3454654420811808cefda0893771d9f | |
parent | 9af44674b5879aa92dba618b909bc2ab08885266 (diff) | |
parent | e15b9f28bb9eba2b3791c0d8edbec1e534e0d1a9 (diff) | |
download | kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc24.tar.gz kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc24.tar.xz kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc24.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc4.git3.1.vanilla.knurd.1.fc24
-rw-r--r-- | arm64-hikey-fixes.patch | 36 | ||||
-rw-r--r-- | baseconfig/arm/CONFIG_ROCKCHIP_CDN_DP | 1 | ||||
-rw-r--r-- | baseconfig/arm/armv7/CONFIG_REGULATOR_ACT8865 | 1 | ||||
-rw-r--r-- | baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP | 1 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 1 | ||||
-rw-r--r-- | kernel-aarch64.config | 1 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl.config | 4 | ||||
-rw-r--r-- | kernel.spec | 12 | ||||
-rw-r--r-- | sources | 2 |
13 files changed, 21 insertions, 52 deletions
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 <lintonrjeremy@gmail.com> -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 <lintonrjeremy@gmail.com> -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 <lintonrjeremy@gmail.com> -reviewed-by: Xinliang Liu <xinliang.liu@linaro.org> ---- - 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/baseconfig/arm/CONFIG_ROCKCHIP_CDN_DP b/baseconfig/arm/CONFIG_ROCKCHIP_CDN_DP new file mode 100644 index 000000000..86d2137bd --- /dev/null +++ b/baseconfig/arm/CONFIG_ROCKCHIP_CDN_DP @@ -0,0 +1 @@ +CONFIG_ROCKCHIP_CDN_DP=y diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_ACT8865 b/baseconfig/arm/armv7/CONFIG_REGULATOR_ACT8865 deleted file mode 100644 index f1e82abd5..000000000 --- a/baseconfig/arm/armv7/CONFIG_REGULATOR_ACT8865 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_REGULATOR_ACT8865 is not set diff --git a/baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP b/baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP deleted file mode 100644 index 98a696d76..000000000 --- a/baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ROCKCHIP_CDN_DP is not set @@ -1 +1 @@ -b29794ec95c6856b316c2295904208bf11ffddd9 +eb4125dfdb1f64a5e41da8315bff48f67e5d1712 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 4ea1aa200..c28ec4aeb 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4331,6 +4331,7 @@ CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m CONFIG_ROCKCHIP_ANALOGIX_DP=y +CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_EFUSE=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index c0808b8cc..9ed873353 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4309,6 +4309,7 @@ CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m CONFIG_ROCKCHIP_ANALOGIX_DP=y +CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_EFUSE=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index a765d4402..edfd318bd 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4579,7 +4579,7 @@ CONFIG_REGMAP_SPI=y CONFIG_REGMAP_SPMI=m CONFIG_REGMAP=y # CONFIG_REGULATOR_88PM800 is not set -# CONFIG_REGULATOR_ACT8865 is not set +CONFIG_REGULATOR_ACT8865=m CONFIG_REGULATOR_AD5398=m CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_AS3722=m @@ -4677,7 +4677,7 @@ CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m CONFIG_ROCKCHIP_ANALOGIX_DP=y -# CONFIG_ROCKCHIP_CDN_DP is not set +CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_EFUSE=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 9f1613c8c..564bb8fa4 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4312,7 +4312,7 @@ CONFIG_REGMAP_IRQ=y CONFIG_REGMAP_MMIO=y CONFIG_REGMAP_SPI=y CONFIG_REGMAP=y -# CONFIG_REGULATOR_ACT8865 is not set +CONFIG_REGULATOR_ACT8865=m CONFIG_REGULATOR_AD5398=m # CONFIG_REGULATOR_ANATOP is not set CONFIG_REGULATOR_AS3722=m @@ -4397,7 +4397,7 @@ CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m CONFIG_ROCKCHIP_ANALOGIX_DP=y -# CONFIG_ROCKCHIP_CDN_DP is not set +CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_EFUSE=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 95f9b8ca1..408e69f2f 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4290,7 +4290,7 @@ CONFIG_REGMAP_IRQ=y CONFIG_REGMAP_MMIO=y CONFIG_REGMAP_SPI=y CONFIG_REGMAP=y -# CONFIG_REGULATOR_ACT8865 is not set +CONFIG_REGULATOR_ACT8865=m CONFIG_REGULATOR_AD5398=m # CONFIG_REGULATOR_ANATOP is not set CONFIG_REGULATOR_AS3722=m @@ -4375,7 +4375,7 @@ CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m CONFIG_ROCKCHIP_ANALOGIX_DP=y -# CONFIG_ROCKCHIP_CDN_DP is not set +CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_EFUSE=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 6e59acefb..07070ee8f 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4557,7 +4557,7 @@ CONFIG_REGMAP_SPI=y CONFIG_REGMAP_SPMI=m CONFIG_REGMAP=y # CONFIG_REGULATOR_88PM800 is not set -# CONFIG_REGULATOR_ACT8865 is not set +CONFIG_REGULATOR_ACT8865=m CONFIG_REGULATOR_AD5398=m CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_AS3722=m @@ -4655,7 +4655,7 @@ CONFIG_RMI4_I2C=m CONFIG_RMI4_SMB=m CONFIG_RMI4_SPI=m CONFIG_ROCKCHIP_ANALOGIX_DP=y -# CONFIG_ROCKCHIP_CDN_DP is not set +CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_EFUSE=m diff --git a/kernel.spec b/kernel.spec index e1157411c..86b7abc71 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,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 @@ -608,8 +608,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 @@ -1814,7 +1812,7 @@ find $RPM_BUILD_ROOT/usr/tmp-headers/include \ # Copy all the architectures we care about to their respective asm directories for arch in arm arm64 powerpc s390 x86 ; do mkdir -p $RPM_BUILD_ROOT/usr/${arch}-linux-gnu/include -mv $RPM_BUILD_ROOT/usr/tmp-headers/include/arch-${arch} $RPM_BUILD_ROOT/usr/${arch}-linux-gnu/include/asm +mv $RPM_BUILD_ROOT/usr/tmp-headers/include/arch-${arch}/asm $RPM_BUILD_ROOT/usr/${arch}-linux-gnu/include/ cp -a $RPM_BUILD_ROOT/usr/tmp-headers/include/asm-generic $RPM_BUILD_ROOT/usr/${arch}-linux-gnu/include/. done @@ -2187,6 +2185,12 @@ fi # # %changelog +* Fri Jun 09 2017 Laura Abbott <labbott@fedoraproject.org> - 4.12.0-0.rc4.git3.1 +- Linux v4.12-rc4-176-geb4125d + +* Thu Jun 08 2017 Laura Abbott <labbott@fedoraproject.org> +- Update install path for asm cross headers + * Wed Jun 07 2017 Laura Abbott <labbott@fedoraproject.org> - 4.12.0-0.rc4.git2.1 - Linux v4.12-rc4-122-gb29794e @@ -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 |