diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-01 02:48:29 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-01 02:48:29 +0100 |
| commit | 08da742ef93c0ba337b471204d52540eb9771290 (patch) | |
| tree | f168e49df49de9890b55d5a1e7513c0946400e62 /drivers/edac/pasemi_edac.c | |
| parent | x86_64, entry: Fix out of bounds read on sysenter (diff) | |
| parent | PCI: Rename sysfs 'enabled' file back to 'enable' (diff) | |
| download | linux-08da742ef93c0ba337b471204d52540eb9771290.tar.xz linux-08da742ef93c0ba337b471204d52540eb9771290.zip | |
Merge tag 'pci-v3.18-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"These changes, intended for v3.18, fix:
Sysfs
- Fix "enable" filename change (Greg Kroah-Hartman)
An unintentional sysfs filename change in commit 5136b2da770d
("PCI: convert bus code to use dev_groups"), which appeared in
v3.13, changed "enable" to "enabled", and this changes it back.
Old users of "enable" are currently broken and will be helped by
this change. Anything that started to use "enabled" after v3.13
will be broken by this change. If necessary, we can add a symlink
to make both work, but this patch doesn't do that.
PCI device hotplug
- Revert duplicate merge (Kamal Mostafa)
A mistaken duplicate merge that added a check twice. Nothing's
broken; this just removes the unnecessary code.
Freescale i.MX6
- Wait for clocks to stabilize after ref_en (Richard Zhu)
An i.MX6 clock problem that prevents mx6 nitrogen boards from booting"
* tag 'pci-v3.18-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Rename sysfs 'enabled' file back to 'enable'
PCI: imx6: Wait for clocks to stabilize after ref_en
Revert duplicate "PCI: pciehp: Prevent NULL dereference during probe"
Diffstat (limited to 'drivers/edac/pasemi_edac.c')
0 files changed, 0 insertions, 0 deletions