Merge android-4.4.131 (d5d6526) into msm-4.4

* refs/heads/tmp-d5d6526
  Linux 4.4.131
  serial: mctrl_gpio: Add missing module license
  serial: mctrl_gpio: export mctrl_gpio_disable_ms and mctrl_gpio_init
  x86/smpboot: Don't use mwait_play_dead() on AMD systems
  x86/ipc: Fix x32 version of shmid64_ds and msqid64_ds
  libceph: validate con->state at the top of try_write()
  ASoC: fsl_esai: Fix divisor calculation failure at lower ratio
  ARM: amba: Don't read past the end of sysfs "driver_override" buffer
  ARM: amba: Fix race condition with driver_override
  ARM: amba: Make driver_override output consistent with other buses
  scsi: sd: Defer spinning up drive while SANITIZE is in progress
  kobject: don't use WARN for registration failures
  mtd: cfi: cmdset_0002: Do not allow read/write to suspend erase block.
  mtd: cfi: cmdset_0001: Workaround Micron Erase suspend bug.
  mtd: cfi: cmdset_0001: Do not allow read/write to suspend erase block.
  ALSA: hda/realtek - Add some fixes for ALC233
  ALSA: hda: Hardening for potential Spectre v1
  ALSA: seq: oss: Hardening for potential Spectre v1
  ALSA: seq: oss: Fix unbalanced use lock for synth MIDI device
  ALSA: core: Report audio_tstamp in snd_pcm_sync_ptr
  ALSA: control: Hardening for potential Spectre v1
  ALSA: rme9652: Hardening for potential Spectre v1
  ALSA: hdspm: Hardening for potential Spectre v1
  ALSA: asihpi: Hardening for potential Spectre v1
  ALSA: opl3: Hardening for potential Spectre v1
  tty: Use __GFP_NOFAIL for tty_ldisc_get()
  tty: n_gsm: Fix DLCI handling for ADM mode if debug & 2 is not set
  tty: n_gsm: Fix long delays with control frame timeouts in ADM mode
  tty: Don't call panic() at tty_ldisc_init()
  drm/virtio: fix vq wait_event condition
  virtio_console: free buffers after reset
  virtio: add ability to iterate over vqs
  ALSA: usb-audio: Skip broken EU on Dell dock USB-audio
  USB: Increment wakeup count on remote wakeup.
  usb: core: Add quirk for HP v222w 16GB Mini
  USB: serial: cp210x: add ID for NI USB serial console
  USB: serial: ftdi_sio: use jtag quirk for Arrow USB Blaster
  USB: serial: simple: add libtransistor console
  usbip: vhci_hcd: Fix usb device and sockfd leaks
  usbip: usbip_host: fix to hold parent lock for device_attach() calls
  ext4: fix bitmap position validation
  ext4: add validity checks for bitmap block numbers
  ext4: set h_journal if there is a failure starting a reserved handle
  ext4: prevent right-shifting extents beyond EXT_MAX_BLOCKS
  goldfish: pipe: ANDROID: Allocate memory with GFP_KERNEL.
  goldfish: pipe: ANDROID: Do not crash
  goldfish: pipe: ANDROID: remove redundant casting
  goldfish: pipe: ANDROID: Add 'pipe' to pipe functions
  goldfish: pipe: ANDROID: fix whitespace
  goldfish: pipe: ANDROID: rename global variables
  goldfish: pipe: ANDROID: remove a redundant target
  goldfish: pipe: ANDROID: add blank lines
  goldfish: pipe: ANDROID: replace 'BUG_ON' with 'BUILD_BUG_ON'
  goldfish: pipe: ANDROID: use the 'BIT' macro for wakeup flags
  goldfish: pipe: ANDROID: fix logging format strings
  Linux 4.4.130
  s390/uprobes: implement arch_uretprobe_is_alive()
  s390/cio: update chpid descriptor after resource accessibility event
  cdrom: information leak in cdrom_ioctl_media_changed()
  scsi: mptsas: Disable WRITE SAME
  ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy
  net: af_packet: fix race in PACKET_{R|T}X_RING
  tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets
  net: fix deadlock while clearing neighbor proxy table
  tipc: add policy for TIPC_NLA_NET_ADDR
  llc: fix NULL pointer deref for SOCK_ZAPPED
  llc: hold llc_sap before release_sock()
  sctp: do not check port in sctp_inet6_cmp_addr
  vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi
  pppoe: check sockaddr length in pppoe_connect()
  packet: fix bitfield update race
  team: fix netconsole setup over team
  team: avoid adding twice the same option to the event list
  tcp: don't read out-of-bounds opsize
  llc: delete timers synchronously in llc_sk_free()
  net: validate attribute sizes in neigh_dump_table()
  l2tp: check sockaddr length in pppol2tp_connect()
  KEYS: DNS: limit the length of option strings
  bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave
  s390: correct module section names for expoline code revert
  s390: correct nospec auto detection init order
  s390: add sysfs attributes for spectre
  s390: report spectre mitigation via syslog
  s390: add automatic detection of the spectre defense
  s390: move nobp parameter functions to nospec-branch.c
  s390/entry.S: fix spurious zeroing of r0
  s390: do not bypass BPENTER for interrupt system calls
  s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*)
  s390: introduce execute-trampolines for branches
  s390: run user space and KVM guests with modified branch prediction
  s390: add options to change branch prediction behaviour for the kernel
  s390/alternative: use a copy of the facility bit mask
  s390: add optimized array_index_mask_nospec
  s390: scrub registers on kernel entry and KVM exit
  KVM: s390: wire up bpb feature
  s390: enable CPU alternatives unconditionally
  s390: introduce CPU alternatives
  Revert "ath10k: send (re)assoc peer command when NSS changed"
  jbd2: fix use after free in kjournald2()
  ath9k_hw: check if the chip failed to wake up
  Input: drv260x - fix initializing overdrive voltage
  r8152: add Linksys USB3GIGV1 id
  staging: ion : Donnot wakeup kswapd in ion system alloc
  perf: Return proper values for user stack errors
  x86/tsc: Prevent 32bit truncation in calc_hpet_ref()
  cifs: do not allow creating sockets except with SMB1 posix exensions
  UPSTREAM: tracing: always define trace_{irq,preempt}_{enable_disable}
  ANDROID: staging: ion: Obey kptr_restrict
  ANDROID: sdcardfs: Set s_root to NULL after putting
  ANDROID: sdcardfs: d_make_root calls iput
  ANDROID: sdcardfs: Check for private data earlier

