Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM updates from Russell King:

 - Generalise byte swapping assembly

 - Update debug addresses for STI

 - Validate start of physical memory with DTB

 - Do not clear SCTLR.nTLSMD in decompressor

 - amba/locomo/sa1111 devices remove method return type is void

 - address markers for KASAN in page table dump

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9065/1: OABI compat: fix build when EPOLL is not enabled
  ARM: 9055/1: mailbox: arm_mhuv2: make remove callback return void
  amba: Make use of bus_type functions
  amba: Make the remove callback return void
  vfio: platform: simplify device removal
  amba: reorder functions
  amba: Fix resource leak for drivers without .remove
  ARM: 9054/1: arch/arm/mm/mmu.c: Remove duplicate header
  ARM: 9053/1: arm/mm/ptdump:Add address markers for KASAN regions
  ARM: 9051/1: vdso: remove unneded extra-y addition
  ARM: 9050/1: Kconfig: Select ARCH_HAVE_NMI_SAFE_CMPXCHG where possible
  ARM: 9049/1: locomo: make locomo bus's remove callback return void
  ARM: 9048/1: sa1111: make sa1111 bus's remove callback return void
  ARM: 9047/1: smp: remove unused variable
  ARM: 9046/1: decompressor: Do not clear SCTLR.nTLSMD for ARMv7+ cores
  ARM: 9045/1: uncompress: Validate start of physical memory against passed DTB
  ARM: 9042/1: debug: no uncompress debugging while semihosting
  ARM: 9041/1: sti LL_UART: add STiH418 SBC UART0 support
  ARM: 9040/1: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti LL_UART
  ARM: 9039/1: assembler: generalize byte swapping macro into rev_l

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
index c36c5d4c6e9cb4bae396a258e2f04630baa39bd3,7a8697a97c983e6726700a10608e44212faffddc..9e0b5e7f12af69dca9c9dd32ce6c750574e71ccd
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1546,7 -1623,10 +1550,9 @@@ config DEBUG_LL_INCLUD
        default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4
        default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART || DEBUG_S3C64XX_UART
        default "debug/s5pv210.S" if DEBUG_S5PV210_UART
-       default "debug/sti.S" if DEBUG_STI_UART
 -      default "debug/sirf.S" if DEBUG_SIRFSOC_UART
+       default "debug/sti.S" if DEBUG_STIH41X_ASC2
+       default "debug/sti.S" if DEBUG_STIH41X_SBC_ASC1
+       default "debug/sti.S" if DEBUG_STIH418_SBC_ASC0
        default "debug/stm32.S" if DEBUG_STM32_UART
        default "debug/tegra.S" if DEBUG_TEGRA_UART
        default "debug/ux500.S" if DEBUG_UX500_UART
@@@ -1579,6 -1659,8 +1585,7 @@@ config DEBUG_UART_PHY
        default 0x02531000 if DEBUG_KEYSTONE_UART1
        default 0x03010fe0 if ARCH_RPC
        default 0x07000000 if DEBUG_SUN9I_UART0
 -      default 0x09405000 if DEBUG_ZTE_ZX
+       default 0x09530000 if DEBUG_STIH418_SBC_ASC0
        default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \
                                DEBUG_VEXPRESS_UART0_CA9
        default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
@@@ -1698,8 -1789,10 +1707,10 @@@
                DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
                DEBUG_S3C64XX_UART || \
                DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
 -              DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
 +              DEBUG_DIGICOLOR_UA0 || \
-               DEBUG_AT91_UART || DEBUG_STM32_UART
+               DEBUG_AT91_UART || DEBUG_STM32_UART || \
+               DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
+               DEBUG_STIH418_SBC_ASC0
  
  config DEBUG_UART_VIRT
        hex "Virtual base address of debug UART"
@@@ -1760,9 -1854,12 +1772,11 @@@
        default 0xfb020000 if DEBUG_OMAP3UART3
        default 0xfb042000 if DEBUG_OMAP3UART4
        default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
 -      default 0xfc705000 if DEBUG_ZTE_ZX
        default 0xfcfe8600 if DEBUG_BCM63XX_UART
        default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
+       default 0xfd531000 if DEBUG_STIH41X_SBC_ASC1
        default 0xfd883000 if DEBUG_ALPINE_UART0
+       default 0xfdd32000 if DEBUG_STIH41X_ASC2
        default 0xfe010000 if STM32MP1_DEBUG_UART
        default 0xfe017000 if DEBUG_MMP_UART2
        default 0xfe018000 if DEBUG_MMP_UART3
@@@ -1802,8 -1904,10 +1816,10 @@@
                DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
                DEBUG_S3C64XX_UART || \
                DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
 -              DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
 +              DEBUG_DIGICOLOR_UA0 || \
-               DEBUG_AT91_UART || DEBUG_STM32_UART
+               DEBUG_AT91_UART || DEBUG_STM32_UART || \
+               DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
+               DEBUG_STIH418_SBC_ASC0
  
  config DEBUG_UART_8250_SHIFT
        int "Register offset shift for the 8250 debug UART"

diff --cc drivers/gpu/drm/pl111/pl111_drv.c
Simple merge

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

diff --cc drivers/rtc/rtc-pl031.c
Simple merge

diff --cc sound/arm/aaci.c
Simple merge