Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 3e8b1d41 authored by jianzhou's avatar jianzhou
Browse files

Merge android-4.9.219(6ee8be4d) into msm-4.9



* refs/heads/tmp-6ee8be4d:
  Linux 4.9.219
  drm/msm: Use the correct dma_sync calls in msm_gem
  drm_dp_mst_topology: fix broken drm_dp_sideband_parse_remote_dpcd_read()
  usb: dwc3: don't set gadget->is_otg flag
  arm64: Fix size of __early_cpu_boot_status
  drm/msm: stop abusing dma_map/unmap for cache
  clk: qcom: rcg: Return failure for RCG update
  RDMA/cm: Update num_paths in cma_resolve_iboe_route error flow
  Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl
  ceph: canonicalize server path in place
  ceph: remove the extra slashes in the server path
  IB/hfi1: Fix memory leaks in sysfs registration and unregistration
  IB/hfi1: Call kobject_put() when kobject_init_and_add() fails
  ASoC: jz4740-i2s: Fix divider written at incorrect offset in register
  tools/accounting/getdelays.c: fix netlink attribute length
  random: always use batched entropy for get_random_u{32,64}
  net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers
  slcan: Don't transmit uninitialized stack data in padding
  net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting
  net: dsa: bcm_sf2: Ensure correct sub-node is parsed
  mm: mempolicy: require at least one nodeid for MPOL_PREFERRED
  padata: always acquire cpu_hotplug_lock before pinst->lock
  net: dsa: tag_brcm: Fix skb->fwd_offload_mark location
  coresight: do not use the BIT() macro in the UAPI header
  blk-mq: Allow blocking queue tag iter callbacks
  blk-mq: sync the update nr_hw_queues with blk_mq_queue_tag_busy_iter
  drm/etnaviv: replace MMU flush marker with flush sequence
  sctp: fix possibly using a bad saddr with a given dst
  sctp: fix refcount bug in sctp_wfree
  net, ip_tunnel: fix interface lookup with no key
  ipv4: fix a RCU-list lock in fib_triestat_seq_show
  drm/bochs: downgrade pci_request_region failure from error to warning
  l2tp: fix race between l2tp_session_delete() and l2tp_tunnel_closeall()
  l2tp: ensure sessions are freed after their PPPOL2TP socket
  ANDROID: cuttlefish_defconfig: Minimally enable EFI

 Conflicts:
	drivers/char/random.c
	drivers/clk/qcom/clk-rcg2.c
	drivers/gpu/drm/msm/msm_gem.c
	drivers/net/phy/micrel.c
	drivers/usb/dwc3/gadget.c
	include/uapi/linux/coresight-stm.h

Change-Id: I8e014a8d407d4a02a4c1bf889168494c23a59788
Signed-off-by: default avatarjianzhou <jianzhou@codeaurora.org>
parents d2440d68 6ee8be4d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment