dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v6.12-rc2' into test2

Browse Source 
Linux 6.12-rc2

Resolved movement of asm/unaligned.h to linux/unaligned.h
This commit is contained in:
Jonathan Cameron
2024-10-12 11:43:29 +01:00
parent 6a9262edff 8cf0b93919
commit 220c71dafa
1193 changed files with 3936 additions and 3242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/uapi/linux/netfilter/nf_tables.h
+1 -1
View File
@@ -1694,7 +1694,7 @@ enum nft_flowtable_flags {
*
* @NFTA_FLOWTABLE_TABLE: name of the table containing the expression (NLA_STRING)
* @NFTA_FLOWTABLE_NAME: name of this flow table (NLA_STRING)
* @NFTA_FLOWTABLE_HOOK: netfilter hook configuration(NLA_U32)
* @NFTA_FLOWTABLE_HOOK: netfilter hook configuration (NLA_NESTED)
* @NFTA_FLOWTABLE_USE: number of references to this flow table (NLA_U32)
* @NFTA_FLOWTABLE_HANDLE: object handle (NLA_U64)
* @NFTA_FLOWTABLE_FLAGS: flags (NLA_U32)