From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 May 2020 19:56:21 +0000 (-0700)
Subject: Merge tag 'for-linus-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
X-Git-Tag: v5.7-rc7~27
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d303402c288340f9094fa0ba697600335a41bc3e;p=linux.git

Merge tag 'for-linus-5.7-rc6' of git://git.kernel.org/pub/scm/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
---

d303402c288340f9094fa0ba697600335a41bc3e