diff options
| author | Erich Eckner <git@eckner.net> | 2018-02-22 06:39:25 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-02-22 06:39:25 +0100 |
| commit | 876cd030a5f7cc5ef084daf6e9cf44165da4e7f9 (patch) | |
| tree | 306c17727a39b83f5d7f716f95f7f4793a26c6e4 | |
| parent | 31d1179d1a69ab7e0b39a6d7e04440a5686ce87c (diff) | |
| download | packages-876cd030a5f7cc5ef084daf6e9cf44165da4e7f9.tar.xz | |
core/linux: adopt new upstream config
| -rw-r--r-- | core/linux/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/linux/config | 34 |
2 files changed, 23 insertions, 17 deletions
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index 47f191af..2ec47661 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -1,8 +1,8 @@ -# upstream git: bccd16d02296b838f16128404a79285a8eba0493 +# upstream git: b647e5d73af7d12032ccf199f6bdaf6b37590814 # fail if upstream's .config changes -if [ "${sha256sums[4]}" = '699ad86e5c6076fc5c544d72191efb7eb302f68169dad8495add0f1d156203ab' ]; then - sha256sums[4]='fa99eb77dd759deac07f156e0152a3341e408d7b1d8007269b9d5b45e0c78e43' +if [ "${sha256sums[4]}" = '617d1a2b0160fc72098524a51501531556050cab0e466c9dbae5d60a78991bd2' ]; then + sha256sums[4]='ac4861c5718f6170d7d8317260819c578d9c14341a0020b02069b1578f66d755' fi eval "$( diff --git a/core/linux/config b/core/linux/config index 43682248..a78e0893 100644 --- a/core/linux/config +++ b/core/linux/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.15.2-2 Kernel Configuration +# Linux/x86 4.15.3-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -916,7 +916,7 @@ CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_RXS_GEN3=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Executable file formats / Emulations @@ -994,7 +994,7 @@ CONFIG_INET_RAW_DIAG=m CONFIG_INET_DIAG_DESTROY=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=m -CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_CUBIC=y CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_CONG_HTCP=m CONFIG_TCP_CONG_HSTCP=m @@ -1008,10 +1008,10 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_CONG_ILLINOIS=m CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m -CONFIG_TCP_CONG_BBR=y -CONFIG_DEFAULT_BBR=y +CONFIG_TCP_CONG_BBR=m +CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="bbr" +CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y @@ -1508,19 +1508,19 @@ CONFIG_NET_SCH_MQPRIO=m CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m -CONFIG_NET_SCH_FQ_CODEL=m -CONFIG_NET_SCH_FQ=y +CONFIG_NET_SCH_FQ_CODEL=y +CONFIG_NET_SCH_FQ=m CONFIG_NET_SCH_HHF=m CONFIG_NET_SCH_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m CONFIG_NET_SCH_DEFAULT=y -CONFIG_DEFAULT_FQ=y +# CONFIG_DEFAULT_FQ is not set # CONFIG_DEFAULT_CODEL is not set -# CONFIG_DEFAULT_FQ_CODEL is not set +CONFIG_DEFAULT_FQ_CODEL=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFAULT_PFIFO_FAST is not set -CONFIG_DEFAULT_NET_SCH="fq" +CONFIG_DEFAULT_NET_SCH="fq_codel" # # Classification @@ -5798,7 +5798,7 @@ CONFIG_DRM_AMD_ACP=y # CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMD_DC_PRE_VEGA=y -CONFIG_DRM_AMD_DC_FBC=y +# CONFIG_DRM_AMD_DC_FBC is not set CONFIG_DRM_AMD_DC_DCN1_0=y # CONFIG_DEBUG_KERNEL_DC is not set @@ -5944,8 +5944,14 @@ CONFIG_FB_EFI=y # CONFIG_FB_HGA is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set +CONFIG_FB_NVIDIA=m +CONFIG_FB_NVIDIA_I2C=y +# CONFIG_FB_NVIDIA_DEBUG is not set +CONFIG_FB_NVIDIA_BACKLIGHT=y +CONFIG_FB_RIVA=m +CONFIG_FB_RIVA_I2C=y +# CONFIG_FB_RIVA_DEBUG is not set +CONFIG_FB_RIVA_BACKLIGHT=y # CONFIG_FB_I740 is not set CONFIG_FB_I810=m CONFIG_FB_I810_GTF=y |