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

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 2cb59a641cd2..6a68ef5246d4 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -188,8 +188,9 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
                 }
                 dev[j] = rdev1;
 
-                disk_stack_limits(mddev->gendisk, rdev1->bdev,
-                                  rdev1->data_offset << 9);
+                if (mddev->queue)
+                        disk_stack_limits(mddev->gendisk, rdev1->bdev,
+                                          rdev1->data_offset << 9);
 
                 if (rdev1->bdev->bd_disk->queue->merge_bvec_fn)
                         conf->has_merge_bvec = 1;