Skip to contentSkip to conversation

Staging driver fixes for 4.15-rc4

GIT PULL Greg KH 2 participants 3 messages Dec 15, 2017

lore
Share & tools
lore

Greg KH

author
#0 lore raw

The following changes since commit 73996933b53ff396d63a7fccd8e824758634dc19:

Merge tag 'staging-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging (2017-12-05 09:57:34 -0800)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/ tags/staging-4.15-rc4

for you to fetch changes up to 3d2a0c5ff02d57ab7b4f16a6782a66765d930b7d:

Revert "staging: ion: Fix ion_cma_heap allocations" (2017-12-15 19:36:24 +0100)

----------------------------------------------------------------
Staging fixes for 4.15-rc4

Here are some small staging driver fixes for 4.15-rc4.

While there are 4 patches in here, there's really only 2, as one ion patch got reverted due to build errors reported by 0-day.

The two patches that are the end-result is one for the ccree driver to prevent an unitialized value from being returned to a caller, and the other fixes a logic error in the pi433 driver.

All, except for the revert patch, have been in linux-next with no reported issues. I just made the revert, as linux-next did report problems with the ion patch :)

----------------------------------------------------------------
Dan Carpenter (1):
staging: ccree: Uninitialized return in ssi_ahash_import()

Greg Kroah-Hartman (1):
Revert "staging: ion: Fix ion_cma_heap allocations"

John Stultz (1):
staging: ion: Fix ion_cma_heap allocations

Marcus Wolf (1):
staging: pi433: Fixes issue with bit shift in rf69_get_modulation

 drivers/staging/ccree/ssi_hash.c | 2 +-
 drivers/staging/pi433/rf69.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
#1 lore raw
Quoted 3 lines · Greg KH

While there are 4 patches in here, there's really only 2, as one ion patch got reverted due to build errors reported by 0-day.

Since the revert was for the previous commit and the two were the top two commits, I just pulled the two actual fixes instead.

That lost me the signed tag in the end result, but I verified it separately.

Linus

author
#2 lore raw
Quoted 7 lines · Linus Torvalds
Quoted 3 lines · Greg KH

While there are 4 patches in here, there's really only 2, as one ion patch got reverted due to build errors reported by 0-day.

Since the revert was for the previous commit and the two were the top two commits, I just pulled the two actual fixes instead.

Ah, great, that works. I'll rebase my public branch, but linux-next should be able to handle that :)

thanks,

greg k-h