Greg Kroah-Hartman 7ca039f50b Merge 6417f03132 ("module: remove never implemented MODULE_SUPPORTED_DEVICE") into android-mainline ...

Steps on the way to 5.12-rc4.

Resolves merge issues with:
	fs/fuse/dev.c
	include/uapi/linux/fuse.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia8d9041a3c23eb26b089cbdc399e98f1c2121606

2021-03-20 10:26:16 +01:00

23 KiB

Raw Blame History

View Raw