apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v4.5-rc6' into core/resources, to resolve conflict

Browse Source 
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2016-03-04 12:12:08 +01:00
parent 4650bac1fc fc77dbd34c
commit bc94b99636
1279 changed files with 15377 additions and 62169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/resource.c
+3 -2
View File
@@ -1098,9 +1098,10 @@ struct resource * __request_region(struct resource *parent,
if (!conflict)
break;
if (conflict != parent) {
parent = conflict;
if (!(conflict->flags & IORESOURCE_BUSY))
if (!(conflict->flags & IORESOURCE_BUSY)) {
parent = conflict;
continue;
}
}
if (conflict->flags & flags & IORESOURCE_MUXED) {
add_wait_queue(&muxed_resource_wait, &wait);