sugar/linux
1
0
Fork 0
Code Activity

Merge tag 'v4.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mtd/next

Browse Source 
Backmerge v4.16-rc2 into mtd/next to resolve a conflict between Linus'
master branch and nand/for-4.17.
This commit is contained in:
Boris Brezillon
2018-04-04 22:13:35 +02:00
parent a88b5f3833 91ab883eb2
commit fe5f31a801
281 changed files with 3898 additions and 2405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c
View File

@@ -73,6 +73,8 @@ static int __init its_fsl_mc_msi_init(void)
for (np = of_find_matching_node(NULL, its_device_id); np;
np = of_find_matching_node(np, its_device_id)) {
if (!of_device_is_available(np))
continue;
if (!of_property_read_bool(np, "msi-controller"))
continue;