Merge android-4.9.189 (2970e785) into msm-4.9

* refs/heads/tmp-2970e785:
  Linux 4.9.189
  x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS
  x86/entry/64: Use JMP instead of JMPQ
  x86/speculation: Enable Spectre v1 swapgs mitigations
  x86/speculation: Prepare entry code for Spectre v1 swapgs mitigations
  x86: cpufeatures: Sort feature word 7
  spi: bcm2835: Fix 3-wire mode if DMA is enabled
  block: blk_init_allocated_queue() set q->fq as NULL in the fail case
  bnx2x: Disable multi-cos feature.
  ife: error out when nla attributes are empty
  ip6_tunnel: fix possible use-after-free on xmit
  compat_ioctl: pppoe: fix PPPOEIOCSFWD handling
  tipc: compat: allow tipc commands without arguments
  net: sched: Fix a possible null-pointer dereference in dequeue_func()
  net/mlx5: Use reversed order when unregister devices
  net: fix ifindex collision during namespace removal
  net: bridge: mcast: don't delete permanent entries when fast leave is enabled
  net: bridge: delete local fdb on device init failure
  atm: iphase: Fix Spectre v1 vulnerability
  libceph: use kbasename() and kill ceph_file_part()
  objtool: Add rewind_stack_do_exit() to the noreturn list
  objtool: Add machine_real_restart() to the noreturn list
  IB: directly cast the sockaddr union to aockaddr
  RDMA: Directly cast the sockaddr union to sockaddr
  HID: Add quirk for HP X1200 PIXART OEM mouse
  HID: wacom: fix bit shift for Cintiq Companion 2
  tcp: be more careful in tcp_fragment()
  arm64: cpufeature: Fix feature comparison for CTR_EL0.{CWG,ERG}
  arm64: cpufeature: Fix CTR_EL0 field definitions
  ARM: dts: logicpd-som-lv: Fix Audio Mute
  ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD torpedo
  ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD SOM-LV
  scsi: fcoe: Embed fc_rport_priv in fcoe_rport structure
  fs/crypto: Fix 4.9.186 missmerge

Change-Id: I1c14f26fa8bcf1851abd64077d6bbd5b058cda4f
Signed-off-by: jianzhou <jianzhou@codeaurora.org>