Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

diff --cc arch/arm64/kernel/cpuinfo.c
Simple merge

diff --cc drivers/dma/bcm2835-dma.c
Simple merge

diff --cc drivers/mmc/host/sdhci.c
Simple merge

diff --cc drivers/net/can/spi/mcp251x.c
Simple merge