On Tue, 2016-03-22 at 22:49 +0000, Colin King wrote: > From: Colin Ian King <colin.king at canonical.com> > > There is a missing comma between two strings in the dsi_errors[] > array initializer, causing two strings to be concatenated and the > array being incorrectly initialized.  Add in the missing comma. > > Signed-off-by: Colin Ian King <colin.king at canonical.com> > --- >  drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 2 +- >  1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c > b/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c > index 6b43ae3..1616af2 100644 > --- a/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c > +++ b/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c > @@ -72,7 +72,7 @@ static const char *const dsi_errors[] = { >  "RX Prot Violation", >  "HS Generic Write FIFO Full", >  "LP Generic Write FIFO Full", > - "Generic Read Data Avail" > + "Generic Read Data Avail", >  "Special Packet Sent", >  "Tearing Effect", >  };
>From 2011: https://lkml.org/lkml/2011/7/8/197 and commit fc5ace7ed2a58e32047abf65ff8b5a6432e92fac Author: Dan Carpenter <error27 at gmail.com> Date:   Fri Jul 8 09:45:19 2011 +0100     Staging: gma500: typo in array initialization         There is a comma missing here between the strings so they were     concatenated by mistake.         Signed-off-by: Dan Carpenter <error27 at gmail.com>     Signed-off-by: Alan Cox <alan at linux.intel.com>     Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de> Apparently this wasn't merged back into this version. Are there any other changes in that old staging version that also need to be merged back?