tree ff7e0852c8d3c147358827909eced14120d07fee
parent 5360accbfa4c68459f019436e5830d5d49c4b890
author Dmitry Shmidt <dimitrysh@google.com> 1515534684 -0800
committer Dmitry Shmidt <dimitrysh@google.com> 1515534684 -0800

hikey: Update kernel to 4.9.75, 4.4.110 and 3.18.91

Kernel 4.9:
a324f38b392c Merge remote-tracking branch 'common/android-4.9' into hikey-4.9
b328e524c85a ANDROID: arm64: kaslr: fixup Falkor workaround for 4.9
8b8f9163905e Merge remote-tracking branch 'common/android-4.9' into hikey-4.9
b54d99aa12b4 ANDROID: usb: f_fs: Prevent gadget unbind if it is already unbound
5f5e5d4041e3 arm64: Kconfig: Reword UNMAP_KERNEL_AT_EL0 kconfig entry
753593688bfa arm64: use RET instruction for exiting the trampoline
06fe41f85237 UPSTREAM: arm64: kaslr: Put kernel vectors address in separate data page
d7013ede2604 UPSTREAM: arm64: mm: Introduce TTBR_ASID_MASK for getting at the ASID in the TTBR
16f712b456b1 UPSTREAM: arm64: Kconfig: Add CONFIG_UNMAP_KERNEL_AT_EL0
f79ff2d82888 UPSTREAM: arm64: entry: Add fake CPU feature for unmapping the kernel at EL0
da1016a56351 UPSTREAM: arm64: tls: Avoid unconditional zeroing of tpidrro_el0 for native tasks
04b77fe9ae8d UPSTREAM: arm64: erratum: Work around Falkor erratum #E1003 in trampoline code
c27a22583423 UPSTREAM: arm64: entry: Hook up entry trampoline to exception vectors
8fdbffb11915 UPSTREAM: arm64: entry: Explicitly pass exception level to kernel_ventry macro
5e54c4b6a795 UPSTREAM: arm64: mm: Map entry trampoline into trampoline and kernel page tables
a329b068c97b UPSTREAM: arm64: entry: Add exception trampoline page for exceptions from EL0
2053d3c3b488 UPSTREAM: arm64: mm: Invalidate both kernel and user ASIDs when performing TLBI
d6ca455d0a00 UPSTREAM: arm64: mm: Add arm64_kernel_unmapped_at_el0 helper
5914b11611d5 UPSTREAM: arm64: mm: Allocate ASIDs in pairs
599c71f8be4a UPSTREAM: arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN
071a49fc82b4 UPSTREAM: arm64: mm: Rename post_ttbr0_update_workaround
a72dd8a67665 UPSTREAM: arm64: mm: Move ASID from TTBR0 to TTBR1
dee3b246017c UPSTREAM: arm64: mm: Temporarily disable ARM64_SW_TTBR0_PAN
19d3691ff6cb UPSTREAM: arm64: mm: Use non-global mappings for kernel space
17d3592068c2 UPSTREAM: arm64: factor out entry stack manipulation
bc7ff9b9988f Merge 4.9.75 into android-4.9
9f74755895f9 Linux 4.9.75
...

Kernel 4.4:
256c216775e6 Merge remote-tracking branch 'common/android-4.4' into hikey-4.4
eb4909b080c4 ANDROID: usb: f_fs: Prevent gadget unbind if it is already unbound
dac143966992 arm64: Kconfig: Reword UNMAP_KERNEL_AT_EL0 kconfig entry
c65273a83da7 arm64: use RET instruction for exiting the trampoline
8a345128f74e FROMLIST: arm64: kaslr: Put kernel vectors address in separate data page
c62a3d7a8de5 FROMLIST: arm64: mm: Introduce TTBR_ASID_MASK for getting at the ASID in the TTBR
d891a62401ae FROMLIST: arm64: Kconfig: Add CONFIG_UNMAP_KERNEL_AT_EL0
472e95061e6a FROMLIST: arm64: entry: Add fake CPU feature for unmapping the kernel at EL0
59eae0dbcf6c FROMLIST: arm64: tls: Avoid unconditional zeroing of tpidrro_el0 for native tasks
c6e2ad951f73 FROMLIST: arm64: erratum: Work around Falkor erratum #E1003 in trampoline code
75f5a2df1df3 FROMLIST: arm64: entry: Hook up entry trampoline to exception vectors
3dcb84674478 FROMLIST: arm64: entry: Explicitly pass exception level to kernel_ventry macro
39685f556c0c FROMLIST: arm64: mm: Map entry trampoline into trampoline and kernel page tables
6fdb633b0b4f FROMLIST: arm64: entry: Add exception trampoline page for exceptions from EL0
47b558b42991 FROMLIST: arm64: mm: Invalidate both kernel and user ASIDs when performing TLBI
9497136713f6 FROMLIST: arm64: mm: Add arm64_kernel_unmapped_at_el0 helper
290ef683657c FROMLIST: arm64: mm: Allocate ASIDs in pairs
d99c809e7f5d FROMLIST: arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN
76546093d430 FROMLIST: arm64: mm: Move ASID from TTBR0 to TTBR1
0d78166ea4cb FROMLIST: arm64: mm: Temporarily disable ARM64_SW_TTBR0_PAN
44f905b3a22f FROMLIST: arm64: mm: Use non-global mappings for kernel space
7f436e6b4ec6 UPSTREAM: arm64: factor out entry stack manipulation
56089a8a56dd UPSTREAM: arm64: tlbflush.h: add __tlbi() macro
5cc8c2ec619e Merge 4.4.110 into android-4.4
b3e3db15b450 Linux 4.4.110

