Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit dfd9de55 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19-q.63 (8820b767) into msm-4.19



* refs/heads/tmp-8820b767:
  ANDROID: xfrm: remove in_compat_syscall() checks
  UPSTREAM: binder: Set end of SG buffer area properly.
  x86: Fix RETPOLINE_CFLAGS check
  ANDROID: Fix cuttlefish defconfigs after upstream merge.
  UPSTREAM: binder: check for overflow when alloc for security context
  binder: fix race between munmap() and direct reclaim
  Revert "binder: fix handling of misaligned binder object"
  Revert "fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied"
  x86: Hide the int3_emulate_call/jmp functions from UML
  Enable CONFIG_ION_SYSTEM_HEAP
  ANDROID: Enable LTO and CFI
  Revert "ANDROID: cuttlefish 4.19: enable CONFIG_CRYPTO_AES_NI_INTEL=y"
  BACKPORT: drm/amd/display: add -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines
  ANDROID: x86: use the correct function type for sys_ni_syscall
  ANDROID: x86: use the correct function type for sys32_(rt_)sigreturn
  ANDROID: x86: use the correct function type for native_set_fixmap
  ANDROID: x86: use the correct function type in SYSCALL_DEFINE0
  ANDROID: x86: add support for CONFIG_LTO_CLANG
  ANDROID: x86: disable STACK_VALIDATION with LTO_CLANG
  ANDROID: x86: disable HAVE_ARCH_PREL32_RELOCATIONS with LTO_CLANG
  ANDROID: x86/vdso: disable LTO only for VDSO
  ANDROID: x86/cpu/vmware: use the full form of inl in VMWARE_PORT
  UPSTREAM: x86/build: Keep local relocations with ld.lld
  ANDROID: crypto: arm64/ghash: fix CFI for GHASH CE
  ANDROID: crypto: arm64/sha: fix CFI in SHA CE
  ANDROID: arm64: kvm: disable CFI
  ANDROID: arm64: mark kpti_install_ng_mappings as __nocfi
  ANDROID: arm64: disable CFI for cpu_replace_ttbr1
  FROMLIST: arm64: use the correct function type for __arm64_sys_ni_syscall
  FROMLIST: arm64: use the correct function type in SYSCALL_DEFINE0
  FROMLIST: arm64: fix syscall_fn_t type
  ANDROID: modpost: add an exception for CFI stubs
  ANDROID: ftrace: fix function type mismatches
  FROMLIST: 9p: pass the correct prototype to read_cache_page
  FROMLIST: jffs2: pass the correct prototype to read_cache_page
  UPSTREAM: nfs: pass the correct prototype to read_cache_page
  FROMLIST: mm: don't cast ->readpage to filler_t for do_read_cache_page
  UPSTREAM: netfilter: xt_IDLETIMER: fix sysfs callback function type
  ANDROID: kallsyms: strip the .cfi postfix from symbols with CONFIG_CFI_CLANG
  ANDROID: add support for clang Control Flow Integrity (CFI)
  FROMLIST: arm64: select ARCH_SUPPORTS_LTO_CLANG
  ANDROID: arm64: disable HAVE_ARCH_PREL32_RELOCATIONS with LTO_CLANG
  ANDROID: arm64: add atomic_ll_sc.o to obj-y if using lld
  ANDROID: arm64: lse: fix LSE atomics with LTO
  ANDROID: arm64: vdso: disable LTO
  FROMLIST: arm64: kvm: use -fno-jump-tables with clang
  BACKPORT: arm64: sysreg: Make mrs_s and msr_s macros work with Clang and LTO
  ANDROID: init: ensure initcall ordering with LTO
  ANDROID: drivers/misc: disable LTO for lkdtm_rodata.o
  FROMLIST: efi/libstub: disable LTO
  FROMLIST: scripts/mod: disable LTO for empty.c
  ANDROID: kbuild: disable LTO_CLANG with KASAN
  FROMLIST: kbuild: fix dynamic ftrace with clang LTO
  ANDROID: kbuild: add CONFIG_LD_IS_LLD
  ANDROID: kbuild: add support for clang LTO
  ANDROID: cuttlefish 4.19: enable CONFIG_CRYPTO_AES_NI_INTEL=y
  UPSTREAM: bpf: relax inode permission check for retrieving bpf program
  ANDROID: cuttlefish_defconfig: Disable DEVTMPFS
  ANDROID: block/cfq-iosched: make group_idle per io cgroup tunable
  ANDROID: Move from clang r349610 to r353983c.
  ANDROID: cuttlefish_defconfig: Enable CONFIG_CGROUP_SCHEDTUNE
  ANDROID: cuttlefish_defconfig: Enable CONFIG_XFRM_STATISTICS
  ANDROID: cuttlefish_defconfig: Enable L2TP/PPTP
  Make arm64 serial port config compatible with crosvm
  ANDROID: Makefile: Properly resolve 4.19.35 merge
  ANDROID: cuttlefish_defconfig: Enable CONFIG_FUSE_FS
  ANDROID: cuttlefish_defconfig: Enable CONFIG_OVERLAY_FS
  ANDROID: cuttlefish: enable CONFIG_NET_SCH_INGRESS=y
  UPSTREAM: virt_wifi: Remove REGULATORY_WIPHY_SELF_MANAGED

Conflicts:
	arch/x86/include/asm/syscall_wrapper.h
	drivers/misc/lkdtm/Makefile
	fs/f2fs/f2fs.h
	fs/f2fs/file.c
	fs/f2fs/gc.c
	fs/f2fs/segment.c
	include/linux/compiler-clang.h
	scripts/link-vmlinux.sh

Change-Id: If4037ee12fee3db1fe073ffd97556f30a696a0c7
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 5996b2fe 8820b767
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment