Skip to contentSkip to conversation

4th set of IIO fixes for the 4.2 cycle

GIT PULL Jonathan Cameron 3 participants 6 messages Aug 8, 2015 – Aug 12, 2015 IIO

lore
Share & tools
lore

Jonathan Cameron

author maintainer
#0 lore raw

The following changes since commit 40c3ef9d2f14cce91dbd6ae9c9ccf6210d8c5df7:

staging: comedi: das1800: add missing break in switch (2015-07-31 16:59:47 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-fixes-for-4.2d

for you to fetch changes up to 2e8ea3cded44a8fe0ba4d4d14b290a458f969b1f:

iio: event: Remove negative error code from iio_event_poll (2015-08-08 17:18:16 +0100)

----------------------------------------------------------------
Fourth set of IIO fixes for the 4.2 cycle.

* Poll functions for both event chardev and the buffer one were returning negative error codes (via a positive value).
* A recent change to lsiio adding some error handling that was wrong and stopped the tool working.
* bmg160 was missing some dependencies in Kconfig
* berlin2-adc had a misshandled register (wrote a value rather than a bitmap)

----------------------------------------------------------------
Cristina Opriceana (2):
iio: industrialio-buffer: Fix iio_buffer_poll return value
iio: event: Remove negative error code from iio_event_poll

Hartmut Knaack (1):
iio:adc:berlin2-adc: Fix register definition

Linus Walleij (1):
iio: lsiio: fix error code handling error

Markus Pargmann (1):
iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required

 drivers/iio/adc/berlin2-adc.c     | 8 ++++----
 drivers/iio/gyro/Kconfig          | 3 ++-
 drivers/iio/industrialio-buffer.c | 2 +-
 drivers/iio/industrialio-event.c  | 2 +-
 tools/iio/lsiio.c                 | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)
author maintainer
#1 lore raw

Hi Greg,

There will be a merge conflict from this pull when you pull it into your staging/staging-next tree.

The resolution is pretty obvious (rename retval to ret and keep the < 0) in the relevant places.

Been a busy cycle and my pull requests have been less frequent than ideal due to summer fun!

Jonathan

Quoted 47 lines · Jonathan Cameron

The following changes since commit 40c3ef9d2f14cce91dbd6ae9c9ccf6210d8c5df7:

staging: comedi: das1800: add missing break in switch (2015-07-31 16:59:47 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-fixes-for-4.2d

for you to fetch changes up to 2e8ea3cded44a8fe0ba4d4d14b290a458f969b1f:

iio: event: Remove negative error code from iio_event_poll (2015-08-08 17:18:16 +0100)

----------------------------------------------------------------
Fourth set of IIO fixes for the 4.2 cycle.

* Poll functions for both event chardev and the buffer one were returning negative error codes (via a positive value).
* A recent change to lsiio adding some error handling that was wrong and stopped the tool working.
* bmg160 was missing some dependencies in Kconfig
* berlin2-adc had a misshandled register (wrote a value rather than a bitmap)

----------------------------------------------------------------
Cristina Opriceana (2):
iio: industrialio-buffer: Fix iio_buffer_poll return value
iio: event: Remove negative error code from iio_event_poll

Hartmut Knaack (1):
iio:adc:berlin2-adc: Fix register definition

Linus Walleij (1):
iio: lsiio: fix error code handling error

Markus Pargmann (1):
iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required

 drivers/iio/adc/berlin2-adc.c     | 8 ++++----
 drivers/iio/gyro/Kconfig          | 3 ++-
 drivers/iio/industrialio-buffer.c | 2 +-
 drivers/iio/industrialio-event.c  | 2 +-
 tools/iio/lsiio.c                 | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
In reply to Jonathan Cameron
Quoted 7 lines · Jonathan Cameron

The following changes since commit 40c3ef9d2f14cce91dbd6ae9c9ccf6210d8c5df7:

staging: comedi: das1800: add missing break in switch (2015-07-31 16:59:47 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-fixes-for-4.2d

Can these wait for 4.3-rc1? I'd like my last set of pull requests to be the last one for 4.2. If it's a big deal, we can mark these for -stable and get them into 4.2.1?

thanks,

greg k-h

#3 lore raw
Quoted 18 lines · Greg KH
Quoted 1 line · Jonathan Cameron

The following changes since commit

40c3ef9d2f14cce91dbd6ae9c9ccf6210d8c5df7:

Quoted 2 lines

staging: comedi: das1800: add missing break in switch (2015-07-31

16:59:47 -0700)

Quoted 4 lines

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git

tags/iio-fixes-for-4.2d

Can these wait for 4.3-rc1? I'd like my last set of pull requests to be
the last one for 4.2. If it's a big deal, we can mark these for -stable
and get them into 4.2.1?

Quoted 3 lines

thanks,

greg k-h

Sure. Can sit for a while.

J

Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.
#4 lore raw
Quoted 21 lines · Jonathan Cameron
Quoted 18 lines · Greg KH
Quoted 1 line · Jonathan Cameron

The following changes since commit

40c3ef9d2f14cce91dbd6ae9c9ccf6210d8c5df7:

Quoted 2 lines

staging: comedi: das1800: add missing break in switch (2015-07-31

16:59:47 -0700)

Quoted 4 lines

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git

tags/iio-fixes-for-4.2d

Can these wait for 4.3-rc1? I'd like my last set of pull requests to be
the last one for 4.2. If it's a big deal, we can mark these for -stable
and get them into 4.2.1?

Quoted 4 lines
Quoted 3 lines

thanks,

greg k-h

Sure. Can sit for a while.

Ok, can you add these to your other pull request for 4.3 and resend that one?

thanks,

greg k-h

author maintainer
#5 lore raw
Quoted 22 lines · Greg KH
Quoted 21 lines · Jonathan Cameron
Quoted 18 lines · Greg KH
Quoted 1 line · Jonathan Cameron

The following changes since commit

40c3ef9d2f14cce91dbd6ae9c9ccf6210d8c5df7:

Quoted 2 lines

staging: comedi: das1800: add missing break in switch (2015-07-31

16:59:47 -0700)

Quoted 4 lines

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git

tags/iio-fixes-for-4.2d

Can these wait for 4.3-rc1? I'd like my last set of pull requests to be
the last one for 4.2. If it's a big deal, we can mark these for -stable
and get them into 4.2.1?

Quoted 8 lines
Quoted 4 lines
Quoted 3 lines

thanks,

greg k-h

Sure. Can sit for a while.

Ok, can you add these to your other pull request for 4.3 and resend that one?

Coming up shortly.

Jonathan

Quoted 4 lines

thanks,

greg k-h