Kernel 3.18:
1d7e60888035 Merge remote-tracking branch 'common/android-3.18' into hikey-3.18
2897537bc331 arm64: Kconfig: Reword UNMAP_KERNEL_AT_EL0 kconfig entry
5baaf50ec1ec arm64: use RET instruction for exiting the trampoline
90523e83073b FROMLIST: arm64: kaslr: Put kernel vectors address in separate data page
7b87b5746ca2 FROMLIST: arm64: mm: Introduce TTBR_ASID_MASK for getting at the ASID in the TTBR
3ec3abcbf78f FROMLIST: arm64: Kconfig: Add CONFIG_UNMAP_KERNEL_AT_EL0
2b4c5c1fdab1 FROMLIST: arm64: entry: Add fake CPU feature for unmapping the kernel at EL0
f47c91dcfa2a FROMLIST: arm64: tls: Avoid unconditional zeroing of tpidrro_el0 for native tasks
1766a613ec0c FROMLIST: arm64: erratum: Work around Falkor erratum #E1003 in trampoline code
5ed26716ffb7 FROMLIST: arm64: entry: Hook up entry trampoline to exception vectors
eb8401717f41 FROMLIST: arm64: entry: Explicitly pass exception level to kernel_ventry macro
771dd6d68c7b FROMLIST: arm64: mm: Map entry trampoline into trampoline and kernel page tables
6415b1f83e55 FROMLIST: arm64: entry: Add exception trampoline page for exceptions from EL0
eed2e0023666 FROMLIST: arm64: mm: Invalidate both kernel and user ASIDs when performing TLBI
1434f49fc0da FROMLIST: arm64: mm: Add arm64_kernel_unmapped_at_el0 helper
b7032349724a FROMLIST: arm64: mm: Allocate ASIDs in pairs
4ea2126b109f FROMLIST: arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN
6de449786ee4 FROMLIST: arm64: mm: Move ASID from TTBR0 to TTBR1
735e1554285a FROMLIST: arm64: mm: Temporarily disable ARM64_SW_TTBR0_PAN
b92b29768a63 FROMLIST: arm64: mm: Use non-global mappings for kernel space
e906a2103439 BACKPORT: arm64: fix R/O permissions of FDT mapping
76ec6821bd1f UPSTREAM: arm64: introduce mov_q macro to move a constant into a 64-bit register
6e0432e6d084 UPSTREAM: arm64: mm: keep reserved ASIDs in sync with mm after multiple rollovers
1ee4be715741 UPSTREAM: arm64: factor out entry stack manipulation
e0c5ba8cd917 UPSTREAM: arm64: tlbflush.h: add __tlbi() macro
a56758feb0ba ANDROID: sdcardfs: Add default_normal option
fd825dd8ffd9 ANDROID: sdcardfs: notify lower file of opens
73cbcb8a02f9 BACKPORT: aio: mark AIO pseudo-fs noexec
c630bcb40c8d Merge remote-tracking branch 'common/android-3.18' into hikey-3.18
7aa67ee8fa08 Merge 3.18.91 into android-3.18
788ccf7552c8 Linux 3.18.91

Bug: 71762009
Bug: 71600553
Test: Manual

Change-Id: Ic03cb279a41c26f1d32d9db67dcd4c7e178294b1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>