Merge tag 'v6.6-rc5' into android-mainline

Linux 6.6-rc5

Change-Id: Icbea273c6232072458b245816885fcf0bc4e966f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-10-24 13:51:00 +00:00
274 changed files with 2990 additions and 1366 deletions
@@ -9,6 +9,7 @@ struct ip_ct_sctp {
enum sctp_conntrack state;
__be32 vtag[IP_CT_DIR_MAX];
u8 init[IP_CT_DIR_MAX];
u8 last_dir;
u8 flags;
};