diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 10:00:59 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 10:00:59 +0100 |
| commit | c6eefb3bfcbdd5eff91a79f309d1c7512da148ee (patch) | |
| tree | c9313dea2f591c6b50cdcd706902ec826d7d1768 /extra/linux-pae/config | |
| parent | 3c6574f7ca67c5167f6ba35f0318f76ef72f1779 (diff) | |
| parent | 6128197682f03bec73f8eba04df2d7114caf54cc (diff) | |
| download | packages-c6eefb3bfcbdd5eff91a79f309d1c7512da148ee.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'extra/linux-pae/config')
| -rw-r--r-- | extra/linux-pae/config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/linux-pae/config b/extra/linux-pae/config index 6df3f170..acaa82d1 100644 --- a/extra/linux-pae/config +++ b/extra/linux-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.11-1 Kernel Configuration +# Linux/x86 4.18.13-1 Kernel Configuration # # @@ -1330,8 +1330,8 @@ CONFIG_NF_LOG_ARP=m CONFIG_NF_LOG_IPV4=m CONFIG_NF_REJECT_IPV4=m CONFIG_NF_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV4=m CONFIG_NF_NAT_MASQUERADE_IPV4=y +CONFIG_NFT_CHAIN_NAT_IPV4=m CONFIG_NFT_MASQ_IPV4=m CONFIG_NFT_REDIR_IPV4=m CONFIG_NF_NAT_SNMP_BASIC=m |