apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'linus' into tracing/hw-branch-tracing

Browse Source
This commit is contained in:
Ingo Molnar
2008-12-24 21:08:26 +01:00
parent c5dee6177f c20137fc53
commit db8862eafe
86 changed files with 468 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/netfilter/nfnetlink_conntrack.h
+1
View File
@@ -141,6 +141,7 @@ enum ctattr_protonat {
#define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1)
enum ctattr_natseq {
CTA_NAT_SEQ_UNSPEC,
CTA_NAT_SEQ_CORRECTION_POS,
CTA_NAT_SEQ_OFFSET_BEFORE,
CTA_NAT_SEQ_OFFSET_AFTER,