Merge google common 'android-3.18' into 'msm-3.18'

Merge with google common 'android-3.18' at
6402a793 into 'msm-3.18'

* quic/tmp-6402a793:
  Linux 3.18.88
  arm: KVM: Fix VTTBR_BADDR_MASK BUG_ON off-by-one
  audit: ensure that 'audit=1' actually enables audit for PID 1
  afs: Connect up the CB.ProbeUuid
  IB/mlx5: Assign send CQ and recv CQ of UMR QP
  IB/mlx4: Increase maximal message size under UD QP
  xfrm: Copy policy family in clone_policy
  atm: horizon: Fix irq release error
  sctp: use the right sk after waking up from wait_buf sleep
  sctp: do not free asoc when it is already dead in sctp_sendmsg
  sparc64/mm: set fields in deferred pages
  sunrpc: Fix rpc_task_begin trace point
  NFS: Fix a typo in nfs_rename()
  dynamic-debug-howto: fix optional/omitted ending line number to be LARGE instead of 0
  lib/genalloc.c: make the avail variable an atomic_long_t
  route: update fnhe_expires for redirect when the fnhe exists
  route: also update fnhe_genid when updating a route cache
  EDAC, i5000, i5400: Fix definition of NRECMEMB register
  EDAC, i5000, i5400: Fix use of MTR_DRAM_WIDTH macro
  axonram: Fix gendisk handling
  i2c: riic: fix restart condition
  crypto: s5p-sss - Fix completing crypto request in IRQ handler
  ipv6: reorder icmpv6_init() and ip6_mr_init()
  bnx2x: fix possible overrun of VFPF multicast addresses array
  spi_ks8995: fix "BUG: key accdaa28 not in .data!"
  arm: KVM: Survive unknown traps from guests
  KVM: nVMX: reset nested_run_pending if the vCPU is going to be reset
  irqchip/crossbar: Fix incorrect type of register size
  scsi: lpfc: Fix crash during Hardware error recovery on SLI3 adapters
  workqueue: trigger WARN if queue_delayed_work() is called with NULL @wq
  libata: drop WARN from protocol error in ata_sff_qc_issue()
  selftest/powerpc: Fix false failures for skipped tests
  Revert "s390/kbuild: enable modversions for symbols exported from asm"
  Revert "drm/armada: Fix compile fail"
  net/packet: fix a race in packet_bind() and packet_notifier()
  sit: update frag_off info
  rds: Fix NULL pointer dereference in __rds_rdma_map
  arm64: fpsimd: Prevent registers leaking from dead tasks
  KVM: VMX: remove I/O port 0x80 bypass on Intel hosts
  arm64: KVM: fix VTTBR_BADDR_MASK BUG_ON off-by-one
  media: dvb: i2c transfers over usb cannot be done from stack
  kdb: Fix handling of kallsyms_symbol_next() return value
  iommu/vt-d: Fix scatterlist offset handling
  ALSA: usb-audio: Add check return value for usb_string()
  ALSA: usb-audio: Fix out-of-bound error
  ALSA: seq: Remove spurious WARN_ON() at timer check
  ALSA: pcm: prevent UAF in snd_pcm_info
  x86/PCI: Make broadcom_postcore_init() check acpi_disabled
  X.509: reject invalid BIT STRING for subjectPublicKey
  KEYS: add missing permission check for request_key() destination
  ASN.1: check for error from ASN1_OP_END__ACT actions
  efi: Move some sysfs files to be read-only by root
  isa: Prevent NULL dereference in isa_bus driver callbacks
  hv: kvp: Avoid reading past allocated blocks from KVP file
  virtio: release virtio index when fail to device_register
  can: usb_8dev: cancel urb on -EPIPE and -EPROTO
  can: esd_usb2: cancel urb on -EPIPE and -EPROTO
  can: ems_usb: cancel urb on -EPIPE and -EPROTO
  can: kvaser_usb: cancel urb on -EPIPE and -EPROTO
  can: kvaser_usb: ratelimit errors if incomplete messages are received
  can: kvaser_usb: Fix comparison bug in kvaser_usb_read_bulk_callback()
  can: kvaser_usb: free buf in error paths
  Linux 3.18.87
  serial: 8250_pci: Add Amazon PCI serial device ID
  uas: Always apply US_FL_NO_ATA_1X quirk to Seagate devices
  ima: fix hash algorithm initialization
  net: fec: fix multicast filtering hardware setup
  mm: avoid returning VM_FAULT_RETRY from ->page_mkwrite handlers
  tipc: fix cleanup at module unload
  net: sctp: fix array overrun read on sctp_timer_tbl
  NFSv4: Fix client recovery when server reboots multiple times
  net/appletalk: Fix kernel memory disclosure
  vti6: fix device register to report IFLA_INFO_KIND
  ARM: OMAP1: DMA: Correct the number of logical channels
  perf test attr: Fix ignored test case result
  sysrq : fix Show Regs call trace on ARM
  EDAC, sb_edac: Fix missing break in switch
  spi: sh-msiof: Fix DMA transfer size check
  serial: 8250_fintek: Fix rs485 disablement on invalid ioctl()
  bcache: recover data from backing when data is clean
  bcache: only permit to recovery read error when cache device is clean
  ANDROID: initramfs: call free_initrd() when skipping init
  Linux 3.18.86
  drm/i915: Prevent zero length "index" write
  drm/i915: Don't try indexed reads to alternate slave addresses
  NFS: revalidate "." etc correctly on "open".
  drm/panel: simple: Add missing panel_simple_unprepare() calls
  eeprom: at24: check at24_read/write arguments
  KVM: x86: inject exceptions produced by x86_decode_insn
  KVM: x86: Exit to user-mode on #UD intercept when emulator requires
  btrfs: clear space cache inode generation always
  mm/madvise.c: fix madvise() infinite loop under special circumstances
  mm, thp: Do not make page table dirty unconditionally in touch_p[mu]d()
  ipsec: Fix aborted xfrm policy dump crash
  netlink: add a start callback for starting a netlink dump
  UPSTREAM: net: xfrm: allow clearing socket xfrm policies.
  Linux 3.18.85
  xen: xenbus driver must not accept invalid transaction ids
  s390/kbuild: enable modversions for symbols exported from asm
  ASoC: wm_adsp: Don't overrun firmware file buffer when reading region data
  btrfs: return the actual error value from from btrfs_uuid_tree_iterate
  netfilter: nf_tables: fix oob access
  netfilter: nft_queue: use raw_smp_processor_id()
  staging: iio: cdc: fix improper return value
  mac80211: Suppress NEW_PEER_CANDIDATE event if no room
  mac80211: Remove invalid flag operations in mesh TSF synchronization
  ALSA: hda - Apply ALC269_FIXUP_NO_SHUTUP on HDA_FIXUP_ACT_PROBE
  drm/armada: Fix compile fail
  net: 3com: typhoon: typhoon_init_one: fix incorrect return values
  net: 3com: typhoon: typhoon_init_one: make return values more specific
  PCI: Apply _HPX settings only to relevant devices
  RDS: RDMA: return appropriate error on rdma map failures
  e1000e: Separate signaling for link check/link up
  e1000e: Fix return value test
  e1000e: Fix error path in link detection
  iio: iio-trig-periodic-rtc: Free trigger resource correctly
  mtd: nand: Fix writing mtdoops to nand flash.
  net/9p: Switch to wait_event_killable()
  media: v4l2-ctrl: Fix flags field on Control events
  media: rc: check for integer overflow
  media: Don't do DMA on stack for firmware upload in the AS102 driver
  powerpc/signal: Properly handle return value from uprobe_deny_signal()
  parisc: Fix validity check of pointer size argument in new CAS implementation
  ixgbe: Fix skb list corruption on Power systems
  fm10k: Use smp_rmb rather than read_barrier_depends
  i40evf: Use smp_rmb rather than read_barrier_depends
  ixgbevf: Use smp_rmb rather than read_barrier_depends
  igbvf: Use smp_rmb rather than read_barrier_depends
  igb: Use smp_rmb rather than read_barrier_depends
  i40e: Use smp_rmb rather than read_barrier_depends
  time: Always make sure wall_to_monotonic isn't positive
  NFC: fix device-allocation error return
  IB/srpt: Do not accept invalid initiator port names
  clk: ti: dra7-atl-clock: fix child-node lookups
  clk: ti: dra7-atl-clock: Fix of_node reference counting
  KVM: SVM: obey guest PAT
  KVM: nVMX: set IDTR and GDTR limits when loading L1 host state
  iscsi-target: Fix non-immediate TMR reference leak
  fs/9p: Compare qid.path in v9fs_test_inode
  ALSA: timer: Remove kernel warning at compat ioctl error paths
  ALSA: usb-audio: Add sanity checks in v2 clock parsers
  ALSA: usb-audio: Fix potential out-of-bound access at parsing SU
  ALSA: usb-audio: Add sanity checks to FE parser
  ext4: fix interaction between i_size, fallocate, and delalloc after a crash
  nfsd: deal with revoked delegations appropriately
  nfs: Fix ugly referral attributes
  NFS: Fix typo in nomigration mount option
  isofs: fix timestamps beyond 2027
  bcache: check ca->alloc_thread initialized before wake up it
  eCryptfs: use after free in ecryptfs_release_messaging()
  nilfs2: fix race condition that causes file system corruption
  autofs: don't fail mount for transient error
  MIPS: BCM47XX: Fix LED inversion for WRT54GSv1
  MIPS: Fix an n32 core file generation regset support regression
  dm: fix race between dm_get_from_kobject() and __dm_destroy()
  dm bufio: fix integer overflow when limiting maximum cache size
  ALSA: hda: Add Raven PCI ID
  ARM: 8721/1: mm: dump: check hardware RO bit for LPAE
  x86/decoder: Add new TEST instruction pattern
  lib/mpi: call cond_resched() from mpi_powm() loop
  sched: Make resched_cpu() unconditional
  ipv6: only call ip6_route_dev_notify() once for NETDEV_UNREGISTER
  s390/disassembler: increase show_code buffer size
  BACKPORT: time: Clean up CLOCK_MONOTONIC_RAW time handling
  UPSTREAM: arm64: mm: add __{pud,pgd}_populate
  UPSTREAM: arm64: vdso: fix clock_getres for 4GiB-aligned res
  UPSTREAM: arm64: vdso: minor ABI fix for clock_getres
  BACKPORT: time: Fix CLOCK_MONOTONIC_RAW sub-nanosecond accounting
  f2fs: updates on 4.15-rc1
  UPSTREAM: android: binder: fix type mismatch warning
  UPSTREAM: dm bufio: switch from a huge hash table to an rbtree
  Linux 3.18.84
  coda: fix 'kernel memory exposure attempt' in fsync
  ipmi: fix unsigned long underflow
  ocfs2: should wait dio before inode lock in ocfs2_setattr()
  ima: do not update security.ima if appraisal status is not INTEGRITY_PASS
  vlan: fix a use-after-free in vlan_device_event()
  af_netlink: ensure that NLMSG_DONE never fails in dumps
  fealnx: Fix building error on MIPS
  sctp: do not peel off an assoc from one netns to another one
  netfilter/ipvs: clear ipvs_property flag when SKB net namespace changed
  tcp: do not mangle skb->cb[] in tcp_make_synack()
  net/sctp: Always set scope_id in sctp_inet6_skb_msgname
  ipv6/dccp: do not inherit ipv6_mc_list from parent
  Revert "BACKPORT: arm64: Use __pa_symbol for kernel symbols"
  Revert "BACKPORT: arm64: Use __pa_symbol for empty_zero_page"
  Revert "ANDROID: arm64: Use __pa_symbol for kernel symbols"
  Linux 3.18.83
  uapi: fix linux/rds.h userspace compilation errors
  uapi: fix linux/rds.h userspace compilation error
  Revert "uapi: fix linux/rds.h userspace compilation errors"
  Revert "crypto: xts - Add ECB dependency"
  MIPS: Netlogic: Exclude netlogic,xlp-pic code from XLR builds
  MIPS: init: Ensure reserved memory regions are not added to bootmem
  MIPS: End asm function prologue macros with .insn
  ixgbe: handle close/suspend race with netif_device_detach/present
  ixgbe: fix AER error handling
  gpu: drm: mgag200: mgag200_main:- Handle error from pci_iomap
  backlight: adp5520: Fix error handling in adp5520_bl_probe()
  backlight: lcd: Fix race condition during register
  ALSA: vx: Fix possible transfer overflow
  ALSA: vx: Don't try to update capture stream before running
  scsi: lpfc: Correct issue leading to oops during link reset
  scsi: lpfc: Correct host name in symbolic_name field
  scsi: lpfc: FCoE VPort enable-disable does not bring up the VPort
  scsi: lpfc: Add missing memory barrier
  staging: rtl8188eu: fix incorrect ERROR tags from logs
  igb: Fix hw_dbg logging in igb_update_flash_i210
  igb: close/suspend race in netif_device_detach
  igb: reset the PHY before reading the PHY ID
  drm/sti: sti_vtg: Handle return NULL error from devm_ioremap_nocache
  ata: SATA_MV should depend on HAS_DMA
  ata: SATA_HIGHBANK should depend on HAS_DMA
  ata: ATA_BMDMA should depend on HAS_DMA
  ARM: dts: Fix omap3 off mode pull defines
  ARM: OMAP2+: Fix init for multiple quirks for the same SoC
  extcon: palmas: Check the parent instance to prevent the NULL
  iscsi-target: Fix iscsi_np reset hung task during parallel delete
  media: dib0700: fix invalid dvb_detach argument
  media: imon: Fix null-ptr-deref in imon_probe
  ANDROID: arm64: Use __pa_symbol for kernel symbols
  BACKPORT: arm64: Use __pa_symbol for empty_zero_page
  BACKPORT: arm64: Use __pa_symbol for kernel symbols
  Linux 3.18.82
  target/iscsi: Fix iSCSI task reassignment handling
  security/keys: add CONFIG_KEYS_COMPAT to Kconfig
  ip6_gre: only increase err_count for some certain type icmpv6 in ip6gre_err
  ipip: only increase err_count for some certain type icmp in ipip_err
  ipv6: flowlabel: do not leave opt->tot_len with garbage
  sctp: reset owner sk for data chunks on out queues when migrating a sock
  tun: allow positive return values on dev_get_valid_name() call
  net/unix: don't show information about sockets from other namespaces
  sctp: add the missing sock_owned_by_user check in sctp_icmp_redirect
  tun: call dev_get_valid_name() before register_netdevice()
  l2tp: check ps->sock before running pppol2tp_session_ioctl()
  tcp: fix tcp_mtu_probe() vs highest_sack
  tun/tap: sanitize TUNSETSNDBUF input
  Revert "ARM: dts: imx53-qsb-common: fix FEC pinmux config"
  Input: ims-psu - check if CDC union descriptor is sane
  mac80211: don't compare TKIP TX MIC key in reinstall prevention
  mac80211: use constant time comparison with keys
  mac80211: accept key reinstall without changing anything
  Revert "ceph: unlock dangling spinlock in try_flush_caps()"
  BACKPORT: crypto: arm - add support for SHA-224/256 using ARMv8 Crypto Extensions
  ANDROID: arm: crypto: reduce priority of bit-sliced AES cipher
  UPSTREAM: arm64: crypto: reduce priority of core AES cipher
  UPSTREAM: crypto: arm/aes-ce - fix for big endian
  UPSTREAM: crypto: arm/aes-ctr - fix NULL dereference in tail processing
  UPSTREAM: crypto: arm/aes - streamline AES-192 code path
  BACKPORT: crypto: arm - AES in ECB/CBC/CTR/XTS modes using ARMv8 Crypto Extensions
  UPSTREAM: ARM: 8564/1: fix cpu feature extracting helper
  UPSTREAM: ARM: 8563/1: fix demoting HWCAP_SWP
  UPSTREAM: ARM: 8319/1: advertise availability of v8 Crypto instructions
  UPSTREAM: ARM: 8318/1: treat CPU feature register fields as signed quantities
  FROMLIST: binder: fix proc->files use-after-free
  Linux 3.18.81
  x86/oprofile/ppro: Do not use __this_cpu*() in preemptible context
  can: c_can: don't indicate triple sampling support for D_CAN
  rbd: use GFP_NOIO for parent stat and data requests
  MIPS: AR7: Ensure that serial ports are properly set up
  MIPS: Fix CM region target definitions
  MIPS: microMIPS: Fix incorrect mask in insn_table_MM
  ALSA: seq: Avoid invalid lockdep class warning
  ALSA: seq: Fix OSS sysex delivery in OSS emulation
  ARM: 8720/1: ensure dump_instr() checks addr_limit
  KEYS: fix NULL pointer dereference during ASN.1 parsing [ver #2]
  crypto: x86/sha1-mb - fix panic due to unaligned access
  KEYS: trusted: fix writing past end of buffer in trusted_read()
  KEYS: trusted: sanitize all key material
  IB/ipoib: Change list_del to list_del_init in the tx object
  Input: mpr121 - set missing event capability
  Input: mpr121 - handle multiple bits change of status register
  IPsec: do not ignore crypto err in ah4 input
  serial: sh-sci: Fix register offsets for the IRDA serial port
  phy: increase size of MII_BUS_ID_SIZE and bus_id
  dt-bindings: Add vendor prefix for LEGO
  dt-bindings: Add LEGO MINDSTORMS EV3 compatible specification
  iio: trigger: free trigger resource correctly
  ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
  drm: drm_minor_register(): Clean up debugfs on failure
  ARM: dts: imx53-qsb-common: fix FEC pinmux config
  xen/netback: set default upper limit of tx/rx queues to 8
  video: fbdev: pmag-ba-fb: Remove bad `__init' annotation
  ANDROID: binder: clarify deferred thread work.
  FROMLIST: arm64: Avoid aligning normal memory pointers in __memcpy_{to,from}io
  UPSTREAM: arm64: optimize memcpy_{from,to}io() and memset_io()
  Linux 3.18.80
  staging: r8712u: Fix Sparse warning in rtl871x_xmit.c
  xen: don't print error message in case of missing Xenstore entry
  bt8xx: fix memory leak
  s390/dasd: check for device error pointer within state change interrupts
  staging: lustre: ptlrpc: skip lock if export failed
  staging: lustre: hsm: stack overrun in hai_dump_data_field
  platform/x86: intel_mid_thermal: Fix module autoload
  xen/manage: correct return value check on xenbus_scanf()
  cx231xx: Fix I2C on Internal Master 3 Bus
  i2c: riic: correctly finish transfers
  ext4: do not use stripe_width if it is not set
  ext4: fix stripe-unaligned allocations
  staging: rtl8712u: Fix endian settings for structs describing network packets
  mmc: s3cmci: include linux/interrupt.h for tasklet_struct
  x86/microcode/intel: Disable late loading on model 79
  drm/msm: fix an integer overflow test
  drm/msm: Fix potential buffer overflow issue
  ocfs2: fstrim: Fix start offset of first cluster group during fstrim
  ARM: 8715/1: add a private asm/unaligned.h
  arm64: ensure __dump_instr() checks addr_limit
  ASoC: adau17x1: Workaround for noise bug in ADC
  KEYS: fix out-of-bounds read during ASN.1 parsing
  KEYS: return full count in keyring_read() if buffer is too small
  cifs: check MaxPathNameComponentLength != 0 before using it
  ALSA: seq: Fix nested rwsem annotation for lockdep splat
  ALSA: timer: Add missing mutex lock for compat ioctls
  blk-mq: fix race between timeout and freeing request
  BACKPORT: xfrm: Clear sk_dst_cache when applying per-socket policy.

Conflicts:
	arch/arm/crypto/Makefile
	arch/arm/crypto/aes-ce-core.S
	arch/arm/crypto/aes-ce-glue.c
	arch/arm/crypto/sha2-ce-glue.c
	arch/arm64/kernel/io.c
	crypto/Kconfig
	drivers/gpu/drm/msm/msm_gem_submit.c
	kernel/time/timekeeping.c
	sound/usb/mixer.c

USB related changes were ignored as per the feedback
from the respective team.

Change-Id: Idac65cceaf105083344a35afa5964bd36b5d1f09
Signed-off-by: Kishor PK <kpbhat@codeaurora.org>