Saravana Kannan dfaca803ef ANDROID: Conflict fix for merging 4.19.112 ...

This fixes the merge issue with 515db266a9da ("driver core: Remove
device link creation limitation")

Change-Id: I848f7ad9ee63aaef74c78488ffd57a751f28a795
Cc: Saravana Kannan <saravanak@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

2020-03-21 09:52:25 +01:00

..

firmware_loader

FROMGIT: firmware_class: make firmware caching configurable

2019-11-27 21:40:15 +00:00

power

Merge 4.19.112 into android-4.19

2020-03-21 08:37:27 +01:00

regmap

soundwire: fix regmap dependencies and align with other serial links

2019-10-07 18:57:27 +02:00

test

…

arch_topology.c

ANDROID: implement max frequency capping

2018-10-26 12:25:24 +01:00

attribute_container.c

…

base.h

driver core: Establish order of operations for device_add and device_del via bitflag

2019-08-09 17:52:28 +02:00

bus.c

kobject: return error code if writing /sys/.../uevent fails

2019-02-12 19:47:06 +01:00

cacheinfo.c

drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT

2019-07-21 09:03:03 +02:00

class.c

…

component.c

component: do not dereference opaque pointer in debugfs

2020-02-01 09:37:03 +00:00

container.c

…

core.c

ANDROID: Conflict fix for merging 4.19.112

2020-03-21 09:52:25 +01:00

cpu.c

Merge 4.19.84 into android-4.19

2019-11-14 14:15:21 +08:00

dd.c

driver core: Add device link flag DL_FLAG_AUTOPROBE_CONSUMER

2020-03-20 11:55:58 +01:00

devcon.c

…

devcoredump.c

…

devres.c

devres: Align data[] to ARCH_KMALLOC_MINALIGN

2019-02-12 19:46:56 +01: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

base: fix order of OF initialization

2018-07-07 17:54:29 +02:00

isa.c

…

Kconfig

UPSTREAM: Make anon_inodes unconditional

2019-08-12 13:36:37 -04: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: fix try_offline_node()

2020-01-29 16:43:27 +01:00

module.c

…

node.c

Merge 4.19.100 into android-4.19

2020-01-29 17:10:45 +01:00

pinctrl.c

…

platform-msi.c

platform-msi: Free descriptors in platform_msi_domain_free()

2019-01-09 17:38:42 +01:00

platform.c

driver core: platform: fix u32 greater or equal to zero comparison

2020-02-24 08:34:50 +01:00

property.c

device property: Get rid of union aliasing

2018-05-17 12:47:21 +02:00

soc.c

base: soc: Export soc_device_register/unregister APIs

2019-10-05 13:09:37 +02:00

syscore.c

ANDROID: power: wakeup_reason: add an API to log wakeup reasons

2018-12-05 09:48:13 -08:00

topology.c

…

transport_class.c

…