]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 's390-5.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Oct 2019 21:09:31 +0000 (14:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Oct 2019 21:09:31 +0000 (14:09 -0700)
Pull s390 fixes from Vasily Gorbik:

 - Fix virtio-ccw DMA regression

 - Fix compiler warnings in uaccess

* tag 's390-5.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/uaccess: avoid (false positive) compiler warnings
  s390/cio: fix virtio-ccw DMA without PV


Trivial merge