summaryrefslogtreecommitdiffstats
path: root/include/pcmcia/device_id.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-07-07 23:00:14 +0200
committerDavid S. Miller <davem@davemloft.net>2021-07-07 23:00:14 +0200
commitd7fba8ff3e50fb25ffe583bf945df052f6caffa2 (patch)
treecc04bf37e26e2b4210fc8b27f3e7c75ffbf37624 /include/pcmcia/device_id.h
parentselftests: icmp_redirect: IPv6 PMTU info should be cleared after redirect (diff)
parentnetfilter: uapi: refer to nfnetlink_conntrack.h, not nf_conntrack_netlink.h (diff)
downloadlinux-d7fba8ff3e50fb25ffe583bf945df052f6caffa2.tar.xz
linux-d7fba8ff3e50fb25ffe583bf945df052f6caffa2.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains Netfilter fixes for net: 1) Do not refresh timeout in SYN_SENT for syn retransmissions. Add selftest for unreplied TCP connection, from Florian Westphal. 2) Fix null dereference from error path with hardware offload in nftables. 3) Remove useless nf_ct_gre_keymap_flush() from netns exit path, from Vasily Averin. 4) Missing rcu read-lock side in ctnetlink helper info dump, also from Vasily. 5) Do not mark RST in the reply direction coming after SYN packet for an out-of-sync entry, from Ali Abdallah and Florian Westphal. 6) Add tcp_ignore_invalid_rst sysctl to allow to disable out of segment RSTs, from Ali. 7) KCSAN fix for nf_conntrack_all_lock(), from Manfred Spraul. 8) Honor NFTA_LAST_SET in nft_last. 9) Fix incorrect arithmetics when restore last_jiffies in nft_last. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/pcmcia/device_id.h')
0 files changed, 0 insertions, 0 deletions