Merge android-4.14 (fab7352c) into msm-4.14
* refs/heads/tmp-fab7352c: f2fs: don't access node/meta inode mapping after iput f2fs: wait on atomic writes to count F2FS_CP_WB_DATA ANDROID: sched/fair: correct pelt load information in sched-pelt.h f2fs: sanity check of xattr entry size f2fs: fix use-after-free issue when accessing sbi->stat_info f2fs: check PageWriteback flag for ordered case f2fs: fix validation of the block count in sanity_check_raw_super f2fs: fix missing unlock(sbi->gc_mutex) f2fs: fix to dirty inode synchronously f2fs: clean up structure extent_node f2fs: fix block address for __check_sit_bitmap f2fs: fix sbi->extent_list corruption issue f2fs: clean up checkpoint flow f2fs: flush stale issued discard candidates f2fs: correct wrong spelling, issing_* f2fs: use kvmalloc, if kmalloc is failed f2fs: remove redundant comment of unused wio_mutex f2fs: fix to reorder set_page_dirty and wait_on_page_writeback f2fs: clear PG_writeback if IPU failed f2fs: add an ioctl() to explicitly trigger fsck later f2fs: avoid frequent costly fsck triggers f2fs: fix m_may_create to make OPU DIO write correctly f2fs: fix to update new block address correctly for OPU f2fs: adjust trace print in f2fs_get_victim() to cover all paths f2fs: fix to allow node segment for GC by ioctl path f2fs: make "f2fs_fault_name[]" const char * f2fs: read page index before freeing f2fs: fix wrong return value of f2fs_acl_create f2fs: avoid build warn of fall_through f2fs: fix race between write_checkpoint and write_begin f2fs: check memory boundary by insane namelen f2fs: only flush the single temp bio cache which owns the target page f2fs: fix out-place-update DIO write f2fs: fix to be aware discard/preflush/dio command in is_idle() f2fs: add to account direct IO f2fs: move dir data flush to write checkpoint process f2fs: change segment to section in f2fs_ioc_gc_range f2fs: export migration_granularity sysfs entry f2fs: support subsectional garbage collection f2fs: introduce __is_large_section() for cleanup f2fs: clean up f2fs_sb_has_##feature_name f2fs: remove codes of unused wio_mutex f2fs: fix count of seg_freed to make sec_freed correct f2fs: fix to account preflush command for noflush_merge mode f2fs: avoid GC causing encrypted file corrupted ANDROID: cuttlefish_defconfig: Enable VIRTIO_INPUT ANDROID: Revert fs/squashfs back to linux-4.14.y BACKPORT: mm: Add an F_SEAL_FUTURE_WRITE seal to memfd FROMGIT: dm verity: log the hash algorithm implementation FROMGIT: dm crypt: log the encryption algorithm implementation ANDROID: sched: Clean-up SchedTune documentation ANDROID: sched/events: Fix out of bound memory access ANDROID: revert all remaining hisi_thermal.c changes ANDROID: modpost: add an exception for CFI stubs FROMGIT: modpost: validate symbol names also in find_elf_symbol ANDROID: cuttlefish_defconfig: Enable VIRT_WIFI FROMGIT, BACKPORT: mac80211-next: rtnetlink wifi simulation device ANDROID: cpufreq: times: add /proc/uid_concurrent_{active,policy}_time ANDROID: cuttlefish_defconfig: Enable CONFIG_ARM64_LSE_ATOMICS ANDROID: Move from clang r328903 to r346389b. Fix merge issue from 4.14.85. ANDROID: cuttlefish_defconfig: Enable CONFIG_CRYPTO_ADIANTUM BACKPORT, FROMGIT: fscrypt: add Adiantum support BACKPORT, FROMGIT: crypto: adiantum - add Adiantum support FROMGIT: crypto: arm/nhpoly1305 - add NEON-accelerated NHPoly1305 BACKPORT, FROMGIT: crypto: nhpoly1305 - add NHPoly1305 support FROMGIT: crypto: poly1305 - add Poly1305 core API FROMGIT: crypto: poly1305 - use structures for key and accumulator FROMGIT: crypto: arm/chacha - add XChaCha12 support FROMGIT: crypto: arm/chacha20 - refactor to allow varying number of rounds FROMGIT: crypto: arm/chacha20 - add XChaCha20 support FROMGIT: crypto: arm/chacha20 - limit the preemption-disabled section BACKPORT, FROMGIT: crypto: chacha - add XChaCha12 support BACKPORT, FROMGIT: crypto: chacha20-generic - refactor to allow varying number of rounds BACKPORT, FROMGIT: crypto: chacha20-generic - add XChaCha20 support FROMGIT: crypto: chacha20-generic - don't unnecessarily use atomic walk FROMGIT: crypto: chacha20-generic - add HChaCha20 library function FROMGIT: crypto: arm/aes - add some hardening against cache-timing attacks UPSTREAM: crypto: arm/aes-cipher - move S-box to .rodata section UPSTREAM: crypto: arm/chacha20 - faster 8-bit rotations and other optimizations UPSTREAM: crypto: arm/chacha20 - always use vrev for 16-bit rotates UPSTREAM: crypto: poly1305 - use unaligned access macros to output digest UPSTREAM: crypto: chacha20 - Fix chacha20_block() keystream alignment (again) UPSTREAM: crypto: chacha20 - use rol32() macro from bitops.h UPSTREAM: crypto: chacha20 - Fix keystream alignment for chacha20_block() UPSTREAM: crypto: chacha20 - Remove cra_alignmask UPSTREAM: crypto: chacha20 - Use unaligned access macros when loading key and IV UPSTREAM: crypto: chacha20 - Fix unaligned access when loading constants BACKPORT: sched/fair: Fix cpu_util_wake() for 'execl' type workloads ANDROID: arm64 defconfig / build config for cuttlefish ANDROID: Kbuild, LLVMLinux: allow overriding clang target triple ANDROID: sdcardfs: Add option to not link obb ANDROID: sdcardfs: Add sandbox Revert "proc: Convert proc_mount to use mount_ns." ANDROID: sched/debug: Make Energy Model read-only ANDROID: zram: set comp_len to PAGE_SIZE when page is huge Revert "ANDROID: Kbuild, LLVMLinux: allow overriding clang target triple" UPSTREAM: arm64: Expose support for optional ARMv8-A features Conflicts: Makefile drivers/block/zram/zram_drv.c drivers/net/wireless/Kconfig drivers/net/wireless/Makefile fs/crypto/fscrypt_private.h fs/crypto/keyinfo.c fs/f2fs/inode.c fs/f2fs/super.c include/uapi/linux/fs.h kernel/sched/fair.c Change-Id: Ib1a971f6893061a5db7cbc3c474981463685c3a9 Signed-off-by:Blagovest Kolenichev <bkolenichev@codeaurora.org>
Loading
Please register or sign in to comment