Merge tag 'for-linus-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 May 2020 19:56:21 +0000 (12:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 May 2020 19:56:21 +0000 (12:56 -0700)
commitd303402c288340f9094fa0ba697600335a41bc3e
treeedb1de1314c5e0eb9739ba5135ae40e0e17fe738
parent2ea1940b84e55420a9e8feddcafd173edfe4df11
parent2e27d33d22afa3d12746f854d6a4fad7ad7b86de
Merge tag 'for-linus-5.7-rc6' of git://git./linux/kernel/git/rw/uml

Pull UML fixes from Richard Weinberger:

 - Two missing includes which caused build issues on recent systems

 - Correctly set TRANS_GRE_LEN in our vector network driver

* tag 'for-linus-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Fix typo in vector driver transport option definition
  um: syscall.c: include <asm/unistd.h>
  um: Fix xor.h include