diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-07-25 10:31:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-10 20:36:21 +0200 |
| commit | 594c0401a16c164db9baac20c9d2721bb0527cbf (patch) | |
| tree | 3328207ecbbe30bc9f15aec20ee2fcdce9a4c3ae /main/linux-vanilla | |
| parent | 88b2ec3dab0a34f907590f5d3c91dcd65542f6ca (diff) | |
| download | aports-594c0401a16c164db9baac20c9d2721bb0527cbf.tar.bz2 aports-594c0401a16c164db9baac20c9d2721bb0527cbf.tar.xz | |
main/linux-vanilla: fix config for aarch64
(cherry picked from commit d740895154b7200c50df025a595df8e2e5464fca)
Diffstat (limited to 'main/linux-vanilla')
| -rw-r--r-- | main/linux-vanilla/APKBUILD | 2 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.aarch64 | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index f628245321..e4f650d6f0 100644 --- a/main/linux-vanilla/APKBUILD +++ b/main/linux-vanilla/APKBUILD @@ -222,7 +222,7 @@ _dev() { sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz 5373728be2b507c3db5e042e1d768740df7965078868afdc46418b1adc4cae3d8f9f1aedb59975a0f2acf8754340499354fcf97c503397a5d9886ccc9689b782 0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch -b79afa544256df295ed2a904d917efe7048aa0d30951732d0809de1dd3e423c5f0138f16a1854a95df35f850c213fbaacde87a701f5cf6ed09349907e3d54744 config-vanilla.aarch64 +b7d8a264cdd08b2661710d4326ec7bbaa35363dd19a390a7ffaf157eadb59291e1c6f027fbc242e7851e17d7721a7fc8cbd4642327e52398fd8634e8ef742061 config-vanilla.aarch64 251b9498b18929724b084718085709ba4f899820f3373231744918f7bc1d8d02554529ddcf249a6e952e55eb2c3d908c6fc2dacc773a44a3587e48dbdf3dd358 config-vanilla.armhf 052ccc49fdefe0d8ed3e6119a1ab632a7b9020ea9cbb54b8055f1e45334244a3dd8534fed3bc2f3f9a3bcb9363795d48fc4c6c48cf7032f6202b09971dc9e181 config-vanilla.x86 41729137917ee5e06a76ce2c2b4d1d153eb493efb7a9cd7881367934db9ad8d9a9251071923d8d26f1e7a030d702f4dd66e24d4d26a294f957db27bb42f9d40d config-vanilla.x86_64 diff --git a/main/linux-vanilla/config-vanilla.aarch64 b/main/linux-vanilla/config-vanilla.aarch64 index 8f042a3ff9..f53bc23924 100644 --- a/main/linux-vanilla/config-vanilla.aarch64 +++ b/main/linux-vanilla/config-vanilla.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.41 Kernel Configuration +# Linux/arm64 4.14.57 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -606,6 +606,7 @@ CONFIG_XEN=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_ARM64_SSBD=y CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y @@ -1131,6 +1132,9 @@ CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m # CONFIG_NFT_FIB_IPV6 is not set @@ -1138,10 +1142,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m |