From aaf87a5a699ea4235915fbecb134a4ae1c86e013 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 20 Feb 2018 16:40:24 +0000
Subject: main/linux-vanilla: disable X86_SYSFB

This should fix a regression that caused console go black.

http://lists.alpinelinux.org/alpine-devel/6125.html
---
 main/linux-vanilla/APKBUILD              | 10 +++++-----
 main/linux-vanilla/config-vanilla.x86    |  2 +-
 main/linux-vanilla/config-vanilla.x86_64 |  2 +-
 main/linux-vanilla/config-virt.x86       |  2 +-
 main/linux-vanilla/config-virt.x86_64    |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'main/linux-vanilla')

diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index 330e08364e..55f5fdc8e3 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux vanilla kernel"
 url="http://kernel.org"
 depends="mkinitfs linux-firmware"
@@ -225,11 +225,11 @@ sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8
 5373728be2b507c3db5e042e1d768740df7965078868afdc46418b1adc4cae3d8f9f1aedb59975a0f2acf8754340499354fcf97c503397a5d9886ccc9689b782  0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch
 2afa344896be851f357f15d8e5cd4e95256d99bfb3649a74fa92469ade0a2e71e3bc363e2c7fbc67fe039074a7d5cffadc113d61aebd3529528db9371694bfea  config-vanilla.aarch64
 a401a5c5c5e2785f373707620c18fdd74dbfe10e4e934803451a3208e99c72970f35527875e31dd78d4b82b6f77de21361cd432ffc296251737508eb545f451a  config-vanilla.armhf
-dbee0f76ba3ea060f516209169cf71cf1c3093f31a79c124df1ed6e137d9c2c7b99a7735e5be688328994c694479d52a4e34fdb11ac7e91a15e0285debd4509d  config-vanilla.x86
-b36058e1a8dbf4338b5654b4bf54f6a7657aadd959330b1ba2e3e4da3f4ce72238b91f1b7cca765086c6c079d5042124551a299d0e20b9f85e23a12980d8f7f3  config-vanilla.x86_64
+34198a6830d64b5ec685452a5880e3c7090da18857b1ce600c8c07932b5ee43b3ca68d0bdfeb6b080fef865a6eaa08bb48bfa8c6430a84b975d3e1282269fbd3  config-vanilla.x86
+0c3266989eefc8ea919f7ad7746c3d1c9ae3eb7397a82f4f867f4ef572830fe5f1eac32653e5c9081823c3ec707829e0e3836ff5f5040831d055d810ae30083d  config-vanilla.x86_64
 03a14f009996319fc24fc1a4eae26e250f7cf6213bcdce0f82c3d0b4b54b81517f55e0445df0460d30f6b61f22519f04ac219ce3017c7cf72acd14c43e781a8b  config-vanilla.ppc
 2b41725c863d1dd2ab5913dd23e55c8adc9d2d34609946d19d4c2dbdb83a6deffe5861d2d6237c0eb6a4c833b45f5f3b03c329a4e00e9b599dfca5fdab124fbe  config-vanilla.ppc64le
 1bf03944d81712216541c29c25c2fb3005c279a7752588a9066e89bcf5dcd41a0f6c21c6178441f56aec49539fada456907c03c056bbd6b29b67c32f9579114e  config-vanilla.s390x
-dc5e5cfbcdcd74006517d88260b88638096a141490181a65013e840cf228cbe7dbdbd550cdf422d2ca63e45a8abc31246ff4a0f81d71bbe3b58dd6a8ccea4af2  config-virt.x86
-5c2d26ad351dd11e5bfc69fc45abbb2616f31050423974b64dae92aa46ab184e545aa70acddc16c8933786618329a64f02e4b424d074ee1b5a481a502f726980  config-virt.x86_64
+408a37fdf7dd467c1a874b0de54e72379378e2f4338a964fe2a50d80ddbb8916cb3bd23f000c6f57727384a24e011e06d5f4af6017453391e4cc60fd57892bda  config-virt.x86
+62f9b896a994b3e35d2bfdd3af6ef781f1ba351e036433e06c86fe0d32a8f360dfc5892cfeddc76fdc1055c9b6cf4ab707ea74c488bcda55ed191ffd59f5e32d  config-virt.x86_64
 e36c1571872965e419a46102ba17d0ed6a7dc004b6355e29d2154ce9653bceb949c92b7eed527bede7085c6acc3c0829ff2935cc038aa90ea17f44a50b6954b0  patch-4.14.19.xz"
diff --git a/main/linux-vanilla/config-vanilla.x86 b/main/linux-vanilla/config-vanilla.x86
index cf408fec74..edf479edb0 100644
--- a/main/linux-vanilla/config-vanilla.x86
+++ b/main/linux-vanilla/config-vanilla.x86
@@ -826,7 +826,7 @@ CONFIG_PD6729=m
 CONFIG_I82092=m
 CONFIG_PCCARD_NONSTATIC=y
 # CONFIG_RAPIDIO is not set
-CONFIG_X86_SYSFB=y
+# CONFIG_X86_SYSFB is not set
 
 #
 # Executable file formats / Emulations
diff --git a/main/linux-vanilla/config-vanilla.x86_64 b/main/linux-vanilla/config-vanilla.x86_64
index 5786832f65..137a053bee 100644
--- a/main/linux-vanilla/config-vanilla.x86_64
+++ b/main/linux-vanilla/config-vanilla.x86_64
@@ -850,7 +850,7 @@ CONFIG_PD6729=m
 CONFIG_I82092=m
 CONFIG_PCCARD_NONSTATIC=y
 # CONFIG_RAPIDIO is not set
-CONFIG_X86_SYSFB=y
+# CONFIG_X86_SYSFB is not set
 
 #
 # Executable file formats / Emulations
diff --git a/main/linux-vanilla/config-virt.x86 b/main/linux-vanilla/config-virt.x86
index 252ef0d6c7..8d9b8020d5 100644
--- a/main/linux-vanilla/config-virt.x86
+++ b/main/linux-vanilla/config-virt.x86
@@ -783,7 +783,7 @@ CONFIG_SCx200HR_TIMER=m
 CONFIG_AMD_NB=y
 # CONFIG_PCCARD is not set
 # CONFIG_RAPIDIO is not set
-CONFIG_X86_SYSFB=y
+# CONFIG_X86_SYSFB is not set
 
 #
 # Executable file formats / Emulations
diff --git a/main/linux-vanilla/config-virt.x86_64 b/main/linux-vanilla/config-virt.x86_64
index ce80f69253..cf31d3a070 100644
--- a/main/linux-vanilla/config-virt.x86_64
+++ b/main/linux-vanilla/config-virt.x86_64
@@ -802,7 +802,7 @@ CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 # CONFIG_PCCARD is not set
 # CONFIG_RAPIDIO is not set
-CONFIG_X86_SYSFB=y
+# CONFIG_X86_SYSFB is not set
 
 #
 # Executable file formats / Emulations
-- 
cgit v1.2.3