* sm8250/lineage-20:
CIP: Bump version suffix to -cip125 after merge from cip/linux-4.19.y-st tree
Update localversion-st, tree is up-to-date with 5.4.300.
UPSTREAM: jffs2: Fix mounting under new mount API
UPSTREAM: vfs: Convert ramfs, shmem, tmpfs, devtmpfs, rootfs to use the new mount API
UPSTREAM: make shmem_fill_super() static
UPSTREAM: make ramfs_fill_super() static
UPSTREAM: don't bother with registering rootfs
UPSTREAM: devtmpfs: don't mix {ramfs,shmem}_fill_super() with mount_single()
UPSTREAM: shmem_parse_one(): switch to use of fs_parse()
UPSTREAM: shmem_parse_options(): take handling a single option into a helper
UPSTREAM: shmem_parse_options(): don't bother with mpol in separate variable
UPSTREAM: shmem_parse_options(): use a separate structure to keep the results
UPSTREAM: fs: fs_parser: fix printk format warning
BACKPORT: maccess: rename probe_user_{read,write} to copy_{from,to}_user_nofault
BACKPORT: maccess: rename probe_kernel_address to get_kernel_nofault
BACKPORT: tracing/kprobes: handle mixed kernel/userspace probes better
BACKPORT: maccess: rename probe_kernel_{read,write} to copy_{from,to}_kernel_nofault
UPSTREAM: maccess: unexport probe_kernel_write()
UPSTREAM: maccess: return -ERANGE when probe_kernel_read() fails
UPSTREAM: maccess: allow architectures to provide kernel probing directly
...
Conflicts:
fs/fuse/dev.c
Change-Id: I1a6d1ef1ec4fea9084a2569add60b866b7f03166
Michael Bestas
fc3a53b3c5