Merge tag 'v5.14-rc6' into android-mainline

Linux 5.14-rc6 Change-Id: I2a11e448621a8133f80acbc241a1851d33bc38fb Signed-off-by: Lee Jones <lee.jones@linaro.org>
2021-08-16 09:30:14 +01:00
parent 574d6e2909 7c60610d47
commit ab4d4efea8
289 changed files with 2230 additions and 1597 deletions
@@ -196,6 +196,9 @@ struct ip_set_region {
 	u32 elements;		/* Number of elements vs timeout */
 };

+/* Max range where every element is added/deleted in one step */
+#define IPSET_MAX_RANGE		(1<<20)
+
 /* The max revision number supported by any set type + 1 */
 #define IPSET_REVISION_MAX	9