| Message ID | 20200105110051.445c9a95@archlinux (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [PULL] Second set of IIO fixes for the 5.5 cycle. | expand |
Hi Greg, Just wondering if this one slipped through the net? If we are cutting it a bit fine for the upcoming merge window then I'm happy if you want to apply these to your staging/staging-next tree instead of staging/staging-linus. Thanks, Jonathan On Sun, 5 Jan 2020 11:00:51 +0000 Jonathan Cameron <jic23@kernel.org> wrote: > The following changes since commit c05c403b1d123031f86e65e867be2c2e9ee1e7e3: > > staging: wfx: fix wrong error message (2019-12-18 15:51:06 +0100) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-fixes-for-5.5b > > for you to fetch changes up to 80d92ea5f865175bf4cb2cb252b0d1f439c4bcec: > > iio: light: vcnl4000: Fix scale for vcnl4040 (2019-12-30 16:48:13 +0000) > > ---------------------------------------------------------------- > 2nd Set of IIO fixes for the 5.5 cycle. > > * Core > - Fix buffer alignment calculation. The previous logic meant that scans > could under some circumstances not have naturally aligned elements. > In theory someone might have been working around this in userspace, but > if so we'd have expected them to query this very odd behaviour. > It's not hit in that many drivers as requires a mixture of channel > resolutions broad enough to require different packing. The one obvious > case of timestamps was fine under existing code as they are always the > last element if enabled and that was handled correctly. > * ad7124 > - DT channel configuration wasn't using the reg value so would lead > to some odd mappings and readout of the wrong channels. > * pms7003 > - Kconfig didn't specify triggered buffer dependency. > * st_lsm6dsx > - For the LSM6DS3 the id match wasn't working. > * vcnl4000 > - Scale was wrong for the vcnl4040 > > ---------------------------------------------------------------- > Alexandru Tachici (1): > iio: adc: ad7124: Fix DT channel configuration > > Guido Günther (1): > iio: light: vcnl4000: Fix scale for vcnl4040 > > Lars Möllendorf (1): > iio: buffer: align the size of scan bytes to size of the largest element > > Stephan Gerhold (1): > iio: imu: st_lsm6dsx: Fix selection of ST_LSM6DS3_ID > > Tomasz Duszynski (1): > iio: chemical: pms7003: fix unmet triggered buffer dependency > > drivers/iio/adc/ad7124.c | 12 +++++------- > drivers/iio/chemical/Kconfig | 1 + > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 3 ++- > drivers/iio/industrialio-buffer.c | 6 +++++- > drivers/iio/light/vcnl4000.c | 3 ++- > 5 files changed, 15 insertions(+), 10 deletions(-)
On Sun, Jan 12, 2020 at 11:46:53AM +0000, Jonathan Cameron wrote: > Hi Greg, > > Just wondering if this one slipped through the net? > > If we are cutting it a bit fine for the upcoming merge window > then I'm happy if you want to apply these to your staging/staging-next > tree instead of staging/staging-linus. Sorry, I was waiting for the 5.5-rc6 kernel to be out to merge this in, as I already had a bunch of staging fixes go into that. I was going to merge this Monday morning. But if you want these into the linux-next tree now, I can always take them into my staging-next tree right now, but I figured I could wait a week for these as I caught up with other stuff :) thanks, greg k-h
On Sun, 12 Jan 2020 12:52:49 +0100 Greg KH <gregkh@linuxfoundation.org> wrote: > On Sun, Jan 12, 2020 at 11:46:53AM +0000, Jonathan Cameron wrote: > > Hi Greg, > > > > Just wondering if this one slipped through the net? > > > > If we are cutting it a bit fine for the upcoming merge window > > then I'm happy if you want to apply these to your staging/staging-next > > tree instead of staging/staging-linus. > > Sorry, I was waiting for the 5.5-rc6 kernel to be out to merge this in, > as I already had a bunch of staging fixes go into that. I was going to > merge this Monday morning. > > But if you want these into the linux-next tree now, I can always take > them into my staging-next tree right now, but I figured I could wait a > week for these as I caught up with other stuff :) Absolutely fine to take them as you planned! Thanks for the update. Jonathan > > thanks, > > greg k-h
On Sun, Jan 05, 2020 at 11:00:51AM +0000, Jonathan Cameron wrote: > The following changes since commit c05c403b1d123031f86e65e867be2c2e9ee1e7e3: > > staging: wfx: fix wrong error message (2019-12-18 15:51:06 +0100) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-fixes-for-5.5b I get this check warning when trying to push these: Commit: 80d92ea5f865 ("iio: light: vcnl4000: Fix scale for vcnl4040") Fixes tag: Fixes: 5a441aade5b3 ("light: vcnl4000 add support for the VCNL4040 proximity and light sensor") Has these problem(s): - Subject does not match target commit subject Just use git log -1 --format='Fixes: %h ("%s")' I'll fix this up by hand, but note that this changes the git sha1, so if you pull you will see a merge. thanks, greg k-h
On Mon, 13 Jan 2020 12:06:39 +0100 Greg KH <gregkh@linuxfoundation.org> wrote: > On Sun, Jan 05, 2020 at 11:00:51AM +0000, Jonathan Cameron wrote: > > The following changes since commit c05c403b1d123031f86e65e867be2c2e9ee1e7e3: > > > > staging: wfx: fix wrong error message (2019-12-18 15:51:06 +0100) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-fixes-for-5.5b > > I get this check warning when trying to push these: > > Commit: 80d92ea5f865 ("iio: light: vcnl4000: Fix scale for vcnl4040") > Fixes tag: Fixes: 5a441aade5b3 ("light: vcnl4000 add support for the VCNL4040 proximity and light sensor") > Has these problem(s): > - Subject does not match target commit subject > Just use > git log -1 --format='Fixes: %h ("%s")' > > I'll fix this up by hand, but note that this changes the git sha1, so if > you pull you will see a merge. > > thanks, > > greg k-h Gah! Sorry about that. I really need to find the time to get scripting setup around this as trying to remember to check by hand is clearly not working. Thanks for fixing it up. Jonathan
The following changes since commit c05c403b1d123031f86e65e867be2c2e9ee1e7e3: staging: wfx: fix wrong error message (2019-12-18 15:51:06 +0100) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-fixes-for-5.5b for you to fetch changes up to 80d92ea5f865175bf4cb2cb252b0d1f439c4bcec: iio: light: vcnl4000: Fix scale for vcnl4040 (2019-12-30 16:48:13 +0000) ---------------------------------------------------------------- 2nd Set of IIO fixes for the 5.5 cycle. * Core - Fix buffer alignment calculation. The previous logic meant that scans could under some circumstances not have naturally aligned elements. In theory someone might have been working around this in userspace, but if so we'd have expected them to query this very odd behaviour. It's not hit in that many drivers as requires a mixture of channel resolutions broad enough to require different packing. The one obvious case of timestamps was fine under existing code as they are always the last element if enabled and that was handled correctly. * ad7124 - DT channel configuration wasn't using the reg value so would lead to some odd mappings and readout of the wrong channels. * pms7003 - Kconfig didn't specify triggered buffer dependency. * st_lsm6dsx - For the LSM6DS3 the id match wasn't working. * vcnl4000 - Scale was wrong for the vcnl4040 ---------------------------------------------------------------- Alexandru Tachici (1): iio: adc: ad7124: Fix DT channel configuration Guido Günther (1): iio: light: vcnl4000: Fix scale for vcnl4040 Lars Möllendorf (1): iio: buffer: align the size of scan bytes to size of the largest element Stephan Gerhold (1): iio: imu: st_lsm6dsx: Fix selection of ST_LSM6DS3_ID Tomasz Duszynski (1): iio: chemical: pms7003: fix unmet triggered buffer dependency drivers/iio/adc/ad7124.c | 12 +++++------- drivers/iio/chemical/Kconfig | 1 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 3 ++- drivers/iio/industrialio-buffer.c | 6 +++++- drivers/iio/light/vcnl4000.c | 3 ++- 5 files changed, 15 insertions(+), 10 deletions(-)