diff options
| author | Erich Eckner <git@eckner.net> | 2018-02-22 06:46:49 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-02-22 06:46:49 +0100 |
| commit | eb27c754bdd43a07669a8f8aa01f5d172efbe18c (patch) | |
| tree | 21295620a612c18078964bcd800556f8a56f707b | |
| parent | 876cd030a5f7cc5ef084daf6e9cf44165da4e7f9 (diff) | |
| download | packages-eb27c754bdd43a07669a8f8aa01f5d172efbe18c.tar.xz | |
extra/linux-zen: adopt config changes from upstream
| -rw-r--r-- | extra/linux-zen/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/linux-zen/config | 34 |
2 files changed, 23 insertions, 17 deletions
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD index a1108bd5..baee0fbe 100644 --- a/extra/linux-zen/PKGBUILD +++ b/extra/linux-zen/PKGBUILD @@ -1,8 +1,8 @@ -# git revision bccd16d02296b838f16128404a79285a8eba0493 +# git revision b647e5d73af7d12032ccf199f6bdaf6b37590814 # fail if upstream's .config changes -if [ "${sha256sums[6]}" = '8f83830296612594640a24b207c1c266b620f02d4423b105e8927842dc506c2a' ]; then - sha256sums[6]='743bc7481516f49c43357437bc2e8a63ab4eef2a013c77b0c960e2ae956bd8b3' +if [ "${sha256sums[6]}" = 'be3892dad291bc1c289a67970944b425dab5d968030799e642d36e9e29c5dc7c' ]; then + sha256sums[6]='f46fb1d590ac42178b36e6bdf3fb1372c8a1e3504359fe04c88389727231e8b7' fi eval "$( diff --git a/extra/linux-zen/config b/extra/linux-zen/config index 23712ff2..2acf1d04 100644 --- a/extra/linux-zen/config +++ b/extra/linux-zen/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 @@ -942,7 +942,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 @@ -1020,7 +1020,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 @@ -1034,10 +1034,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 @@ -1534,19 +1534,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 @@ -5826,7 +5826,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 @@ -5972,8 +5972,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 |