David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Both conflict were simple overlapping changes.

In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-04-21 20:23:53 -07:00

..

dwc

PCI: hisi: Fix DT binding (hisi-pcie-almost-ecam)

2017-04-12 10:46:47 -05:00

host

PCI: thunder-pem: Fix legacy firmware PEM-specific resources

2017-04-03 15:10:21 -05:00

hotplug

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

pcie

PCI/ASPM: Always set link->downstream to avoid NULL dereference on remove

2017-03-07 14:23:30 -06:00

access.c

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

ats.c

…

bus.c

…

ecam.c

…

host-bridge.c

…

hotplug-pci.c

…

htirq.c

…

iov.c

…

irq.c

…

Kconfig

…

Makefile

…

msi.c

PCI: remove pci_enable_msix

2017-04-11 11:16:03 -04:00

of.c

…

pci-acpi.c

…

pci-driver.c

…

pci-label.c

…

pci-mid.c

…

pci-stub.c

…

pci-sysfs.c

…

pci.c

…

pci.h

…

probe.c

…

proc.c

…

quirks.c

PCI: Prevent VPD access for QLogic ISP2722

2017-03-07 14:16:57 -06:00

remove.c

…

rom.c

…

search.c

…

setup-bus.c

…

setup-irq.c

…

setup-res.c

…

slot.c

…

syscall.c

…

vc.c

…

vpd.c

…

xen-pcifront.c

…