David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-02 10:55:32 -07:00
..
firmware_loader	treewide: Use array_size() in vmalloc()	2018-06-12 16:19:22 -07:00
power	PM / Domains: Don't power on at attach for the multi PM domain case	2018-07-03 16:42:51 +02:00
regmap	Merge branch 'regmap-4.17' into regmap-4.18 for the merge window	2018-06-04 12:03:03 +01:00
test
arch_topology.c
attribute_container.c
base.h	PM / core: fix deferred probe breaking suspend resume order	2018-04-24 12:18:25 +02:00
bus.c	driver core: hold dev's parent lock when needed	2018-05-31 10:12:07 +02:00
cacheinfo.c	drivers: base cacheinfo: Add support for ACPI based firmware tables	2018-05-17 17:28:09 +01:00
class.c
component.c
container.c
core.c	driver core: set up ownership of class devices in sysfs	2018-07-20 23:44:35 -07:00
cpu.c	x86/bugs: Expose /sys/../spec_store_bypass	2018-05-03 13:55:47 +02:00
dd.c	driver core: Partially revert "driver core: correct device's shutdown order"	2018-07-10 17:47:43 +02:00
devcon.c
devcoredump.c
devres.c	device: Use overflow helpers for devm_kmalloc()	2018-06-05 12:16:51 -07:00
devtmpfs.c	kernel: add ksys_unshare() helper; remove in-kernel calls to sys_unshare()	2018-04-02 20:16:06 +02:00
driver.c	driver-core: return EINVAL error instead of BUG_ON()	2018-05-25 18:18:45 +02:00
firmware.c
hypervisor.c
init.c
isa.c
Kconfig	firmware_loader: move kconfig FW_LOADER entries to its own file	2018-05-14 16:43:10 +02:00
Makefile	dma-mapping: move all DMA mapping code to kernel/dma	2018-06-14 08:50:37 +02:00
map.c
memory.c	mm: memory_hotplug: use put_device() if device_register fail	2018-05-14 16:48:59 +02:00
module.c
node.c	mm/memory_hotplug: fix leftover use of struct page during hotplug	2018-05-25 18:12:11 -07:00
pinctrl.c
platform-msi.c	genirq/msi: Limit level-triggered MSI to platform devices	2018-05-13 15:58:59 +02:00
platform.c	Power management updates for 4.18-rc1	2018-06-05 09:38:39 -07:00
property.c	device property: Get rid of union aliasing	2018-05-17 12:47:21 +02:00
soc.c
syscore.c
topology.c
transport_class.c