Merge remote-tracking branch 'remotes/origin/tmp-569dbb88' into msm-next

* remotes/origin/tmp-569dbb88:
  Linux 4.13
  epoll: fix race between ep_poll_callback(POLLFREE) and ep_free()/ep_remove()
  udp: fix secpath leak
  bridge: switchdev: Clear forward mark when transmitting packet
  mlxsw: spectrum: Forbid linking to devices that have uppers
  Fix warning messages when mounting to older servers
  jfs should use MAX_LFS_FILESIZE when calculating s_maxbytes
  scripts/dtc: fix '%zx' warning
  include/linux/compiler.h: don't perform compiletime_assert with -O0
  mm, madvise: ensure poisoned pages are removed from per-cpu lists
  mm, uprobes: fix multiple free of ->uprobes_state.xol_area
  kernel/kthread.c: kthread_worker: don't hog the cpu
  mm,page_alloc: don't call __node_reclaim() with oom_lock held.
  mm/mmu_notifier: kill invalidate_page
  KVM: update to new mmu_notifier semantic v2
  xen/gntdev: update to new mmu_notifier semantic
  sgi-gru: update to new mmu_notifier semantic
  misc/mic/scif: update to new mmu_notifier semantic
  iommu/intel: update to new mmu_notifier semantic
  iommu/amd: update to new mmu_notifier semantic
  IB/hfi1: update to new mmu_notifier semantic
  IB/umem: update to new mmu_notifier semantic
  drm/amdgpu: update to new mmu_notifier semantic
  powerpc/powernv: update to new mmu_notifier semantic
  mm/rmap: update to new mmu_notifier semantic v2
  dax: update to new mmu_notifier semantic
  ceph: fix readpage from fscache
  wl1251: add a missing spin_lock_init()
  Input: xpad - fix PowerA init quirk for some gamepad models
  i2c: designware: Round down ACPI provided clk to nearest supported clk
  s390/mm: fix BUG_ON in crst_table_upgrade
  s390/mm: fork vs. 5 level page tabel
  Revert "net: phy: Correctly process PHY_HALTED in phy_stop_machine()"
  net: dsa: bcm_sf2: Fix number of CFP entries for BCM7278
  kcm: do not attach PF_KCM sockets to avoid deadlock
  sch_tbf: fix two null pointer dereferences on init failure
  sch_sfq: fix null pointer dereference on init failure
  sch_netem: avoid null pointer deref on init failure
  sch_fq_codel: avoid double free on init failure
  sch_cbq: fix null pointer dereferences on init failure
  sch_hfsc: fix null pointer deref and double free on init failure
  sch_hhf: fix null pointer dereference on init failure
  sch_multiq: fix double free on init failure
  sch_htb: fix crash on init failure
  CIFS: remove endian related sparse warning
  CIFS: Fix maximum SMB2 header size
  net/mlx5e: Fix CQ moderation mode not set properly
  net/mlx5e: Fix inline header size for small packets
  net/mlx5: E-Switch, Unload the representors in the correct order
  net/mlx5e: Properly resolve TC offloaded ipv6 vxlan tunnel source address
  net/mlx5e: Don't override user RSS upon set channels
  net/mlx5e: Fix dangling page pointer on DMA mapping error
  net/mlx5: Remove the flag MLX5_INTERFACE_STATE_SHUTDOWN
  net/mlx5: Skip mlx5_unload_one if mlx5_load_one fails
  net/mlx5: Fix arm SRQ command for ISSI version 0
  net/mlx5e: Fix DCB_CAP_ATTR_DCBX capability for DCBNL getcap.
  net/mlx5e: Check for qos capability in dcbnl_initialize
  ASoC: simple_card_utils: fix fallback when "label" property isn't present
  net: ti: cpsw-common: dont print error if ti_cm_get_macid() fails
  arm64: dts: marvell: fix number of GPIOs in Armada AP806 description
  ALSA: pcm: Fix power lock unbalance via OSS emulation
  nvme: fix the definition of the doorbell buffer config support bit
  nvme-pci: use dma memory for the host memory buffer descriptors
  nvme-rdma: default MR page size to 4k
  mmc: sdhci-xenon: add set_power callback
  irqchip: mips-gic: SYNC after enabling GIC region
  mmc: block: Fix block status codes
  drivers: net: xgene: Correct probe sequence handling
  nfp: double free on error in probe
  net:ethernet:aquantia: Show info message if bad firmware version detected.
  net:ethernet:aquantia: Fix for multicast filter handling.
  net:ethernet:aquantia: Fix for incorrect speed index.
  net:ethernet:aquantia: Workaround for HW checksum bug.
  net:ethernet:aquantia: Fix for number of RSS queues.
  net:ethernet:aquantia: Extra spinlocks removed.
  packet: Don't write vnet header beyond end of buffer
  tipc: permit bond slave as bearer
  drm/vmwgfx: Fix F26 Wayland screen update issue
  i2c: ismt: Return EMSGSIZE for block reads with bogus length
  i2c: ismt: Don't duplicate the receive length for block reads
  alpha: uapi: Add support for __SANE_USERSPACE_TYPES__
  alpha: Define ioremap_wc
  alpha: Fix section mismatches
  alpha: support R_ALPHA_REFLONG relocations for module loading
  alpha: Fix typo in ev6-copy_user.S
  alpha: Package string routines together
  alpha: Update for new syscalls
  alpha: Fix build error without CONFIG_VGA_HOSE.
  ipv6: do not set sk_destruct in IPV6_ADDRFORM sockopt
  Revert "rmap: do not call mmu_notifier_invalidate_page() under ptl"
  Revert "libata: quirk read log on no-name M.2 SSD"
  libata: check for trusted computing in IDENTIFY DEVICE data
  MIPS: Remove pt_regs adjustments in indirect syscall handler
  MIPS: seccomp: Fix indirect syscall args
  x86/boot: Prevent faulty bootparams.screeninfo from causing harm
  x86/boot: Provide more slack space during decompression
  perf/ftrace: Fix double traces of perf on ftrace:function
  perf/core: Fix potential double-fetch bug
  x86/ldt: Fix off by one in get_segment_base()
  net: dsa: Don't dereference dst->cpu_dp->netdev
  page waitqueue: always add new entries at the end
  bridge: check for null fdb->dst before notifying switchdev drivers
  cpumask: fix spurious cpumask_of_node() on non-NUMA multi-node configs
  ARCv2: SMP: Mask only private-per-core IRQ lines on boot at core intc
  fs/select: Fix memory corruption in compat_get_fd_set()
  ipv6: set dst.obsolete when a cached route has expired
  ipv6: fix sparse warning on rt6i_node
  cxgb4: Fix stack out-of-bounds read due to wrong size to t4_record_mbox()
  net: stmmac: sun8i: Remove the compatibles
  nfp: remove incorrect mask check for vlan matching
  nfp: fix supported key layers calculation
  nfp: fix unchecked flow dissector use
  l2tp: hold tunnel used while creating sessions with netlink
  l2tp: hold tunnel while handling genl TUNNEL_GET commands
  l2tp: hold tunnel while handling genl tunnel updates
  l2tp: hold tunnel while processing genl delete command
  l2tp: hold tunnel while looking up sessions in l2tp_netlink
  l2tp: initialise session's refcount before making it reachable
  net: mvpp2: fix the mac address used when using PPv2.2
  cdc_ncm: flag the u-blox TOBY-L4 as wwan
  net: missing call of trace_napi_poll in busy_poll_stop
  Input: synaptics - fix device info appearing different on reconnect
  libata: quirk read log on no-name M.2 SSD
  libnvdimm: clean up command definitions
  dm mpath: do not lock up a CPU with requeuing activity
  dm: fix printk() rate limiting code
  dm mpath: retry BLK_STS_RESOURCE errors
  dm: fix the second dec_pending() argument in __split_and_process_bio()
  arm: dts: sunxi: Revert EMAC changes
  arm64: dts: allwinner: Revert EMAC changes
  dt-bindings: net: Revert sun8i dwmac binding
  xfrm_user: fix info leak in build_aevent()
  xfrm_user: fix info leak in build_expire()
  xfrm_user: fix info leak in xfrm_notify_sa()
  xfrm_user: fix info leak in copy_user_offload()
  time: Fix ktime_get_raw() incorrect base accumulation
  udp6: set rx_dst_cookie on rx_dst updates
  net: sxgbe: check memory allocation failure
  r8169: Be drop monitor friendly
  r8169: Do not increment tx_dropped in TX ring cleaning
  tcp: fix refcnt leak with ebpf congestion control
  ipv6: Fix may be used uninitialized warning in rt6_check
  xen-blkback: stop blkback thread of every queue in xen_blkif_disconnect
  esp: Fix skb tailroom calculation
  esp: Fix locking on page fragment allocation
  netvsc: fix deadlock betwen link status and removal
  tipc: context imbalance at node read unlock
  tipc: reassign pointers after skb reallocation / linearization
  tipc: perform skb_linearize() before parsing the inner header
  net_sched: fix a refcount_t issue with noop_qdisc
  net: systemport: Free DMA coherent descriptors on errors
  net: bcmgenet: Be drop monitor friendly
  bpf: fix bpf_setsockopts return value
  net: systemport: Be drop monitor friendly
  tipc: Fix tipc_sk_reinit handling of -EAGAIN
  qlge: avoid memcpy buffer overflow
  um: Fix check for _xstate for older hosts
  virtio_net: be drop monitor friendly
  drm/bridge/sii8620: Fix memory corruption
  cpuset: Fix incorrect memory_pressure control file mapping
  netfilter: nf_tables: Fix nft limit burst handling
  netfilter: check for seqadj ext existence before adding it in nf_nat_setup_info
  iwlwifi: pcie: move rx workqueue initialization to iwl_trans_pcie_alloc()
  c6x: Convert to using %pOF instead of full_name
  c6x: defconfig: Cleanup from old Kconfig options
  net: xfrm: don't double-hold dst when sk_policy in use.
  bnxt_en: Do not setup MAC address in bnxt_hwrm_func_qcaps().
  bnxt_en: Free MSIX vectors when unregistering the device from bnxt_re.
  bnxt_en: Fix .ndo_setup_tc() to include XDP rings.
  nfp: TX time stamp packets before HW doorbell is rung
  sctp: Avoid out-of-bounds reads from address storage
  net: dsa: use consume_skb()
  nfp: avoid buffer leak when representor is missing
  nfp: make sure representors are destroyed before their lower netdev
  nfp: don't hold PF lock while enabling SR-IOV
  net: dsa: skb_put_padto() already frees nskb
  net: core: Specify skb_pad()/skb_put_padto() SKB freeing
  net: stmmac: socfgpa: Ensure emac bit set in sys manager for MII/GMII/SGMII.
  scsi: qedf: Fix a potential NULL pointer dereference
  scsi: sg: off by one in sg_ioctl()
  scsi: ipr: Set no_report_opcodes for RAID arrays
  fsl/man: Inherit parent device and of_node
  bpf: fix map value attribute for hash of maps
  net: phy: Deal with unbound PHY driver in phy_attached_print()
  net: sched: don't do tcf_chain_flush from tcf_chain_destroy
  net: sched: fix use after free when tcf_chain_destroy is called multiple times
  udp: on peeking bad csum, drop packets even if not at head
  macsec: add genl family module alias
  tipc: fix a race condition of releasing subscriber object
  tipc: remove subscription references only for pending timers
  mlxsw: spectrum_switchdev: Fix mrouter flag update
  net: ftgmac100: Fix oops in probe on failure to find associated PHY
  net/hsr: Check skb_put_padto() return value
  ipv6: add rcu grace period before freeing fib6_node
  ipv6: accept 64k - 1 packet length in ip6_find_1stfragopt()
  ASoC: rt5670: Fix GPIO headset detection regression
  crypto: algif_skcipher - only call put_page on referenced and used pages
  crypto: testmgr - add chunked test cases for chacha20
  crypto: chacha20 - fix handling of chunked input
  lib/mpi: kunmap after finishing accessing buffer
  sata: ahci-da850: Fix some error handling paths in 'ahci_da850_probe()'
  esp: Fix error handling on layer 2 xmit.
  xfrm: policy: check policy direction value
  xfrm: fix null pointer dereference on state and tmpl sort
  netfilter: x_tables: Fix use-after-free in ipt_do_table.
  vfio: ccw: fix bad ptr math for TIC cda translation
  netfilter: nft_compat: check extension hook mask only if set
  netfilter: ipt_CLUSTERIP: fix use-after-free of proc entry
  esp: Fix memleaks on error paths.

Conflicts:
	net/bridge/br_device.c

Signed-off-by: Runmin Wang <runminw@codeaurora.org>
Change-Id: Ieca8640c767cb2793f8e6748a6d0bb36e2a982a4