Merge 5.10-rc7 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Dec 2020 09:08:14 +0000 (10:08 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Dec 2020 09:08:14 +0000 (10:08 +0100)
commita3ab07c642b2d75e645b1a07464291e325a496e0
treec5b423b58698a9c7b7a9545d085ab4e776fa610f
parent888982a847520a5abfd036a0cc6426c55e71f76c
parent0477e92881850d44910a7e94fc2c46f96faa131f
Merge 5.10-rc7 into char-misc-next

We want the fixes in here, and this resolves a merge issue with
drivers/misc/habanalabs/common/memory.c.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/misc/habanalabs/common/device.c