Hi Kevin,

Please consider following linaro-android pull request for "linux-linaro-lsk-v3.18-android" branch. There are no linaro fixes to go on top this time around.

aosp/android-3.18 pushed quiet a few patches backported from upstream, which resulted in few merge conflicts. Here is the link[1] to merge commit log for reference.

Regards, Amit Pundir [1] https://android-git.linaro.org/gitweb/kernel/linaro-android.git/commit/c2fab...

The following changes since commit 717ba9113b87cae180d7c9f2078e76359bc9bcca:

Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android (2015-09-27 22:10:16 -0700)

are available in the git repository at:

git://android.git.linaro.org/kernel/linaro-android.git linux-linaro-lsk-v3.18-android

for you to fetch changes up to c2fab09b2ec32f252029757ba3353ea3d308c811:

Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common (2015-10-13 17:42:54 +0530)

----------------------------------------------------------------

Amit Pundir (3): net: core: fix UID-based routing build Revert "HACK: usb: gadget: Fix enumeration on boot" Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common

Ard Biesheuvel (17): UPSTREAM: arm64/efi: efistub: jump to 'stext' directly, not through the header UPSTREAM: arm64/efi: set PE/COFF section alignment to 4 KB UPSTREAM: arm64/efi: set PE/COFF file alignment to 512 bytes UPSTREAM: arm64/efi: invert UEFI memory region reservation logic UPSTREAM: arm64/efi: drop redundant set_bit(EFI_CONFIG_TABLES) UPSTREAM: efi: dmi: add support for SMBIOS 3.0 UEFI configuration table UPSTREAM: dmi: add support for SMBIOS 3.0 64-bit entry point UPSTREAM: arm64: dmi: set DMI string as dump stack arch description UPSTREAM: arm64/mm: add explicit struct_mm argument to __create_mapping() UPSTREAM: arm64/mm: add create_pgd_mapping() to create private page tables UPSTREAM: efi: split off remapping code from efi_config_init() UPSTREAM: efi: efistub: allow allocation alignment larger than EFI_PAGE_SIZE UPSTREAM: arm64/efi: set EFI_ALLOC_ALIGN to 64 KB UPSTREAM: arm64/efi: move SetVirtualAddressMap() to UEFI stub UPSTREAM: arm64/efi: remove free_boot_services() and friends UPSTREAM: arm64/efi: add missing call to early_ioremap_reset() UPSTREAM: arm64/efi: remove idmap manipulations from UEFI code

Ding Tianhong (1): UPSTREAM: arm64: remove the unnecessary arm64_swiotlb_init()

Doug Anderson (2): UPSTREAM: arm: kgdb: Handle read-only text / modules UPSTREAM: ARM: 8425/1: kgdb: Don't try to stop the machine when setting breakpoints

Erik Kline (3): net: ipv6: Add a sysctl to make optimistic addresses useful candidates net: ipv6: allow explicitly choosing optimistic addresses ipv6: sysctl to restrict candidate source addresses

JeHyeon Yeon (1): LZ4 : fix the data abort issue

Jeff Vander Stoep (1): selinux: do not check open perm on ftruncate call

Jin Qian (1): arm64: pass return address to dma_common_contiguous_remap

Jon Medhurst (1): net: PPPoPNS: Remove length argument from data_ready

Kees Cook (3): UPSTREAM: arm: fixmap: implement __set_fixmap() BACKPORT: ARM: mm: allow non-text sections to be non-executable UPSTREAM: ARM: mm: allow text and rodata sections to be read-only

Kevin Hilman (1): android: configs: base: enable IPV6

Krzysztof Kolasa (1): lz4: fix system halt at boot kernel on x86_64

Laura Abbott (9): UPSTREAM: arm64: Treat handle_arch_irq as a function pointer UPSTREAM: arm64: Switch to adrp for loading the stub vectors UPSTREAM: arm64: Move cpu_resume into the text section UPSTREAM: arm64: Factor out fixmap initialization from ioremap UPSTREAM: arm64: Add FIX_HOLE to permanent fixed addresses UPSTREAM: arm64: add support to dump the kernel page tables UPSTREAM: arm64: Move some head.text functions to executable section UPSTREAM: arm64: use fixmap for text patching UPSTREAM: arm64: add better page protections to arm64

Linus Torvalds (1): Initialize msg/shm IPC objects before doing ipc_addid()

Lorenzo Colitti (3): net: ping: Return EAFNOSUPPORT when appropriate. Revert "net: ipv6: allow choosing optimistic addresses with use_optimistic" Revert "net: ipv6: Add a sysctl to make optimistic addresses useful candidates"

Mark Rutland (2): UPSTREAM: arm64: jump labels: NOP out NOP -> NOP replacement UPSTREAM: efi: efi-stub: notify on DTB absence

Mark Salter (1): UPSTREAM: arm: use generic fixmap.h

Mark Salyzyn (1): ARM64 readahead: fault retry breaks mmap file read random detection

Martijn Coenen (1): lowmemorykiller: trace kill events.

Nikolay Borisov (1): UPSTREAM: ARM: kexec: Make .text R/W in machine_kexec

Phillip Lougher (2): Squashfs: add LZ4 compression support Squashfs: Add LZ4 compression configuration option

Rabin Vincent (1): UPSTREAM: arm: use fixmap for text patching when text is RO

Rasmus Villemoes (1): lib/lz4: Pull out constant tables

Rob Herring (1): UPSTREAM: ARM: expand fixmap region to 3MB

Sami Tolvanen (2): crypto: arm/sha256 - Add optimized SHA-256/224 dm-verity: Add modes and emit uevent on corrupted blocks

