summaryrefslogtreecommitdiff
path: root/include/net/netns/mpls.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-02 12:34:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-02 12:34:27 -0800
commitf2557779e1a9cfbf69c99b74da26cc1b2b10e752 (patch)
tree8ddca65c897199add553948c429072b8bd463692 /include/net/netns/mpls.h
parent6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff)
parent030305d69fc6963c16003f50d7e8d74b02d0a143 (diff)
Merge tag 'pci-v4.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas: "Configure ASPM on the link from a PCI-to-PCIe bridge (avoids a NULL pointer dereference on topologies including these bridges)" * tag 'pci-v4.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI/ASPM: Handle PCI-to-PCIe bridges as roots of PCIe hierarchies
Diffstat (limited to 'include/net/netns/mpls.h')
0 files changed, 0 insertions, 0 deletions