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

Skip to content
Commit 297cae3b authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14-q.133 (213d41ad) into msm-4.14



* refs/heads/tmp-213d41ad:
  dm: Restore reverted changes
  BACKPORT: security: Implement Clang's stack initialization
  BACKPORT: security: Create "kernel hardening" config area
  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"
  Revert "UPSTREAM: fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...")"
  Revert "x86/build: Move _etext to actual end of .text"
  x86: Hide the int3_emulate_call/jmp functions from UML
  Enable CONFIG_ION_SYSTEM_HEAP
  UPSTREAM: fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...")
  UPSTREAM: bpf: relax inode permission check for retrieving bpf program
  ANDROID: cuttlefish 4.14: enable CONFIG_CRYPTO_AES_NI_INTEL=y
  BACKPORT: fix "netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'"
  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_CPUSETS and 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.14.112 merge
  Revert "CHROMIUM: dm: boot time specification of dm="
  Revert "ANDROID: dm: do_mounts_dm: Rebase on top of 4.9"
  Revert "ANDROID: dm: do_mounts_dm: fix dm_substitute_devices()"
  Revert "ANDROID: dm: do_mounts_dm: Update init/do_mounts_dm.c to the latest ChromiumOS version."
  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:
	Makefile
	fs/f2fs/file.c
	fs/f2fs/gc.c
	fs/f2fs/segment.c

Change-Id: I2785c85c1ea01ba41290aa419ca6c93f1c338ce2
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 9df0a06b 6b688c3c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment