Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora

22 files changed, 28 insertions, 3 deletions

diff --git a/configs/fedora/generic/CONFIG_NF_TABLES_SET b/configs/fedora/generic/CONFIG_NF_TABLES_SET
new file mode 100644
index 000000000..172e018a7
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NF_TABLES_SET
@@ -0,0 +1 @@
+CONFIG_NF_TABLES_SET=m
diff --git a/gitrev b/gitrev
index 51be05a08..3c5d63f01 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-30b06abfb92bfd5f9b63ea6a2ffb0bd905d1a6da
+f39f28ff82c14b4f628973d9bba835195a71d437
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index a8cf42595..e7f0efd19 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4000,6 +4000,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 9412d1969..3eab68f2c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3978,6 +3978,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 949ff0791..86110c519 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4217,6 +4217,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 7f9dd24a9..f3118f300 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4035,6 +4035,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 687ac69ad..b49bd99ea 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4013,6 +4013,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 23ac3e52c..169f14913 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4195,6 +4195,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 7dcba514f..7aa906ed6 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3813,6 +3813,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 20867b93a..3e2b903f8 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3836,6 +3836,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 7917fa813..810b3f13c 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3836,6 +3836,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 78f5bf200..9b4236dbc 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3813,6 +3813,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index de5a7c02f..fb97f8b5d 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -3651,6 +3651,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 4c389d600..9bf502e93 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -3626,6 +3626,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 3fca8b41e..bb2795e12 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3595,6 +3595,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index ea69df97f..de79f63db 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3570,6 +3570,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 1624e2673..372f8350a 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3530,6 +3530,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index ebb994b00..d09739048 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3505,6 +3505,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 718a11f99..c2d2b55cd 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3881,6 +3881,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 5bcd34c52..bb87bcf2b 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3858,6 +3858,7 @@ CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NF_TABLES_SET=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
diff --git a/kernel.spec b/kernel.spec
index f672acd30..217b5f8d4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 5
 # The git snapshot level
-%define gitrev 1
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -1895,6 +1895,12 @@ fi
 #
 #
 %changelog
+* Thu Jul 19 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc5.git3.1
+- Linux v4.18-rc5-264-gf39f28ff82c1
+
+* Wed Jul 18 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc5.git2.1
+- Linux v4.18-rc5-37-g3c53776e29f8
+
 * Tue Jul 17 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc5.git1.1
 - Linux v4.18-rc5-36-g30b06abfb92b
 - Fix aio uapi breakage (rhbz 1601529)
diff --git a/sources b/sources
index eaee70e2b..0fc54f2da 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
 SHA512 (patch-4.18-rc5.xz) = 238685483f0eb95d95678dd4ddd83c044d3888bd4ccc6966c6f9e8209a21aea86c18ba4a8e10c9e0d78037bc4809a93196f44ee23e8f9463641a16ca1ea97574
-SHA512 (patch-4.18-rc5-git1.xz) = 297613110fb87dbb42363fdd961dd8e42214a55ed74bfd7b13c970a3a69ff509ea6cc836845c4bfbb1005c00adcad5adc58f9190d622046309e7007ea57f0846
+SHA512 (patch-4.18-rc5-git3.xz) = b8a5ee48452a630243a73d3a31921a9a3e0fbc298959bc8cf663dfdd10d07fb79df04e9b6662e358f9ff24dfadd0876682a2b5c8f00964a671c491c43e44330c