* [PATCH] drm/i915: add missing \n to UTS_RELEASE in the error_state
@ 2013-02-14 9:23 Jani Nikula
2013-02-14 10:02 ` [Intel-gfx] " Chris Wilson
0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2013-02-14 9:23 UTC (permalink / raw)
To: intel-gfx; +Cc: daniel, jani.nikula, stable
Amending
commit 4518f611ba21ba165ea3714055938a8984a44ff9
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed Jan 23 16:16:35 2013 +0100
drm/i915: dump UTS_RELEASE into the error_state
CC: stable@vger.kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
on top of drm-intel-fixes
---
drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 8cb1391..0911fcd 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -694,7 +694,7 @@ static int i915_error_state(struct seq_file *m, void *unused)
seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
error->time.tv_usec);
- seq_printf(m, "Kernel: " UTS_RELEASE);
+ seq_printf(m, "Kernel: " UTS_RELEASE "\n");
seq_printf(m, "PCI ID: 0x%04x\n", dev->pci_device);
seq_printf(m, "EIR: 0x%08x\n", error->eir);
seq_printf(m, "IER: 0x%08x\n", error->ier);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915: add missing \n to UTS_RELEASE in the error_state
2013-02-14 9:23 [PATCH] drm/i915: add missing \n to UTS_RELEASE in the error_state Jani Nikula
@ 2013-02-14 10:02 ` Chris Wilson
2013-02-14 12:27 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Chris Wilson @ 2013-02-14 10:02 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, stable
On Thu, Feb 14, 2013 at 11:23:35AM +0200, Jani Nikula wrote:
> Amending
> commit 4518f611ba21ba165ea3714055938a8984a44ff9
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date: Wed Jan 23 16:16:35 2013 +0100
>
> drm/i915: dump UTS_RELEASE into the error_state
Perhaps mention which commit introduced UTS_RELEASE, though I thnk the
any stable conflict will be remarkably easy to resolve.
> CC: stable@vger.kernel.org
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
And I just got used to the enhanced PCI ID string.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: add missing \n to UTS_RELEASE in the error_state
2013-02-14 10:02 ` [Intel-gfx] " Chris Wilson
@ 2013-02-14 12:27 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2013-02-14 12:27 UTC (permalink / raw)
To: Chris Wilson, Jani Nikula, intel-gfx, stable
On Thu, Feb 14, 2013 at 10:02:12AM +0000, Chris Wilson wrote:
> On Thu, Feb 14, 2013 at 11:23:35AM +0200, Jani Nikula wrote:
> > Amending
> > commit 4518f611ba21ba165ea3714055938a8984a44ff9
> > Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Date: Wed Jan 23 16:16:35 2013 +0100
> >
> > drm/i915: dump UTS_RELEASE into the error_state
>
> Perhaps mention which commit introduced UTS_RELEASE, though I thnk the
> any stable conflict will be remarkably easy to resolve.
>
> > CC: stable@vger.kernel.org
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> And I just got used to the enhanced PCI ID string.
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-14 12:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-14 9:23 [PATCH] drm/i915: add missing \n to UTS_RELEASE in the error_state Jani Nikula
2013-02-14 10:02 ` [Intel-gfx] " Chris Wilson
2013-02-14 12:27 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox