diff options
author | Dave Airlie <airlied@redhat.com> | 2015-05-20 16:23:53 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-05-20 16:23:53 +1000 |
commit | bdcddf95e82b1c4e370fc1196b1f4f50f775dab4 (patch) | |
tree | ef2af2b3faee1f8e8287ca45d265809f56fbd0f6 /block/blk-sysfs.c | |
parent | 91d9f9856f91c82ac6289a0fff65dd12cfa07e34 (diff) | |
parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) |
Backmerge v4.1-rc4 into into drm-next
We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/drm_irq.c
Diffstat (limited to 'block/blk-sysfs.c')
-rw-r--r-- | block/blk-sysfs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index faaf36ade7eb..2b8fd302f677 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -522,8 +522,6 @@ static void blk_release_queue(struct kobject *kobj) blk_trace_shutdown(q); - bdi_destroy(&q->backing_dev_info); - ida_simple_remove(&blk_queue_ida, q->id); call_rcu(&q->rcu_head, blk_free_queue_rcu); } |