tree 989ccc6d21f6ff16c306714ef8ca76047f0efdf1
parent e73251670edf84da34acc306de641b6db6b82217
parent 4170bfad324c542af007328c926c099e31f23900
author Kyle Yan <kyan@codeaurora.org> 1510178091 -0800
committer Kyle Yan <kyan@codeaurora.org> 1510178091 -0800

Merge remote-tracking branch '4.9/tmp-4170bfa' into 4.9

* 4.9/tmp-4170bfa:
  Linux 4.9.61
  ARM: dts: mvebu: pl310-cache disable double-linefill
  staging: r8712u: Fix Sparse warning in rtl871x_xmit.c
  xen: don't print error message in case of missing Xenstore entry
  powerpc/64: Don't try to use radix MMU under a hypervisor
  PCI: Avoid possible deadlock on pci_lock and p->pi_lock
  drm/exynos: g2d: prevent integer overflow in
  bt8xx: fix memory leak
  s390/crypto: Extend key length check for AES-XTS in fips mode.
  s390/prng: Adjust generation of entropy to produce real 256 bits.
  s390/dasd: check for device error pointer within state change interrupts
  mei: return error on notification request to a disconnected client
  exynos4-is: fimc-is: Unmap region obtained by of_iomap()
  ASoC: Intel: boards: remove .pm_ops in all Atom/DPCM machine drivers
  vfs: open() with O_CREAT should not create inodes with unknown ids
  brcmfmac: check brcmf_bus_get_memdump result for error
  staging: lustre: lmv: Error not handled for lmv_find_target
  staging: lustre: ptlrpc: skip lock if export failed
  staging: lustre: hsm: stack overrun in hai_dump_data_field
  staging: lustre: llite: don't invoke direct_IO for the EOF case
  platform/x86: intel_mid_thermal: Fix module autoload
  scsi: aacraid: Process Error for response I/O
  xen/manage: correct return value check on xenbus_scanf()
  gpio: mcp23s08: Select REGMAP/REGMAP_I2C to fix build error
  mtd: nand: sunxi: Fix the non-polling case in sunxi_nfc_wait_events()
  clk: sunxi-ng: Check kzalloc() for errors and cleanup error path
  ath10k: fix reading sram contents for QCA4019
  cx231xx: Fix I2C on Internal Master 3 Bus
  net: phy: dp83867: Recover from "port mirroring" N/A MODE4
  clocksource/drivers/arm_arch_timer: Add dt binding for hisilicon-161010101 erratum
  drm/fsl-dcu: check for clk_prepare_enable() error
  iwlwifi: mvm: use the PROBE_RESP_QUEUE to send deauth to unknown station
  perf tools: Only increase index if perf_evsel__new_idx() succeeds
  drm/amdgpu: when dpm disabled, also need to stop/start vce.
  i2c: riic: correctly finish transfers
  net/ena: change driver's default timeouts
  ext4: do not use stripe_width if it is not set
  ext4: fix stripe-unaligned allocations
  net: mvneta: fix build errors when linux/phy*.h is removed from net/dsa.h
  PCI/MSI: Return failure when msix_setup_entries() fails
  staging: rtl8712u: Fix endian settings for structs describing network packets
  bnxt_en: Added PCI IDs for BCM57452 and BCM57454 ASICs
  mfd: axp20x: Fix axp288 PEK_DBR and PEK_DBF irqs being swapped
  mfd: ab8500-sysctrl: Handle probe deferral
  mmc: s3cmci: include linux/interrupt.h for tasklet_struct
  scsi: megaraid_sas: Do not set fp_possible if TM capable for non-RW syspdIO, change fp_possible to bool
  PM / wakeirq: report a wakeup_event on dedicated wekup irq
  IB/mlx5: Assign DSCP for R-RoCE QPs Address Path
  staging: fsl-mc: Add missing header
  crypto: ccp - Set the AES size field for all modes
  cpufreq: Do not clear real_cpus mask on policy init
  Fix tracing sample code warning.
  tracing/samples: Fix creation and deletion of simple_thread_fn creation
  drm/msm: fix an integer overflow test
  drm/msm: Fix potential buffer overflow issue
  drm/i915/edp: read edp display control registers unconditionally
  ocfs2: fstrim: Fix start offset of first cluster group during fstrim
  drm/amdgpu: return -ENOENT from uvd 6.0 early init for harvesting
  ARM: 8715/1: add a private asm/unaligned.h
  arm/arm64: kvm: Disable branch profiling in HYP code
  arm/arm64: KVM: set right LR register value for 32 bit guest when inject abort
  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

Conflicts:
	drivers/gpu/drm/msm/msm_gem_submit.c

Change-Id: I374161c212adab8cbb6886e5d44acfab4c2ca487
Signed-off-by: Kyle Yan <kyan@codeaurora.org>