Conflicts:
	drivers/staging/android/ion/ion.c
	drivers/staging/android/ion/ion_cma_heap.c
	drivers/staging/android/ion/ion_system_heap.c

Change-Id: I8155103b3787bb800f85291cc7378a8e29a8436f
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/staging/android/ion/ion.c
index f5a81fc,b114536..5ed1ed3
--- 1/drivers/staging/android/ion/ion.c
--- 2/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@@ -1031,8 -856,6 +1031,7 @@@ void ion_client_destroy(struct ion_clie
        struct ion_device *dev = client->dev;
        struct rb_node *n;
  
-       pr_debug("%s: %d\n", __func__, __LINE__);
 +      mutex_lock(&debugfs_mutex);
        while ((n = rb_first(&client->handles))) {
                struct ion_handle *handle = rb_entry(n, struct ion_handle,
                                                     node);

diff --cc drivers/staging/android/ion/ion_cma_heap.c
index d932db4,133345a..77bc25d
--- 1/drivers/staging/android/ion/ion_cma_heap.c
--- 2/drivers/staging/android/ion/ion_cma_heap.c
+++ b/drivers/staging/android/ion/ion_cma_heap.c
@@@ -62,11 -45,16 +62,9 @@@ static int ion_cma_allocate(struct ion_
                            unsigned long len, unsigned long align,
                            unsigned long flags)
  {
 -      struct ion_cma_heap *cma_heap = to_cma_heap(heap);
 -      struct device *dev = cma_heap->dev;
 +      struct device *dev = heap->priv;
        struct ion_cma_buffer_info *info;
  
-       dev_dbg(dev, "Request buffer allocation len %ld\n", len);
 -      if (buffer->flags & ION_FLAG_CACHED)
 -              return -EINVAL;
 -
 -      if (align > PAGE_SIZE)
 -              return -EINVAL;
--
        info = kzalloc(sizeof(struct ion_cma_buffer_info), GFP_KERNEL);
        if (!info)
                return ION_CMA_ALLOCATE_FAILED;
@@@ -85,18 -69,19 +83,17 @@@
  
        info->table = kmalloc(sizeof(struct sg_table), GFP_KERNEL);
        if (!info->table)
 -              goto free_mem;
 +              goto err;
 +
 +      info->is_cached = ION_IS_CACHED(flags);
 +
 +      ion_cma_get_sgtable(dev,
 +                      info->table, info->cpu_addr, info->handle, len);
  
 -      if (dma_get_sgtable(dev, info->table, info->cpu_addr, info->handle,
 -                          len))
 -              goto free_table;
        /* keep this for memory release */
        buffer->priv_virt = info;
-       dev_dbg(dev, "Allocate buffer %pK\n", buffer);
        return 0;
  
 -free_table:
 -      kfree(info->table);
 -free_mem:
 -      dma_free_coherent(dev, len, info->cpu_addr, info->handle);
  err:
        kfree(info);
        return ION_CMA_ALLOCATE_FAILED;
@@@ -104,14 -89,14 +101,13 @@@
  
  static void ion_cma_free(struct ion_buffer *buffer)
  {
 -      struct ion_cma_heap *cma_heap = to_cma_heap(buffer->heap);
 -      struct device *dev = cma_heap->dev;
 +      struct device *dev = buffer->heap->priv;
        struct ion_cma_buffer_info *info = buffer->priv_virt;
  
-       dev_dbg(dev, "Release buffer %pK\n", buffer);
        /* release memory */
        dma_free_coherent(dev, buffer->size, info->cpu_addr, info->handle);
 -      /* release sg table */
        sg_free_table(info->table);
 +      /* release sg table */
        kfree(info->table);
        kfree(info);
  }

diff --cc drivers/usb/core/hcd.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc fs/ext4/extents.c
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/neighbour.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc sound/core/pcm_native.c
Simple merge