obj-$(CONFIG_PHONET) += phonet.o pn_pep.o phonet-y := \ pn_dev.o \ pn_netlink.o \ socket.o \ datagram.o \ sysctl.o \ af_phonet.o pn_pep-y := pep.o pep-gprs.o cript' src='/cgit.js'>
summaryrefslogtreecommitdiff
path: root/include/net/mpls_iptunnel.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-22 12:47:48 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-22 12:47:48 -0800
commit095cbe66973771fecd8e8b1e8763181363ef703e (patch)
treec361a93d62ed171ac958deb0d4ff0faa980bb290 /include/net/mpls_iptunnel.h
parent24b86839fab8e8059d2b16e0067dc86a1a0d3514 (diff)
parent020eb3daaba2857b32c4cf4c82f503d6a00a67de (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: "Restore the retrigger callbacks in the IO APIC irq chips. That addresses a long standing regression which got introduced with the rewrite of the x86 irq subsystem two years ago and went unnoticed so far" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/ioapic: Restore IO-APIC irq_chip retrigger callback
Diffstat (limited to 'include/net/mpls_iptunnel.h')