[patch added to the 3.12 stable tree] staging: comedi: usbduxsigma: don't clobber ai_timer in command test

[patch added to the 3.12 stable tree] staging: comedi: usbduxsigma: don't clobber ai_timer in command test

[Jiri Slaby]

From: Ian Abbott <abbotti@mev.co.uk>

This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.

===============

commit 423b24c37dd5794a674c74b0ed56392003a69891 upstream

`devpriv->ai_timer` is used while an asynchronous command is running on
the AI subdevice.  It also gets modified by the subdevice's `cmdtest`
handler for checking new asynchronous commands
(`usbduxsigma_ai_cmdtest()`), which is not correct as it's allowed to
check new commands while an old command is still running.  Fix it by
moving the code which sets up `devpriv->ai_timer` and
`devpriv->ai_interval` into the subdevice's `cmd` handler,
`usbduxsigma_ai_cmd()`.

** This backported patch also moves the code that sets up
`devpriv->ai_sample_count` and `devpriv->ai_continuous` from
`usbduxsigma_ai_cmdtest()` to `usbduxsigma_ai_cmd()` for the same reason
as above. (This was not needed in the upstream commit.) **

Note that the removed code in `usbduxsigma_ai_cmdtest()` checked that
`devpriv->ai_timer` did not end up less than than 1, but that could not
happen because `cmd->scan_begin_arg` had already been checked to be at
least the minimum required value (at least when `cmd->scan_begin_src ==
TRIG_TIMER`, which had also been checked to be the case).

Fixes: b986be8527c7 ("staging: comedi: usbduxsigma: tidy up analog input command support)
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 drivers/staging/comedi/drivers/usbduxsigma.c | 58 +++++++++++++---------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index c47f4087568f..c61a1b9d7cd8 100644
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -575,37 +575,6 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev,
 	if (err)
 		return 3;
 
-	/* Step 4: fix up any arguments */
-
-	if (high_speed) {
-		/*
-		 * every 2 channels get a time window of 125us. Thus, if we
-		 * sample all 16 channels we need 1ms. If we sample only one
-		 * channel we need only 125us
-		 */
-		devpriv->ai_interval = interval;
-		devpriv->ai_timer = cmd->scan_begin_arg / (125000 * interval);
-	} else {
-		/* interval always 1ms */
-		devpriv->ai_interval = 1;
-		devpriv->ai_timer = cmd->scan_begin_arg / 1000000;
-	}
-	if (devpriv->ai_timer < 1)
-		err |= -EINVAL;
-
-	if (cmd->stop_src == TRIG_COUNT) {
-		/* data arrives as one packet */
-		devpriv->ai_sample_count = cmd->stop_arg;
-		devpriv->ai_continuous = 0;
-	} else {
-		/* continuous acquisition */
-		devpriv->ai_continuous = 1;
-		devpriv->ai_sample_count = 0;
-	}
-
-	if (err)
-		return 4;
-
 	return 0;
 }
 
