diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-19 16:15:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-19 16:15:54 -0700 |
| commit | 7c1cfacca2083db519317f49f31e143d97fd554a (patch) | |
| tree | 95bb307ea7a53393b3391806cd9f2ab87cd974f0 /net/ipv6/xfrm6_state.c | |
| parent | 7c3895383fea48dab2374b04a936de4717a85a81 (diff) | |
| parent | 707d4eefbdb31f8e588277157056b0ce637d6c68 (diff) | |
| download | op-kernel-dev-7c1cfacca2083db519317f49f31e143d97fd554a.zip op-kernel-dev-7c1cfacca2083db519317f49f31e143d97fd554a.tar.gz | |
Merge tag 'pci-v3.14-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI resource management fix from Bjorn Helgaas:
"This is a fix for an AGP regression exposed by e501b3d87f00 ("agp:
Support 64-bit APBASE"), which we merged in v3.14-rc1.
We've warned about the conflict between the GART and PCI resources and
cleared out the PCI resource for a long time, but after e501b3d87f00,
we still *use* that cleared-out PCI resource. I think the GART
resource is incorrect, so this patch removes it"
* tag 'pci-v3.14-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
Revert "[PATCH] Insert GART region into resource map"
Diffstat (limited to 'net/ipv6/xfrm6_state.c')
0 files changed, 0 insertions, 0 deletions
