summaryrefslogtreecommitdiff
path: root/extra/linux-zen
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-21 10:09:55 +0100
committerErich Eckner <git@eckner.net>2019-01-21 10:09:55 +0100
commitb1ef18278ba295fcddd30751d8294e76e638724e (patch)
treec04e42280fe27b7c73195b0cba36b73faae44400 /extra/linux-zen
parent70a7c30b8196a4398cf755b93507516d0f83be56 (diff)
parent665c195f3812e8a410095ac2ffa5a692116870e2 (diff)
downloadpackages-b1ef18278ba295fcddd30751d8294e76e638724e.tar.xz
Merge branch 'master' into i486
Diffstat (limited to 'extra/linux-zen')
-rw-r--r--extra/linux-zen/PKGBUILD6
-rw-r--r--extra/linux-zen/config8
2 files changed, 9 insertions, 5 deletions
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index 02919902..c725625d 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -1,9 +1,9 @@
-# upstream git revision: 45f74c7ee0c0d228f516a775817769db3192f978
+# upstream git revision: 2e669a90e89f01c68b7b0faf7f6084aabca61c3f
# fail if upstream's .config changes
for ((i=0; i<${#sha256sums[@]}; i++)); do
- if [ "${sha256sums[${i}]}" = '6b281ab7860bf994a286c257b76c7afc3adc2eafa5fa282ff4219ca28fedf8e8' ]; then
- sha256sums[${i}]='5b71e434cda59aa7d2f21e92c9c6d8fd8ffae99c847a66e397638802eef3339f'
+ if [ "${sha256sums[${i}]}" = '4e4da53c86f21f5949519c57884d322a486107ea1559a5ff9f2318c08cafcdf1' ]; then
+ sha256sums[${i}]='42961d0de8c847b7958f8b8ea49278c22edb4887d24d1f90e88008ac65102fcb'
fi
done
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index ade44cab..3f21f6e7 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.2-zen1 Kernel Configuration
+# Linux/x86 4.19.4-zen1 Kernel Configuration
#
#
@@ -17,6 +17,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
# General setup
#
CONFIG_ZEN_INTERACTIVE=y
+# CONFIG_SCHED_MUQSS is not set
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION="-zen"
@@ -375,6 +376,8 @@ CONFIG_NR_CPUS=8
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
CONFIG_SCHED_MC_PRIO=y
+CONFIG_RQ_NONE=y
+CONFIG_SHARERQ=0
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -1585,6 +1588,7 @@ CONFIG_L2TP_V3=y
CONFIG_L2TP_IP=m
CONFIG_L2TP_ETH=m
CONFIG_STP=m
+CONFIG_GARP=m
CONFIG_MRP=m
CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
@@ -1601,7 +1605,7 @@ CONFIG_NET_DSA_TAG_LAN9303=y
CONFIG_NET_DSA_TAG_MTK=y
CONFIG_NET_DSA_TAG_QCA=y
CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_GVRP=y
CONFIG_VLAN_8021Q_MVRP=y
# CONFIG_DECNET is not set
CONFIG_LLC=m