diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-04-04 13:27:42 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-04-04 13:27:42 -0500 |
| commit | a5c6ad7840e1a37c2111612d96d99a5edb6e5502 (patch) | |
| tree | bc0614f57ba8bc0245bfb5d6ff9b73978c78691b /net/unix/sysctl_net_unix.c | |
| parent | 315271b0ff1976e8c4a1c2620cef39047a003390 (diff) | |
| parent | 13d3047c81505cc0fb9bdae7810676e70523c8bf (diff) | |
Merge branch 'pci/hotplug'
- fix possible cpqphp NULL pointer dereference (Shawn Lin)
- rescan more of the hierarchy on ACPI hotplug to fix Thunderbolt/xHCI
hotplug (Mika Westerberg)
* pci/hotplug:
ACPI / hotplug / PCI: Check presence of slot itself in get_slot_status()
PCI: cpqphp: Fix possible NULL pointer dereference
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions