summaryrefslogtreecommitdiff
path: root/proto_icmpv4.c
diff options
context:
space:
mode:
Diffstat (limited to 'proto_icmpv4.c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-03 13:32:46 +0000
x/net-next.git/diff/?id=9ca581b50dab6103183396852cc08e440fcda18e&id2=1c3333600b0ebca94edffb3bb431c78687dc3d36'>diff)parentd1992996753132e2dafe955cccb2fb0714d3cfc4 (diff)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Thomas Gleixner: "A single fix for an AMD erratum so machines without a BIOS fix work" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/AMD: Apply erratum 665 on machines without a BIOS fix
Diffstat
parent
76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nft_queue.c')