Merge android-4.14 (a895cea2) into msm-4.14
* refs/heads/tmp-a895cea2: Revert "ANDROID: sched: Fix share_cap_level detect" ANDROID: cuttlefish_defconfig: Add support for AC97 audio ANDROID: overlayfs: override_creds=off option bypass creator_cred ANDROID: cuttlefish: enable CONFIG_NETFILTER_XT_TARGET_CT=y Revert "ANDROID: arm: process: Add display of memory around registers when displaying regs." Revert "ANDROID: overlayfs: override_creds=off option bypass creator_cred" ANDROID: overlayfs: override_creds=off option bypass creator_cred FROMGIT: binder: create node flag to request sender's security context ANDROID: revert "net: ipv4: sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size" ANDROID: cpufreq: times: optimize proc files ANDROID: sched/walt: Fix the potential bad unlock issue ANDROID: sched/fair: Don't double account RT util in boosted_cpu_util() ANDROID: cpufreq: times: record fast switch frequency transitions ANDROID: DEBUG: fix build error when Macro DEBUG_EENV_DECISIONS is defined ANDROID: cuttlefish: enable CONFIG_NET_SCH_NETEM=y ANDROID: sched/walt: Fix lockdep assert issue Add XFRM-I to cuttlefish defconfigs ANDROID: Move from clang r346389b to r349610. ANDROID: Turn xt_owner module on ANDROID: Remove xt_qtaguid module from new kernels. UPSTREAM: virt_wifi: fix error return code in virt_wifi_newlink() ANDROID: arm64: lse: fix LSE atomics with LTO UPSTREAM: net: dev_is_mac_header_xmit() true for ARPHRD_RAWIP UPSTREAM: binder: filter out nodes when showing binder procs UPSTREAM: xfrm: Make set-mark default behavior backward compatible ANDROID: cuttlefish_defconfig: Enable CONFIG_RTC_HCTOSYS ANDROID: sched/rt: fix the problem that rt_rq's util is always zero. ANDROID: sched: Fix share_cap_level detect ANDROID: cfi: fix shadow rebasing UPSTREAM: dm: do not allow readahead to limit IO size UPSTREAM: ppp: Move PFC decompression to PPP generic layer UPSTREAM: l2tp: Add protocol field decompression BACKPORT: l2tp: remove ->recv_payload_hook UPSTREAM: zram: idle writeback fixes and cleanup UPSTREAM: zram: writeback throttle UPSTREAM: zram: add bd_stat statistics UPSTREAM: zram: support idle/huge page writeback UPSTREAM: zram: introduce ZRAM_IDLE flag UPSTREAM: zram: refactor flags and writeback stuff UPSTREAM: zram: fix lockdep warning of free block handling ANDROID: cuttlefish_defconfig: Enable vsock options ANDROID: mnt: Propagate remount correctly UPSTREAM: loop: drop caches if offset or block_size are changed UPSTREAM: crypto: adiantum - initialize crypto_spawn::inst UPSTREAM: crypto: adiantum - fix leaking reference to hash algorithm UPSTREAM: crypto: adiantum - adjust some comments to match latest paper UPSTREAM: crypto: adiantum - propagate CRYPTO_ALG_ASYNC flag to instance ANDROID: cuttlefish: enable CONFIG_NET_CLS_BPF=y Makefile: Fix 4.14.93 resolution ANDROID: cuttlefish_defconfig: remove DM_VERITY_HASH_PREFETCH_MIN_SIZE Revert "ANDROID: dm: verity: add minimum prefetch size" ANDROID: f2fs: Complement "android_fs" tracepoint of read path Conflicts: Documentation/ABI/testing/sysfs-block-zram Documentation/blockdev/zram.txt Makefile drivers/block/zram/zram_drv.c drivers/block/zram/zram_drv.h drivers/md/Kconfig include/uapi/linux/android/binder.h kernel/sched/core.c kernel/sched/cpufreq_schedutil.c kernel/sched/fair.c net/l2tp/l2tp_ppp.c net/netfilter/xt_qtaguid.c Change-Id: Ie4e343210602d26c0319138deb71ff0788e90a87 Signed-off-by:Blagovest Kolenichev <bkolenichev@codeaurora.org>
Loading
Please register or sign in to comment