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

Pull ARM updates from Russell King:

 - remove a now unnecessary usage of the KERNEL_DS for
   sys_oabi_epoll_ctl()

 - update my email address in a number of drivers

 - decompressor EFI updates from Ard Biesheuvel

 - module unwind section handling updates

 - sparsemem Kconfig cleanups

 - make act_mm macro respect THREAD_SIZE

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8980/1: Allow either FLATMEM or SPARSEMEM on the multiplatform build
  ARM: 8979/1: Remove redundant ARCH_SPARSEMEM_DEFAULT setting
  ARM: 8978/1: mm: make act_mm() respect THREAD_SIZE
  ARM: decompressor: run decompressor in place if loaded via UEFI
  ARM: decompressor: move GOT into .data for EFI enabled builds
  ARM: decompressor: defer loading of the contents of the LC0 structure
  ARM: decompressor: split off _edata and stack base into separate object
  ARM: decompressor: move headroom variable out of LC0
  ARM: 8976/1: module: allow arch overrides for .init section names
  ARM: 8975/1: module: fix handling of unwind init sections
  ARM: 8974/1: use SPARSMEM_STATIC when SPARSEMEM is enabled
  ARM: 8971/1: replace the sole use of a symbol with its definition
  ARM: 8969/1: decompressor: simplify libfdt builds
  Update rmk's email address in various drivers
  ARM: compat: remove KERNEL_DS usage in sys_oabi_epoll_ctl()

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/compressed/vmlinux.lds.S
Simple merge

diff --cc arch/arm/include/asm/assembler.h
Simple merge

diff --cc drivers/firmware/efi/libstub/arm32-stub.c
index b038afe2ee7a3739f0695da41ef06c815dca2041,0050d811bf20f7116d19b8ceb5c4da16ead56cdd..40243f524556cbed96db4f681b13ce9915449a6a
--- 1/drivers/firmware/efi/libstub/arm32-stub.c
--- 2/drivers/firmware/efi/libstub/arm32-stub.c
+++ b/drivers/firmware/efi/libstub/arm32-stub.c
@@@ -215,11 -209,10 +209,10 @@@ efi_status_t handle_kernel_image(unsign
         * base of the kernel image is only partially used at the moment.
         * (Up to 5 pages are used for the swapper page tables)
         */
-       kernel_base += TEXT_OFFSET - 5 * PAGE_SIZE;
- 
-       status = reserve_kernel_base(kernel_base, reserve_addr, reserve_size);
+       status = reserve_kernel_base(kernel_base - 5 * PAGE_SIZE, reserve_addr,
+                                    reserve_size);
        if (status != EFI_SUCCESS) {
 -              pr_efi_err("Unable to allocate memory for uncompressed kernel.\n");
 +              efi_err("Unable to allocate memory for uncompressed kernel.\n");
                return status;
        }
  

diff --cc kernel/module.c
Simple merge