@@ -704,6 +673,33 @@ static int usbduxsigma_ai_cmd(struct comedi_device *dev,
 
 	/* set current channel of the running acquisition to zero */
 	s->async->cur_chan = 0;
+
+	if (devpriv->high_speed) {
+		/*
+		 * every 2 channels get a time window of 125us. Thus, if we
+		 * sample all 16 channels we need 1ms. If we sample only one
+		 * channel we need only 125us
+		 */
+		unsigned int interval = usbduxsigma_chans_to_interval(len);
+
+		devpriv->ai_interval = interval;
+		devpriv->ai_timer = cmd->scan_begin_arg / (125000 * interval);
+	} else {
+		/* interval always 1ms */
+		devpriv->ai_interval = 1;
+		devpriv->ai_timer = cmd->scan_begin_arg / 1000000;
+	}
+
+	if (cmd->stop_src == TRIG_COUNT) {
+		/* data arrives as one packet */
+		devpriv->ai_sample_count = cmd->stop_arg;
+		devpriv->ai_continuous = 0;
+	} else {
+		/* continuous acquisition */
+		devpriv->ai_continuous = 1;
+		devpriv->ai_sample_count = 0;
+	}
+
 	for (i = 0; i < len; i++) {
 		unsigned int chan  = CR_CHAN(cmd->chanlist[i]);
 
-- 
2.5.2

[patch added to the 3.12 stable tree] staging: comedi: usbduxsigma: don't clobber ao_timer in command test

[Jiri Slaby]

From: Ian Abbott <abbotti@mev.co.uk>

This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.

===============

commit c04a1f17803e0d3eeada586ca34a6b436959bc20 upstream

`devpriv->ao_timer` is used while an asynchronous command is running on
the AO subdevice.  It also gets modified by the subdevice's `cmdtest`
handler for checking new asynchronous commands,
`usbduxsigma_ao_cmdtest()`, which is not correct as it's allowed to
check new commands while an old command is still running.  Fix it by
moving the code which sets up `devpriv->ao_timer` into the subdevice's
`cmd` handler, `usbduxsigma_ao_cmd()`.

** This backported patch also moves the code that sets up
`devpriv->ao_sample_count` and `devpriv->ao_continuous` from
`usbduxsigma_ao_cmdtest()` to `usbduxsigma_ao_cmd()` for the same reason
as above.  (This was not needed in the upstream commit.) **

Note that the removed code in `usbduxsigma_ao_cmdtest()` checked that
`devpriv->ao_timer` did not end up less that 1, but that could not
happen due because `cmd->scan_begin_arg` or `cmd->convert_arg` had
already been range-checked.

Also note that we tested the `high_speed` variable in the old code, but
that is currently always 0 and means that we always use "scan" timing
(`cmd->scan_begin_src == TRIG_TIMER` and `cmd->convert_src == TRIG_NOW`)
and never "convert" (individual sample) timing (`cmd->scan_begin_src ==
TRIG_FOLLOW` and `cmd->convert_src == TRIG_TIMER`).  The moved code
tests `cmd->convert_src` instead to decide whether "scan" or "convert"
timing is being used, although currently only "scan" timing is
supported.

Fixes: fb1ef622e7a3 ("staging: comedi: usbduxsigma: tidy up analog output command support")
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 drivers/staging/comedi/drivers/usbduxsigma.c | 41 ++++++++++++----------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index c61a1b9d7cd8..580c1358eb84 100644
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -950,10 +950,24 @@ static int usbduxsigma_ao_cmdtest(struct comedi_device *dev,
 	if (err)
 		return 3;
 
-	/* Step 4: fix up any arguments */
+	return 0;
+}
+
+static int usbduxsigma_ao_cmd(struct comedi_device *dev,
+			      struct comedi_subdevice *s)
+{
+	struct usbduxsigma_private *devpriv = dev->private;
+	struct comedi_cmd *cmd = &s->async->cmd;
+	int ret;
+	int i;
+
+	down(&devpriv->sem);
+
+	/* set current channel of the running acquisition to zero */
+	s->async->cur_chan = 0;
 
 	/* we count in timer steps */
-	if (high_speed) {
+	if (cmd->convert_src == TRIG_TIMER) {
 		/* timing of the conversion itself: every 125 us */
 		devpriv->ao_timer = cmd->convert_arg / 125000;
 	} else {
@@ -963,12 +977,9 @@ static int usbduxsigma_ao_cmdtest(struct comedi_device *dev,
 		 */
 		devpriv->ao_timer = cmd->scan_begin_arg / 1000000;
 	}
-	if (devpriv->ao_timer < 1)
-		err |= -EINVAL;
-
 	if (cmd->stop_src == TRIG_COUNT) {
 		/* not continuous, use counter */
-		if (high_speed) {
+		if (cmd->convert_src == TRIG_TIMER) {
 			/* high speed also scans everything at once */
 			devpriv->ao_sample_count = cmd->stop_arg *
 						   cmd->scan_end_arg;
@@ -987,24 +998,6 @@ static int usbduxsigma_ao_cmdtest(struct comedi_device *dev,
 		devpriv->ao_sample_count = 0;
 	}
 
-	if (err)
-		return 4;
-
-	return 0;
-}
-
-static int usbduxsigma_ao_cmd(struct comedi_device *dev,
-			      struct comedi_subdevice *s)
-{
-	struct usbduxsigma_private *devpriv = dev->private;
-	struct comedi_cmd *cmd = &s->async->cmd;
-	int ret;
-	int i;
-
-	down(&devpriv->sem);
-
-	/* set current channel of the running acquisition to zero */
-	s->async->cur_chan = 0;
 	for (i = 0; i < cmd->chanlist_len; ++i)
 		devpriv->ao_chanlist[i] = CR_CHAN(cmd->chanlist[i]);
 
-- 
2.5.2

[patch added to the 3.12 stable tree] staging: comedi: adl_pci7x3x: fix digital output on PCI-7230

[Jiri Slaby]

From: Ian Abbott <abbotti@mev.co.uk>

This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.

===============

commit ad83dbd974feb2e2a8cc071a1d28782bd4d2c70e upstream

The "adl_pci7x3x" driver replaced the "adl_pci7230" and "adl_pci7432"
drivers in commits 8f567c373c4b ("staging: comedi: new adl_pci7x3x
driver") and 657f77d173d3 ("staging: comedi: remove adl_pci7230 and
adl_pci7432 drivers").  Although the new driver code agrees with the
user manuals for the respective boards, digital outputs stopped working
on the PCI-7230.  This has 16 digital output channels and the previous
adl_pci7230 driver shifted the 16 bit output state left by 16 bits
before writing to the hardware register.  The new adl_pci7x3x driver
doesn't do that.  Fix it in `adl_pci7x3x_do_insn_bits()` by checking
for the special case of the subdevice having only 16 channels and
duplicating the 16 bit output state into both halves of the 32-bit
register.  That should work both for what the board actually does and
for what the user manual says it should do.

Fixes: 8f567c373c4b ("staging: comedi: new adl_pci7x3x driver")
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 drivers/staging/comedi/drivers/adl_pci7x3x.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci7x3x.c b/drivers/staging/comedi/drivers/adl_pci7x3x.c
index 81b7203f824f..c570ede07e94 100644
--- a/drivers/staging/comedi/drivers/adl_pci7x3x.c
+++ b/drivers/staging/comedi/drivers/adl_pci7x3x.c
@@ -116,10 +116,21 @@ static int adl_pci7x3x_do_insn_bits(struct comedi_device *dev,
 	unsigned int bits = data[1];
 
 	if (mask) {
+		unsigned int val;
+
 		s->state &= ~mask;
 		s->state |= (bits & mask);
-
-		outl(s->state, dev->iobase + reg);
+		val = s->state;
+		if (s->n_chan == 16) {
+			/*
+			 * It seems the PCI-7230 needs the 16-bit DO state
+			 * to be shifted left by 16 bits before being written
+			 * to the 32-bit register.  Set the value in both
+			 * halves of the register to be sure.
+			 */
+			val |= val << 16;
+		}
+		outl(val, dev->iobase + reg);
 	}
 
 	/*
-- 
2.5.2

[patch added to the 3.12 stable tree] ext4: move check under lock scope to close a race.

[Jiri Slaby]

From: Davide Italiano <dccitaliano@gmail.com>

This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.

===============

commit 280227a75b56ab5d35854f3a77ef74a7ad56a203 upstream

fallocate() checks that the file is extent-based and returns
EOPNOTSUPP in case is not. Other tasks can convert from and to
indirect and extent so it's safe to check only after grabbing
the inode mutex.

Signed-off-by: Davide Italiano <dccitaliano@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Nikolay Borisov <kernel@kyup.com>

[Nikolay Borisov: Bakported to 3.12.47
 - Adjusted context
 - Add the 'out' label]
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 fs/ext4/extents.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index c9830686cbd5..a9d23daa0d6f 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4634,12 +4634,6 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
 	if (ret)
 		return ret;
 
-	/*
-	 * currently supporting (pre)allocate mode for extent-based
-	 * files _only_
-	 */
-	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))
-		return -EOPNOTSUPP;
 
 	trace_ext4_fallocate_enter(inode, offset, len, mode);
 	map.m_lblk = offset >> blkbits;
@@ -4654,6 +4648,16 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
 	 */
 	credits = ext4_chunk_trans_blocks(inode, max_blocks);
 	mutex_lock(&inode->i_mutex);
+
+	/*
+	 * currently supporting (pre)allocate mode for extent-based
+	 * files _only_
+	 */
+	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {
+		ret = -EOPNOTSUPP;
+		goto out;
+	}
+
 	ret = inode_newsize_ok(inode, (len + offset));
 	if (ret) {
 		mutex_unlock(&inode->i_mutex);
@@ -4714,6 +4718,7 @@ retry:
 		ret = 0;
 		goto retry;
 	}
+out:
 	mutex_unlock(&inode->i_mutex);
 	trace_ext4_fallocate_exit(inode, offset, max_blocks,
 				ret > 0 ? ret2 : ret);
-- 
2.5.2

Re: [patch added to the 3.12 stable tree] staging: comedi: usbduxsigma: don't clobber ai_timer in command test

[Luis Henriques]

On Wed, Sep 16, 2015 at 09:38:12PM +0200, Jiri Slaby wrote:
> From: Ian Abbott <abbotti@mev.co.uk>
> 
> This patch has been added to the 3.12 stable tree. If you have any
> objections, please let us know.
>

Please note that this commit (and the next one) were tagged for
kernels >= 3.19.

Cheers,
--
Lu�s


> ===============
> 
> commit 423b24c37dd5794a674c74b0ed56392003a69891 upstream
> 
> `devpriv->ai_timer` is used while an asynchronous command is running on
> the AI subdevice.  It also gets modified by the subdevice's `cmdtest`
> handler for checking new asynchronous commands
> (`usbduxsigma_ai_cmdtest()`), which is not correct as it's allowed to
> check new commands while an old command is still running.  Fix it by
> moving the code which sets up `devpriv->ai_timer` and
> `devpriv->ai_interval` into the subdevice's `cmd` handler,
> `usbduxsigma_ai_cmd()`.
> 
> ** This backported patch also moves the code that sets up
> `devpriv->ai_sample_count` and `devpriv->ai_continuous` from
> `usbduxsigma_ai_cmdtest()` to `usbduxsigma_ai_cmd()` for the same reason
> as above. (This was not needed in the upstream commit.) **
> 
> Note that the removed code in `usbduxsigma_ai_cmdtest()` checked that
> `devpriv->ai_timer` did not end up less than than 1, but that could not
> happen because `cmd->scan_begin_arg` had already been checked to be at
> least the minimum required value (at least when `cmd->scan_begin_src ==
> TRIG_TIMER`, which had also been checked to be the case).
> 
> Fixes: b986be8527c7 ("staging: comedi: usbduxsigma: tidy up analog input command support)
> Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> ---
>  drivers/staging/comedi/drivers/usbduxsigma.c | 58 +++++++++++++---------------
>  1 file changed, 27 insertions(+), 31 deletions(-)
> 
> diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
> index c47f4087568f..c61a1b9d7cd8 100644
> --- a/drivers/staging/comedi/drivers/usbduxsigma.c
> +++ b/drivers/staging/comedi/drivers/usbduxsigma.c
> @@ -575,37 +575,6 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev,
>  	if (err)
>  		return 3;
>  
> -	/* Step 4: fix up any arguments */
> -
> -	if (high_speed) {
> -		/*
> -		 * every 2 channels get a time window of 125us. Thus, if we
> -		 * sample all 16 channels we need 1ms. If we sample only one
> -		 * channel we need only 125us
> -		 */
> -		devpriv->ai_interval = interval;
> -		devpriv->ai_timer = cmd->scan_begin_arg / (125000 * interval);
> -	} else {
> -		/* interval always 1ms */
> -		devpriv->ai_interval = 1;
> -		devpriv->ai_timer = cmd->scan_begin_arg / 1000000;
> -	}
> -	if (devpriv->ai_timer < 1)
> -		err |= -EINVAL;
> -
> -	if (cmd->stop_src == TRIG_COUNT) {
> -		/* data arrives as one packet */
> -		devpriv->ai_sample_count = cmd->stop_arg;
> -		devpriv->ai_continuous = 0;
> -	} else {
> -		/* continuous acquisition */
> -		devpriv->ai_continuous = 1;
> -		devpriv->ai_sample_count = 0;
> -	}
> -
> -	if (err)
> -		return 4;
> -
>  	return 0;
>  }
>  
> @@ -704,6 +673,33 @@ static int usbduxsigma_ai_cmd(struct comedi_device *dev,
>  
>  	/* set current channel of the running acquisition to zero */
>  	s->async->cur_chan = 0;
> +
> +	if (devpriv->high_speed) {
> +		/*
> +		 * every 2 channels get a time window of 125us. Thus, if we
> +		 * sample all 16 channels we need 1ms. If we sample only one
> +		 * channel we need only 125us
> +		 */
> +		unsigned int interval = usbduxsigma_chans_to_interval(len);
> +
> +		devpriv->ai_interval = interval;
> +		devpriv->ai_timer = cmd->scan_begin_arg / (125000 * interval);
> +	} else {
> +		/* interval always 1ms */
> +		devpriv->ai_interval = 1;
> +		devpriv->ai_timer = cmd->scan_begin_arg / 1000000;
> +	}
> +
> +	if (cmd->stop_src == TRIG_COUNT) {
> +		/* data arrives as one packet */
> +		devpriv->ai_sample_count = cmd->stop_arg;
> +		devpriv->ai_continuous = 0;
> +	} else {
> +		/* continuous acquisition */
> +		devpriv->ai_continuous = 1;
> +		devpriv->ai_sample_count = 0;
> +	}
> +
>  	for (i = 0; i < len; i++) {
>  		unsigned int chan  = CR_CHAN(cmd->chanlist[i]);
>  
> -- 
> 2.5.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch added to the 3.12 stable tree] staging: comedi: usbduxsigma: don't clobber ai_timer in command test

[Jiri Slaby]

On 09/22/2015, 08:47 PM, Luis Henriques wrote:
> On Wed, Sep 16, 2015 at 09:38:12PM +0200, Jiri Slaby wrote:
>> From: Ian Abbott <abbotti@mev.co.uk>
>>
>> This patch has been added to the 3.12 stable tree. If you have any
>> objections, please let us know.
>>
> 
> Please note that this commit (and the next one) were tagged for
> kernels >= 3.19.

What are you referring to?

Given:
http://www.spinics.net/lists/stable/msg103455.html
and:

>> Fixes: b986be8527c7 ("staging: comedi: usbduxsigma: tidy up analog input command support)

I doubt so?

>> Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
>> Signed-off-by: Jiri Slaby <jslaby@suse.cz>

thanks,
-- 
js
suse labs

Re: [patch added to the 3.12 stable tree] staging: comedi: usbduxsigma: don't clobber ai_timer in command test

[Luis Henriques]

On Tue, Sep 22, 2015 at 09:29:14PM +0200, Jiri Slaby wrote:
> On 09/22/2015, 08:47 PM, Luis Henriques wrote:
> > On Wed, Sep 16, 2015 at 09:38:12PM +0200, Jiri Slaby wrote:
> >> From: Ian Abbott <abbotti@mev.co.uk>
> >>
> >> This patch has been added to the 3.12 stable tree. If you have any
> >> objections, please let us know.
> >>
> > 
> > Please note that this commit (and the next one) were tagged for
> > kernels >= 3.19.
> 
> What are you referring to?
> 
> Given:
> http://www.spinics.net/lists/stable/msg103455.html
> and:
> 
> >> Fixes: b986be8527c7 ("staging: comedi: usbduxsigma: tidy up analog input command support)
>
> I doubt so?
> 

Right, I did saw the 'Fixes:' tag (and confirmed that commit was in
3.12).  What I was referring to was to the fact that the original
commit contained:

  Cc: <stable@vger.kernel.org> # 3.19 onwards

But I didn't saw Ian's request in the stable mailing-list yet
(actually, I've a huge backlog regarding mailing-lists...).  So, I
guess that what was wrong was the stable tag.  Sorry for the noise...

Cheers,
--
Lu�s

> >> Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
> >> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> 
> thanks,
> -- 
> js
> suse labs
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch added to the 3.12 stable tree] staging: comedi: usbduxsigma: don't clobber ai_timer in command test

[Jiri Slaby]

On 09/22/2015, 11:48 PM, Luis Henriques wrote:
> On Tue, Sep 22, 2015 at 09:29:14PM +0200, Jiri Slaby wrote:
>> On 09/22/2015, 08:47 PM, Luis Henriques wrote:
>>> On Wed, Sep 16, 2015 at 09:38:12PM +0200, Jiri Slaby wrote:
>>>> From: Ian Abbott <abbotti@mev.co.uk>
>>>>
>>>> This patch has been added to the 3.12 stable tree. If you have any
>>>> objections, please let us know.
>>>>
>>>
>>> Please note that this commit (and the next one) were tagged for
>>> kernels >= 3.19.
>>
>> What are you referring to?
>>
>> Given:
>> http://www.spinics.net/lists/stable/msg103455.html
>> and:
>>
>>>> Fixes: b986be8527c7 ("staging: comedi: usbduxsigma: tidy up analog input command support)
>>
>> I doubt so?
>>
> 
> Right, I did saw the 'Fixes:' tag (and confirmed that commit was in
> 3.12).  What I was referring to was to the fact that the original
> commit contained:
> 
>   Cc: <stable@vger.kernel.org> # 3.19 onwards
> 
> But I didn't saw Ian's request in the stable mailing-list yet
> (actually, I've a huge backlog regarding mailing-lists...).  So, I
> guess that what was wrong was the stable tag.  Sorry for the noise...

I see, thanks for the heads-up anyway.


-- 
js
suse labs

Re: [patch added to the 3.12 stable tree] staging: comedi: usbduxsigma: don't clobber ai_timer in command test

[Ian Abbott]

On 22/09/15 22:48, Luis Henriques wrote:
> On Tue, Sep 22, 2015 at 09:29:14PM +0200, Jiri Slaby wrote:
>> On 09/22/2015, 08:47 PM, Luis Henriques wrote:
>>> On Wed, Sep 16, 2015 at 09:38:12PM +0200, Jiri Slaby wrote:
>>>> From: Ian Abbott <abbotti@mev.co.uk>
>>>>
>>>> This patch has been added to the 3.12 stable tree. If you have any
>>>> objections, please let us know.
>>>>
>>>
>>> Please note that this commit (and the next one) were tagged for
>>> kernels >= 3.19.
>>
>> What are you referring to?
>>
>> Given:
>> http://www.spinics.net/lists/stable/msg103455.html
>> and:
>>
>>>> Fixes: b986be8527c7 ("staging: comedi: usbduxsigma: tidy up analog input command support)
>>
>> I doubt so?
>>
>
> Right, I did saw the 'Fixes:' tag (and confirmed that commit was in
> 3.12).  What I was referring to was to the fact that the original
> commit contained:
>
>    Cc: <stable@vger.kernel.org> # 3.19 onwards
>
> But I didn't saw Ian's request in the stable mailing-list yet
> (actually, I've a huge backlog regarding mailing-lists...).  So, I
> guess that what was wrong was the stable tag.  Sorry for the noise...

I tagged it as 3.19 onwards because it wouldn't apply as-is to earlier 
kernels.  I probably should have mentioned in the original upstream 
patch that it could be back-ported down to 3.12.

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-