Merge android-4.9-172 (2dbf78bc) into msm-4.9
* refs/heads/tmp-2dbf78bc: Linux 4.9.172 Documentation: Add nospectre_v1 parameter powerpc/fsl: Add FSL_PPC_BOOK3E as supported arch for nospectre_v2 boot arg net: IP6 defrag: use rbtrees in nf_conntrack_reasm.c net: IP6 defrag: use rbtrees for IPv6 defrag ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module net: IP defrag: encapsulate rbtree defrag code into callable functions ipv6: frags: fix a lockdep false positive ipv4: set the tcp_min_rtt_wlen range from 0 to one day net: stmmac: move stmmac_check_ether_addr() to driver probe team: fix possible recursive locking when add slaves net: rds: exchange of 8K and 1M pool net/mlx5e: ethtool, Remove unsupported SFP EEPROM high pages query mlxsw: spectrum: Fix autoneg status in ethtool ipv4: add sanity checks in ipv4_link_failure() Revert "block/loop: Use global lock for ioctl() operation." tipc: check link name with right length in tipc_nl_compat_link_set tipc: check bearer name with right length in tipc_nl_compat_bearer_enable fm10k: Fix a potential NULL pointer dereference netfilter: ebtables: CONFIG_COMPAT: drop a bogus WARN_ON NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family. fs/proc/proc_sysctl.c: Fix a NULL pointer dereference intel_th: gth: Fix an off-by-one in output unassigning slip: make slhc_free() silently accept an error pointer tipc: handle the err returned from cmd header function vsock/virtio: fix kernel panic from virtio_transport_reset_no_sock USB: Consolidate LPM checks to avoid enabling LPM twice USB: Add new USB LPM helpers drm/vc4: Fix compilation error reported by kbuild test bot drm/vc4: Fix memory leak during gpu reset. ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache dmaengine: sh: rcar-dmac: With cyclic DMA residue 0 is valid Input: synaptics-rmi4 - write config register values to the right offset sunrpc: don't mark uninitialised items as VALID. nfsd: Don't release the callback slot unless it was actually held ceph: fix ci->i_head_snapc leak ceph: ensure d_name stability in ceph_dentry_hash() sched/numa: Fix a possible divide-by-zero IB/rdmavt: Fix frwr memory registration trace: Fix preempt_enable_no_resched() abuse MIPS: scall64-o32: Fix indirect syscall number load tracing: Fix a memory leak by early error exit in trace_pid_write() cifs: do not attempt cifs operation on smb2+ rename error kbuild: simplify ld-option implementation Conflicts: net/ipv4/sysctl_net_ipv4.c Change-Id: I538fb990f557d35cf77821a86aab0bc4647c6ce8 Signed-off-by:Tengfei Fan <tengfeif@codeaurora.org>
Loading
Please register or sign in to comment