diff --git a/configs/fedora/generic/CONFIG_NETFILTER_XT_TARGET_MASQUERADE b/configs/fedora/generic/CONFIG_NETFILTER_XT_TARGET_MASQUERADE new file mode 100644 index 000000000..37960b6b1 --- /dev/null +++ b/configs/fedora/generic/CONFIG_NETFILTER_XT_TARGET_MASQUERADE @@ -0,0 +1 @@ +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m diff --git a/configs/fedora/generic/riscv/CONFIG_SERIAL_SIFIVE_CONSOLE b/configs/fedora/generic/riscv/CONFIG_SERIAL_SIFIVE_CONSOLE index 4671067c4..1da71890b 100644 --- a/configs/fedora/generic/riscv/CONFIG_SERIAL_SIFIVE_CONSOLE +++ b/configs/fedora/generic/riscv/CONFIG_SERIAL_SIFIVE_CONSOLE @@ -1 +1 @@ -SERIAL_SIFIVE_CONSOLE=y +CONFIG_SERIAL_SIFIVE_CONSOLE=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 93a77001b..9de067db8 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -3847,6 +3847,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index cf06a4b4a..d1ea16ff6 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3827,6 +3827,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 43039452d..66c3bb97e 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -3940,6 +3940,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index dc9b82797..bc69eeaab 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -3811,6 +3811,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 0c0fe444d..68eaa0855 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -3792,6 +3792,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 2b65964e1..6f948e20d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -3921,6 +3921,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 79076166d..3c70ae7d8 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -3570,6 +3570,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-i686.config b/kernel-i686.config index 2ec38fbed..37ce38e86 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -3551,6 +3551,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 9bdd13830..6342edd7f 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3296,6 +3296,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 08c802b2e..974cd7bbc 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3275,6 +3275,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-riscv64-debug.config b/kernel-riscv64-debug.config index 55111e439..32d5350ea 100644 --- a/kernel-riscv64-debug.config +++ b/kernel-riscv64-debug.config @@ -3234,6 +3234,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m @@ -4650,6 +4651,7 @@ CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SERIAL_RP2 is not set # CONFIG_SERIAL_SC16IS7XX is not set # CONFIG_SERIAL_SCCNXP is not set +CONFIG_SERIAL_SIFIVE_CONSOLE=y CONFIG_SERIAL_SIFIVE=y # CONFIG_SERIAL_ST_ASC is not set # CONFIG_SERIAL_TIMBERDALE is not set @@ -6108,4 +6110,3 @@ CONFIG_ZSMALLOC=y CONFIG_ZSWAP=y # CONFIG_ZX_TDM is not set # CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set -SERIAL_SIFIVE_CONSOLE=y diff --git a/kernel-riscv64.config b/kernel-riscv64.config index 1d582ae2f..54029eb84 100644 --- a/kernel-riscv64.config +++ b/kernel-riscv64.config @@ -3213,6 +3213,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m @@ -4628,6 +4629,7 @@ CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SERIAL_RP2 is not set # CONFIG_SERIAL_SC16IS7XX is not set # CONFIG_SERIAL_SCCNXP is not set +CONFIG_SERIAL_SIFIVE_CONSOLE=y CONFIG_SERIAL_SIFIVE=y # CONFIG_SERIAL_ST_ASC is not set # CONFIG_SERIAL_TIMBERDALE is not set @@ -6085,4 +6087,3 @@ CONFIG_ZSMALLOC=y CONFIG_ZSWAP=y # CONFIG_ZX_TDM is not set # CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set -SERIAL_SIFIVE_CONSOLE=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 64c2cb0ee..9ad0bfc14 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3268,6 +3268,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 2bb03a6f5..6513fe6d7 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3247,6 +3247,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index d50106eba..4f32662ac 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -3615,6 +3615,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 136f461c5..3f4bfee7b 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -3596,6 +3596,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m