tree 0bd4382d146060434cd7285159cbc3f78d536a5a
parent cc3a5f5d69e15efa63b08d39fb4227e1d69fab0f
parent 5af9b7f917846d293c8b25c7f2b8144b0d79c751
author jianzhou <jianzhou@codeaurora.org> 1584086204 +0800
committer jianzhou <jianzhou@codeaurora.org> 1584086204 +0800

Merge android-4.9.211(5af9b7f) into msm-4.9

* refs/heads/tmp-5af9b7f:
  Linux 4.9.211
  regulator: ab8500: Remove SYSCLKREQ from enum ab8505_regulator_id
  perf probe: Fix wrong address verification
  scsi: core: scsi_trace: Use get_unaligned_be*()
  scsi: target: core: Fix a pr_debug() argument
  scsi: bnx2i: fix potential use after free
  scsi: qla4xxx: fix double free bug
  scsi: esas2r: unlock on error in esas2r_nvram_read_direct()
  reiserfs: fix handling of -EOPNOTSUPP in reiserfs_for_each_xattr
  cfg80211: check for set_wiphy_params
  cw1200: Fix a signedness bug in cw1200_load_firmware()
  xen/blkfront: Adjust indentation in xlvbd_alloc_gendisk
  net: usb: lan78xx: limit size of local TSO packets
  tcp: fix marked lost packets not being retransmitted
  r8152: add missing endpoint sanity check
  net/wan/fsl_ucc_hdlc: fix out of bounds write on array utdm_info
  net: dsa: tag_qca: fix doubled Tx statistics
  macvlan: use skb_reset_mac_header() in macvlan_queue_xmit()
  batman-adv: Fix DAT candidate selection on little endian systems
  netfilter: arp_tables: init netns pointer in xt_tgdtor_param struct
  netfilter: fix a use-after-free in mtype_destroy()
  cfg80211: fix page refcount issue in A-MSDU decap
  arm64: dts: agilex/stratix10: fix pmu interrupt numbers
  scsi: fnic: fix invalid stack access
  scsi: fnic: use kernel's '%pM' format option to print MAC
  USB: serial: keyspan: handle unbound ports
  USB: serial: io_edgeport: handle unbound ports on URB completion
  USB: serial: io_edgeport: use irqsave() in USB's complete callback
  net: stmmac: Enable 16KB buffer size
  net: stmmac: 16KB buffer must be 16 byte aligned
  mm/page-writeback.c: avoid potential division by zero in wb_min_max_ratio()
  perf report: Fix incorrectly added dimensions as switch perf data file
  perf hists: Fix variable name's inconsistency in hists__for_each() macro
  x86/efistub: Disable paging at mixed mode entry
  usb: core: hub: Improved device recognition on remote wakeup
  scsi: mptfusion: Fix double fetch bug in ioctl
  USB: serial: quatech2: handle unbound ports
  USB: serial: io_edgeport: add missing active-port sanity check
  USB: serial: ch341: handle unbound port at reset_resume
  USB: serial: suppress driver bind attributes
  USB: serial: opticon: fix control-message timeouts
  USB: serial: simple: Add Motorola Solutions TETRA MTP3xxx and MTP85xx
  iio: buffer: align the size of scan bytes to size of the largest element
  block: fix an integer overflow in logical block size
  Fix built-in early-load Intel microcode alignment
  ALSA: seq: Fix racy access for queue timer in proc read
  clk: Don't try to enable critical clocks if prepare failed
  dt-bindings: reset: meson8b: fix duplicate reset IDs
  ocfs2: call journal flush to mark journal as empty after journal recovery when mount
  hexagon: work around compiler crash
  hexagon: parenthesize registers in asm predicates
  ioat: ioat_alloc_ring() failure handling.
  MIPS: Prevent link failure with kcov instrumentation
  rseq/selftests: Turn off timeout setting
  scsi: libcxgbi: fix NULL pointer dereference in cxgbi_device_destroy()
  gpio: mpc8xxx: Add platform device to gpiochip->parent
  rtc: msm6242: Fix reading of 10-hour digit
  f2fs: fix potential overflow
  rtlwifi: Remove unnecessary NULL check in rtl_regd_init
  spi: atmel: fix handling of cs_change set on non-last xfer
  mtd: spi-nor: fix silent truncation in spi_nor_read()
  media: exynos4-is: Fix recursive locking in isp_video_release()
  tty: serial: pch_uart: correct usage of dma_unmap_sg
  tty: serial: imx: use the sg count from dma_map_sg
  powerpc/powernv: Disable native PCIe port management
  PCI/PTM: Remove spurious "d" from granularity message
  compat_ioctl: handle SIOCOUTQNSD
  clk: samsung: exynos5420: Preserve CPU clocks configuration during suspend/resume
  mei: fix modalias documentation
  iio: imu: adis16480: assign bias value only if operation succeeded
  platform/x86: asus-wmi: Fix keyboard brightness cannot be set to 0
  scsi: sd: Clear sdkp->protection_type if disk is reformatted without PI
  scsi: enclosure: Fix stale device oops with hot replug
  RDMA/srpt: Report the SCSI residual to the initiator
  cifs: Adjust indentation in smb2_open_file
  hsr: reset network header when supervision frame is created
  gpio: Fix error message on out-of-range GPIO in lookup table
  iommu: Remove device link to group on failure
  rtc: mt6397: fix alarm register overwrite
  dccp: Fix memleak in __feat_register_sp
  ext4: add more paranoia checking in ext4_expand_extra_isize handling
  ext4: fix use-after-free race with debug_want_extra_isize
  wimax: i2400: Fix memory leak in i2400m_op_rfkill_sw_toggle
  wimax: i2400: fix memory leak
  media: usb:zr364xx:Fix KASAN:null-ptr-deref Read in zr364xx_vidioc_querycap
  mac80211: Do not send Layer 2 Update frame before authorization
  cfg80211/mac80211: make ieee80211_send_layer2_update a public function
  arm64: Make sure permission updates happen for pmd/pud
  arm64: Enforce BBM for huge IO/VMAP mappings
  arm64: mm: Change page table pointer name in p[md]_set_huge()
  arm64: don't open code page table entry creation
  arm64: mm: BUG on unsupported manipulations of live kernel mappings
  rsi: add fix for crash during assertions
  fs/select: avoid clang stack usage warning
  ethtool: reduce stack usage with clang
  HID: hidraw, uhid: Always report EPOLLOUT
  HID: hidraw: Fix returning EPOLLOUT from hidraw_poll
  hidraw: Return EPOLLOUT from hidraw_poll

 Conflicts:
	arch/arm64/mm/mmu.c
	net/core/ethtool.c
	net/wireless/util.c
Change-Id: I30903e27ed5fd45500154bbd11534386f29e30d7
Signed-off-by: jianzhou <jianzhou@codeaurora.org>