* [patch -next] drm/radeon: missing break statement
@ 2015-06-23 11:51 Dan Carpenter
2015-06-23 11:56 ` Christian König
2015-06-23 18:19 ` Stephen Rothwell
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2015-06-23 11:51 UTC (permalink / raw)
To: Alex Deucher, Stephen Rothwell
Cc: kernel-janitors, Christian König, dri-devel
There was a merge problem in linux-next 4598d330d29e ('Merge
remote-tracking branch 'drm/drm-next''). We need to add a break
statement.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index b4b457d..4a119c2 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -578,6 +578,7 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file
break;
case RADEON_INFO_VA_UNMAP_WORKING:
*value = true;
+ break;
case RADEON_INFO_GPU_RESET_COUNTER:
*value = atomic_read(&rdev->gpu_reset_counter);
break;
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [patch -next] drm/radeon: missing break statement
2015-06-23 11:51 [patch -next] drm/radeon: missing break statement Dan Carpenter
@ 2015-06-23 11:56 ` Christian König
2015-06-23 18:19 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Christian König @ 2015-06-23 11:56 UTC (permalink / raw)
To: Dan Carpenter, Alex Deucher, Stephen Rothwell
Cc: David Airlie, dri-devel, kernel-janitors
On 23.06.2015 13:51, Dan Carpenter wrote:
> There was a merge problem in linux-next 4598d330d29e ('Merge
> remote-tracking branch 'drm/drm-next''). We need to add a break
> statement.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Good catch, fortunately only an issue in drm-next.
Reviewed-by: Christian König <christian.koenig@amd.com>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
> index b4b457d..4a119c2 100644
> --- a/drivers/gpu/drm/radeon/radeon_kms.c
> +++ b/drivers/gpu/drm/radeon/radeon_kms.c
> @@ -578,6 +578,7 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file
> break;
> case RADEON_INFO_VA_UNMAP_WORKING:
> *value = true;
> + break;
> case RADEON_INFO_GPU_RESET_COUNTER:
> *value = atomic_read(&rdev->gpu_reset_counter);
> break;
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch -next] drm/radeon: missing break statement
2015-06-23 11:51 [patch -next] drm/radeon: missing break statement Dan Carpenter
2015-06-23 11:56 ` Christian König
@ 2015-06-23 18:19 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2015-06-23 18:19 UTC (permalink / raw)
To: Dan Carpenter
Cc: Alex Deucher, Christian König, David Airlie, dri-devel,
kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
Hi Dan,
On Tue, 23 Jun 2015 14:51:48 +0300 Dan Carpenter <dan.carpenter@oracle.com> wrote:
>
> There was a merge problem in linux-next 4598d330d29e ('Merge
> remote-tracking branch 'drm/drm-next''). We need to add a break
> statement.
Thanks for noticing. I have fixed my merge resolution for the next
release and hopefully Linus will do it right when he merges the drm
tree (if it is still necessary).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-23 18:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-23 11:51 [patch -next] drm/radeon: missing break statement Dan Carpenter
2015-06-23 11:56 ` Christian König
2015-06-23 18:19 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox