Merge 626bf91a29 ("Merge tag 'net-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") into android-mainline

Steps on the way to 5.15-rc1 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I679be256fdc4432bdd97eba340694176ce403109
2021-09-15 12:05:25 +02:00
parent c47abe0f1f 626bf91a29
commit ab9ab647e5
242 changed files with 4293 additions and 2452 deletions
@@ -18,6 +18,7 @@ struct ip_conntrack_stat {
 	unsigned int expect_create;
 	unsigned int expect_delete;
 	unsigned int search_restart;
+	unsigned int chaintoolong;
 };

 #define NFCT_INFOMASK	7UL