Merge branch 'for-5.0/upstream-fixes' into for-next
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Tue, 29 Jan 2019 11:11:37 +0000 (12:11 +0100)
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>
Tue, 29 Jan 2019 11:11:37 +0000 (12:11 +0100)

Trivial merge