Sreeram Ramachandran (1): Handle 'sk' being NULL in UID-based routing.

YOSHIFUJI Hideaki (1): ipv6: Remove unused arguments for __ipv6_dev_get_saddr().

YOSHIFUJI Hideaki/吉藤英明 (2): ipv6: Do not iterate over all interfaces when finding source address on specific interface. ipv6: Fix finding best source address in ipv6_dev_get_saddr().

Yi Li (1): UPSTREAM: arm64: dmi: Add SMBIOS/DMI support

Documentation/arm/memory.txt | 2 +- Documentation/device-mapper/verity.txt | 12 +- Documentation/filesystems/squashfs.txt | 8 +- Documentation/networking/ip-sysctl.txt | 7 + arch/arm/crypto/Makefile | 8 +- arch/arm/crypto/sha256-armv4.pl | 716 +++++++++++++++++++++++++ arch/arm/crypto/sha256-core.S_shipped | 2808 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/crypto/sha256_glue.c | 246 +++++++++ arch/arm/crypto/sha256_glue.h | 23 + arch/arm/crypto/sha256_neon_glue.c | 172 ++++++ arch/arm/include/asm/cacheflush.h | 10 + arch/arm/include/asm/fixmap.h | 31 +- arch/arm/kernel/Makefile | 2 +- arch/arm/kernel/ftrace.c | 19 + arch/arm/kernel/jump_label.c | 2 +- arch/arm/kernel/kgdb.c | 31 ++ arch/arm/kernel/machine_kexec.c | 9 +- arch/arm/kernel/patch.c | 92 +++- arch/arm/kernel/patch.h | 12 +- arch/arm/kernel/vmlinux.lds.S | 21 +- arch/arm/mm/Kconfig | 21 + arch/arm/mm/highmem.c | 15 +- arch/arm/mm/init.c | 149 +++++- arch/arm/mm/mmu.c | 39 +- arch/arm64/Kconfig | 11 + arch/arm64/Kconfig.debug | 35 ++ arch/arm64/include/asm/cacheflush.h | 5 + arch/arm64/include/asm/dmi.h | 31 ++ arch/arm64/include/asm/efi.h | 38 +- arch/arm64/include/asm/fixmap.h | 9 +- arch/arm64/include/asm/irq.h | 1 - arch/arm64/include/asm/mmu.h | 5 +- arch/arm64/include/asm/pgtable.h | 5 + arch/arm64/kernel/efi-entry.S | 3 +- arch/arm64/kernel/efi.c | 400 +++++--------- arch/arm64/kernel/entry.S | 6 +- arch/arm64/kernel/head.S | 434 ++++++++------- arch/arm64/kernel/insn.c | 47 +- arch/arm64/kernel/irq.c | 2 + arch/arm64/kernel/jump_label.c | 23 +- arch/arm64/kernel/setup.c | 3 +- arch/arm64/kernel/vmlinux.lds.S | 34 +- arch/arm64/mm/Makefile | 1 + arch/arm64/mm/dma-mapping.c | 2 +- arch/arm64/mm/dump.c | 332 ++++++++++++ arch/arm64/mm/fault.c | 1 + arch/arm64/mm/init.c | 1 + arch/arm64/mm/ioremap.c | 93 +--- arch/arm64/mm/mm.h | 3 +- arch/arm64/mm/mmu.c | 337 ++++++++++-- crypto/Kconfig | 8 + drivers/firmware/dmi_scan.c | 79 ++- drivers/firmware/efi/efi.c | 60 ++- drivers/firmware/efi/libstub/arm-stub.c | 70 ++- drivers/firmware/efi/libstub/efi-stub-helper.c | 25 +- drivers/firmware/efi/libstub/efistub.h | 4 + drivers/firmware/efi/libstub/fdt.c | 62 ++- drivers/md/dm-verity.c | 102 +++- drivers/staging/android/lowmemorykiller.c | 12 +- drivers/staging/android/trace/lowmemorykiller.h | 41 ++ drivers/usb/gadget/udc/udc-core.c | 10 +- drivers/xen/efi.c | 1 + fs/squashfs/Kconfig | 15 + fs/squashfs/Makefile | 1 + fs/squashfs/decompressor.c | 7 + fs/squashfs/decompressor.h | 4 + fs/squashfs/lz4_wrapper.c | 142 +++++ fs/squashfs/squashfs_fs.h | 1 + include/linux/efi.h | 8 +- include/linux/ipv6.h | 1 + include/net/addrconf.h | 3 + include/net/route.h | 3 +- include/uapi/linux/ipv6.h | 1 + ipc/msg.c | 14 +- ipc/shm.c | 13 +- ipc/util.c | 8 +- lib/lz4/lz4_decompress.c | 30 +- net/ipv6/addrconf.c | 244 +++++---- net/ipv6/ndisc.c | 4 +- security/selinux/hooks.c | 3 +- 80 files changed, 6399 insertions(+), 894 deletions(-) create mode 100644 arch/arm/crypto/sha256-armv4.pl create mode 100644 arch/arm/crypto/sha256-core.S_shipped create mode 100644 arch/arm/crypto/sha256_glue.c create mode 100644 arch/arm/crypto/sha256_glue.h create mode 100644 arch/arm/crypto/sha256_neon_glue.c create mode 100644 arch/arm64/include/asm/dmi.h create mode 100644 arch/arm64/mm/dump.c create mode 100644 drivers/staging/android/trace/lowmemorykiller.h create mode 100644 fs/squashfs/lz4_wrapper.c