Merge android-4.9.177 (e6d81da7) into msm-4.9
* refs/heads/tmp-e6d81da7: Linux 4.9.177 powerpc/booke64: set RI in default MSR powerpc/lib: fix book3s/32 boot failure due to code patching drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl bonding: fix arp_validate toggling in active-backup mode ipv4: Fix raw socket lookup for local traffic vrf: sit mtu should not be updated when vrf netdev is the link vlan: disable SIOCSHWTSTAMP in container packet: Fix error path in packet_init net: ucc_geth - fix Oops when changing number of buffers in the ring fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied bridge: Fix error path for kobject_init_and_add() powerpc/64s: Include cpu header x86/vdso: Pass --eh-frame-hdr to the linker x86/vdso: Drop implicit common-page-size linker flag x86: vdso: Use $LD instead of $CC to link Revert "x86: vdso: Use $LD instead of $CC to link" Revert "x86/vdso: Drop implicit common-page-size linker flag" Don't jump to compute_result state from check_result state rtlwifi: rtl8723ae: Fix missing break in switch statement ALSA: pcm: remove SNDRV_PCM_IOCTL1_INFO internal command cw1200: fix missing unlock on error in cw1200_hw_scan() Input: synaptics-rmi4 - fix possible double free spi: ST ST95HF NFC: declare missing of table spi: Micrel eth switch: declare missing of table gpu: ipu-v3: dp: fix CSC handling selftests/net: correct the return value for run_netsocktests drm/sun4i: Set device driver data at bind time for use in unbind s390: ctcm: fix ctcm_new_device error return code MIPS: perf: ath79: Fix perfcount IRQ assignment ipvs: do not schedule icmp errors from tunnels selftests: netfilter: check icmp pkttoobig errors are set as related init: initialize jump labels before command line option parsing tools lib traceevent: Fix missing equality check for strcmp KVM: x86: avoid misreporting level-triggered irqs as edge-triggered in tracing x86/reboot, efi: Use EFI reboot for Acer TravelMate X514-51T mISDN: Check address length before reading address family s390/3270: fix lockdep false positive on view->lock mac80211: fix unaligned access in mesh table hash function s390/dasd: Fix capacity calculation for large volumes libnvdimm/btt: Fix a kmemdup failure check HID: input: add mapping for "Toggle Display" key HID: input: add mapping for keyboard Brightness Up/Down/Toggle keys HID: input: add mapping for Expose/Overview key libnvdimm/namespace: Fix a potential NULL pointer dereference iio: adc: xilinx: fix potential use-after-free on remove USB: serial: fix unthrottle races platform/x86: sony-laptop: Fix unintentional fall-through bpf: convert htab map to hlist_nulls bpf: fix struct htab_elem layout netfilter: compat: initialize all fields in xt_init ANDROID: cuttlefish_defconfig: Disable DEVTMPFS ANDROID: Move from clang r349610 to r353983c. f2fs: fix to avoid accessing xattr across the boundary f2fs: fix to avoid potential race on sbi->unusable_block_count access/update f2fs: add tracepoint for f2fs_filemap_fault() f2fs: introduce DATA_GENERIC_ENHANCE f2fs: fix to handle error in f2fs_disable_checkpoint() f2fs: remove redundant check in f2fs_file_write_iter() f2fs: fix to be aware of readonly device in write_checkpoint() f2fs: fix to skip recovery on readonly device f2fs: fix to consider multiple device for readonly check f2fs: relocate chksum_offset for large_nat_bitmap feature f2fs: allow unfixed f2fs_checkpoint.checksum_offset f2fs: Replace spaces with tab f2fs: insert space before the open parenthesis '(' f2fs: allow address pointer number of dnode aligning to specified size f2fs: introduce f2fs_read_single_page() for cleanup f2fs: mark is_extension_exist() inline f2fs: fix to set FI_UPDATE_WRITE correctly f2fs: fix to avoid panic in f2fs_inplace_write_data() f2fs: fix to do sanity check on valid block count of segment f2fs: fix to do sanity check on valid node/block count f2fs: fix to avoid panic in do_recover_data() f2fs: fix to do sanity check on free nid f2fs: fix to do checksum even if inode page is uptodate f2fs: fix to avoid panic in f2fs_remove_inode_page() f2fs: fix to clear dirty inode in error path of f2fs_iget() f2fs: remove new blank line of f2fs kernel message f2fs: fix wrong __is_meta_io() macro f2fs: fix to avoid panic in dec_valid_node_count() f2fs: fix to avoid panic in dec_valid_block_count() f2fs: fix to use inline space only if inline_xattr is enable f2fs: fix to retrieve inline xattr space f2fs: fix error path of recovery f2fs: fix to avoid deadloop in foreground GC f2fs: data: fix warning Using plain integer as NULL pointer f2fs: add tracepoint for f2fs_file_write_iter() f2fs: add comment for conditional compilation statement f2fs: fix potential recursive call when enabling data_flush f2fs: improve discard handling with multi-device volumes f2fs: Reduce zoned block device memory usage f2fs: Fix use of number of devices Conflicts: fs/f2fs/data.c sound/core/pcm_native.c Change-Id: Iafbaff7b4142f60cb77963ba398f7d6dfc712c82 Signed-off-by:jianzhou <jianzhou@codeaurora.org>
Loading
Please register or sign in to comment