diff mbox

drm/i915: add missing \n to UTS_RELEASE in the error_state

Message ID 1360833815-582-1-git-send-email-jani.nikula@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jani Nikula Feb. 14, 2013, 9:23 a.m. UTC 
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(-)

Comments

Chris Wilson Feb. 14, 2013, 10:02 a.m. UTC | #1 
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
Daniel Vetter Feb. 14, 2013, 12:27 p.m. UTC | #2 
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
diff mbox

Patch

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);