Prev: soc/sh: Fix I2C dependency for SND_FSI_AK4642 and SND_FSI_DA7210
Next: [PATCH] procfs: Do not release pid_ns->proc_mnt too early
From: Jiri Kosina on 16 Jun 2010 12:10 On Fri, 11 Jun 2010, Uwe Kleine-König wrote: > Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> > --- > arch/sh/kernel/clkdev.c | 2 +- > drivers/staging/comedi/drivers/usbdux.c | 2 +- > drivers/staging/octeon/cvmx-cmd-queue.c | 6 +++--- > drivers/staging/pohmelfs/inode.c | 2 +- > drivers/staging/rt2860/common/cmm_wpa.c | 4 ++-- > drivers/staging/rtl8192e/r8190_rtl8256.c | 6 +++--- Hi, please send the staging parts separately to Greg (you did it for other patches, but likely forgot for this one). Thanks. -- Jiri Kosina SUSE Labs, Novell Inc. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Nick Bowler on 16 Jun 2010 12:30 On 12:17 Fri 11 Jun , Uwe Kleine-K�nig wrote: > diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c > index 7b8a2da..27b4cb2 100644 > --- a/drivers/staging/comedi/drivers/usbdux.c > +++ b/drivers/staging/comedi/drivers/usbdux.c > @@ -2085,7 +2085,7 @@ static int usbdux_pwm_start(struct comedi_device *dev, > if (ret < 0) > return ret; > > - /* initialise the buffer */ > + /* initalise the buffer */ > for (i = 0; i < this_usbduxsub->sizePwmBuf; i++) > ((char *)(this_usbduxsub->urbPwm->transfer_buffer))[i] = 0; This hunk (and the remainder of this patch) is undoing your earlier "initiali[zs]e" changes. -- Nick Bowler, Elliptic Technologies (http://www.elliptictech.com/) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: David Daney on 16 Jun 2010 13:00 On 06/11/2010 03:17 AM, Uwe Kleine-König wrote: > diff --git a/drivers/staging/octeon/cvmx-cmd-queue.c b/drivers/staging/octeon/cvmx-cmd-queue.c > index e9809d3..976227b 100644 > --- a/drivers/staging/octeon/cvmx-cmd-queue.c > +++ b/drivers/staging/octeon/cvmx-cmd-queue.c > @@ -140,21 +140,21 @@ cvmx_cmd_queue_result_t cvmx_cmd_queue_initialize(cvmx_cmd_queue_id_t queue_id, > if (qstate->base_ptr_div128) { > if (max_depth != (int)qstate->max_depth) { > cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: " > - "Queue already initialized with different " > + "Queue already initalized with different " > "max_depth (%d).\n", > (int)qstate->max_depth); > return CVMX_CMD_QUEUE_INVALID_PARAM; > } > if (fpa_pool != qstate->fpa_pool) { > cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: " > - "Queue already initialized with different " > + "Queue already initalized with different " > "FPA pool (%u).\n", > qstate->fpa_pool); > return CVMX_CMD_QUEUE_INVALID_PARAM; > } > if ((pool_size>> 3) - 1 != qstate->pool_size_m1) { > cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: " > - "Queue already initialized with different " > + "Queue already initalized with different " > "FPA pool size (%u).\n", > (qstate->pool_size_m1 + 1)<< 3); > return CVMX_CMD_QUEUE_INVALID_PARAM; NAK! I am not sure which dictionary you are using, but I would like to keep the spelling consistent with the American Heritage Dictionary of the English Language, Fourth Edition. My reading indicates that no change is needed. David Daney -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Uwe Kleine-König on 17 Jun 2010 01:10 On Wed, Jun 16, 2010 at 06:04:42PM +0200, Jiri Kosina wrote: > On Fri, 11 Jun 2010, Uwe Kleine-K�nig wrote: > > > Signed-off-by: Uwe Kleine-K�nig <u.kleine-koenig(a)pengutronix.de> > > --- > > arch/sh/kernel/clkdev.c | 2 +- > > drivers/staging/comedi/drivers/usbdux.c | 2 +- > > drivers/staging/octeon/cvmx-cmd-queue.c | 6 +++--- > > drivers/staging/pohmelfs/inode.c | 2 +- > > drivers/staging/rt2860/common/cmm_wpa.c | 4 ++-- > > drivers/staging/rtl8192e/r8190_rtl8256.c | 6 +++--- > > Hi, > > please send the staging parts separately to Greg (you did it for other > patches, but likely forgot for this one). I didn't forget it but messed up the splitting. Note patch 6 touches staging, too. I will resend these two later today. Sorry Uwe -- Pengutronix e.K. | Uwe Kleine-K�nig | Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Jiri Kosina on 17 Jun 2010 05:30
On Thu, 17 Jun 2010, Uwe Kleine-K�nig wrote: > > > Signed-off-by: Uwe Kleine-K�nig <u.kleine-koenig(a)pengutronix.de> > > > --- > > > arch/sh/kernel/clkdev.c | 2 +- > > > drivers/staging/comedi/drivers/usbdux.c | 2 +- > > > drivers/staging/octeon/cvmx-cmd-queue.c | 6 +++--- > > > drivers/staging/pohmelfs/inode.c | 2 +- > > > drivers/staging/rt2860/common/cmm_wpa.c | 4 ++-- > > > drivers/staging/rtl8192e/r8190_rtl8256.c | 6 +++--- > > > > Hi, > > > > please send the staging parts separately to Greg (you did it for other > > patches, but likely forgot for this one). > I didn't forget it but messed up the splitting. Note patch 6 touches > staging, too. Yeah, I have already dropped the staging part of that one. -- Jiri Kosina SUSE Labs, Novell Inc. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |