Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.1.0-0.rc2.git3.1.vanilla.knurd.1.fc31kernel-5.1.0-0.rc2.git3.1.vanilla.knurd.1.fc30kernel-5.1.0-0.rc2.git3.1.vanilla.knurd.1.fc29kernel-5.1.0-0.rc2.git3.1.vanilla.knurd.1.fc28

21 files changed, 72 insertions, 48 deletions

diff --git a/configs/fedora/generic/CONFIG_IP_NF_FILTER b/configs/fedora/generic/CONFIG_IP_NF_FILTER
index 25420dc0e..24e5d7ee2 100644
--- a/configs/fedora/generic/CONFIG_IP_NF_FILTER
+++ b/configs/fedora/generic/CONFIG_IP_NF_FILTER
@@ -1 +1 @@
-CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_FILTER=m
diff --git a/configs/fedora/generic/CONFIG_IP_NF_IPTABLES b/configs/fedora/generic/CONFIG_IP_NF_IPTABLES
index c8db0b068..5238d9e0b 100644
--- a/configs/fedora/generic/CONFIG_IP_NF_IPTABLES
+++ b/configs/fedora/generic/CONFIG_IP_NF_IPTABLES
@@ -1 +1 @@
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_IPTABLES=m
diff --git a/configs/fedora/generic/CONFIG_IP_NF_TARGET_REJECT b/configs/fedora/generic/CONFIG_IP_NF_TARGET_REJECT
index 688d27b6a..7db5e7783 100644
--- a/configs/fedora/generic/CONFIG_IP_NF_TARGET_REJECT
+++ b/configs/fedora/generic/CONFIG_IP_NF_TARGET_REJECT
@@ -1 +1 @@
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
diff --git a/configs/fedora/generic/CONFIG_NF_REJECT_IPV4 b/configs/fedora/generic/CONFIG_NF_REJECT_IPV4
new file mode 100644
index 000000000..8223fd900
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NF_REJECT_IPV4
@@ -0,0 +1 @@
+CONFIG_NF_REJECT_IPV4=m
diff --git a/gitrev b/gitrev
index 5fe642c60..b00b57eaa 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-65ae689329c5d6a149b9201df9321368fbdb6a5c
+8c7ae38d1ce12a0eaeba655df8562552b3596c7f
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index f980f25c5..14e56c0f5 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2590,8 +2590,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2605,7 +2605,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -3987,6 +3987,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FAULT_INJECTION=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 270ef1ad1..c97bc335c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2574,8 +2574,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2589,7 +2589,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -3967,6 +3967,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index c665591ec..c3a758609 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2634,8 +2634,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2649,7 +2649,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -4089,6 +4089,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FAULT_INJECTION=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index cbfb9c4a4..5b07a2d3c 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2535,8 +2535,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2550,7 +2550,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -3952,6 +3952,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FAULT_INJECTION=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 7ce530afb..d038b57a7 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2520,8 +2520,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2535,7 +2535,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -3933,6 +3933,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index c1cb0a650..5bccfb46c 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2619,8 +2619,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2634,7 +2634,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -4070,6 +4070,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index e47ea6983..c26820bc2 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2377,8 +2377,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2392,7 +2392,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -3723,6 +3723,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FAULT_INJECTION=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 94c0324a7..ab9a380bc 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2360,8 +2360,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2375,7 +2375,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -3704,6 +3704,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index f170a4b15..83dc0cb05 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2145,8 +2145,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2160,7 +2160,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -3449,6 +3449,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FAULT_INJECTION=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 922d4f2ce..515366ec6 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2128,8 +2128,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2143,7 +2143,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -3428,6 +3428,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index c212ea6d6..5c8fceda9 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2123,8 +2123,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2138,7 +2138,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -3419,6 +3419,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FAULT_INJECTION=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 1a87cb9b2..17754b608 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2106,8 +2106,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2121,7 +2121,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -3398,6 +3398,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 53e740b08..4aa25da33 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2431,8 +2431,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2446,7 +2446,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -3767,6 +3767,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FAULT_INJECTION=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 0827ec6b9..96ceff717 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2414,8 +2414,8 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2429,7 +2429,7 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_PIMSM_V1=y
@@ -3748,6 +3748,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
diff --git a/kernel.spec b/kernel.spec
index e8d40cadc..884ed211d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 2
 # The git snapshot level
-%define gitrev 1
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -1884,6 +1884,15 @@ fi
 #
 #
 %changelog
+* Thu Mar 28 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc2.git3.1
+- Linux v5.1-rc2-243-g8c7ae38d1ce1
+
+* Wed Mar 27 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc2.git2.1
+- Linux v5.1-rc2-24-g14c741de9386
+
+* Wed Mar 27 2019 Jeremy Cline <jeremy@jcline.org>
+- Build iptable_filter as module
+
 * Tue Mar 26 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc2.git1.1
 - Linux v5.1-rc2-16-g65ae689329c5
 
diff --git a/sources b/sources
index cfbdef50e..9fa67d08e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0
 SHA512 (patch-5.1-rc2.xz) = 97ea50f639b986b9cee8d44d01bddb25c92fd263322f9a22e4bdf06307f1a67ad9d345666928ba9a790b0f366bb012b748bd0e073999d4547e1cafc9ecdc770e
-SHA512 (patch-5.1-rc2-git1.xz) = e5fcb505d725fdcb541e54092a7a7c1ef6ca7bd5d00d60d4e89c9c215c775e26442b402b83b16f93e5bf1287e0e67d9c00cb9f8a9fb22f4d993a55c234e63ab9
+SHA512 (patch-5.1-rc2-git3.xz) = 2f4164f2203e14b5e5b86c97dee91ea158561407ad8bfaf7fa2898519312e566a98510898eebea57868d3777b7513587089646a79ebcf078f349ce72d218dea6