Merge android-4.14.166 (d4dd59fa) into msm-4.14
* refs/heads/tmp-d4dd59fa: Linux 4.14.166 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. dmaengine: k3dma: Avoid null pointer traversal MIPS: Prevent link failure with kcov instrumentation mips: cacheinfo: report shared CPU map 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_raw() mtd: spi-nor: fix silent truncation in spi_nor_read() media: exynos4-is: Fix recursive locking in isp_video_release() media: ov6650: Fix .get_fmt() V4L2_SUBDEV_FORMAT_TRY support media: ov6650: Fix some format attributes not under control media: ov6650: Fix incorrect use of JPEG colorspace 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 af_unix: add compat_ioctl support arm64: dts: apq8096-db820c: Increase load on l21 for SDCARD scsi: sd: enable compat ioctls for sed-opal pinctrl: lewisburg: Update pin list according to v1.1v6 pinctl: ti: iodelay: fix error checking on pinctrl_count_index_with_args call clk: samsung: exynos5420: Preserve CPU clocks configuration during suspend/resume mei: fix modalias documentation iio: imu: adis16480: assign bias value only if operation succeeded NFSv4.x: Drop the slot if nfs4_delegreturn_prepare waits for layoutreturn xprtrdma: Fix completion wait during device removal 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 arm64: Check for errata before evaluating cpu features arm64: add sentinel to kpti_safe_list RDMA/srpt: Report the SCSI residual to the initiator RDMA/mlx5: Return proper error value btrfs: simplify inode locking for RWF_NOWAIT 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 gpio: zynq: Fix for bug in zynq_gpio_restore_context API ASoC: stm32: spdifrx: fix race condition in irq handler ASoC: stm32: spdifrx: fix inconsistent lock state RDMA/bnxt_re: Fix Send Work Entry state check while polling completions rtc: mt6397: fix alarm register overwrite drm/i915: Fix use-after-free when destroying GEM context dccp: Fix memleak in __feat_register_sp iwlwifi: dbg_ini: fix memory leak in alloc_sgtable wimax: i2400: Fix memory leak in i2400m_op_rfkill_sw_toggle wimax: i2400: fix memory leak cifs: Fix lease buffer length error 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 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 cuttlefish: enable CONFIG_DUMMY=y Conflicts: arch/arm64/mm/mmu.c net/core/ethtool.c net/wireless/util.c Change-Id: I9062404104c97a86c4960f768e0be9220f69d192 Signed-off-by:Srinivasarao P <spathi@codeaurora.org>
Loading
Please register or sign in to comment