+1
−1
Loading
Merge android-4.14.111 (171fc237) into msm-4.14
* refs/heads/tmp-171fc237: Revert "usb: dwc3: gadget: Fix OTG events when gadget driver isn't loaded" Revert "coresight: etm4x: Add support to enable ETMv4.2" Linux 4.14.111 ACPI / video: Extend chassis-type detection with a "Lunch Box" check drm/dp/mst: Configure no_stop_bit correctly for remote i2c xfers dmaengine: tegra: avoid overflow of byte tracking clk: rockchip: fix frac settings of GPLL clock for rk3328 x86/build: Mark per-CPU symbols as absolute explicitly for LLD wlcore: Fix memory leak in case wl12xx_fetch_firmware failure selinux: do not override context on context mounts x86/build: Specify elf_i386 linker emulation explicitly for i386 objects drm/nouveau: Stop using drm_crtc_force_disable drm: Auto-set allow_fb_modifiers when given modifiers at plane init regulator: act8865: Fix act8600_sudcdc_voltage_ranges setting media: s5p-jpeg: Check for fmt_ver_flag when doing fmt enumeration netfilter: physdev: relax br_netfilter dependency dmaengine: qcom_hidma: initialize tx flags in hidma_prep_dma_* dmaengine: qcom_hidma: assign channel cookie correctly dmaengine: imx-dma: fix warning comparison of distinct pointer types cpu/hotplug: Mute hotplug lockdep during init hpet: Fix missing '=' character in the __setup() code of hpet_mmap_enable HID: intel-ish: ipc: handle PIMR before ish_wakeup also clear PISR busy_clear bit soc/tegra: fuse: Fix illegal free of IO base address hwrng: virtio - Avoid repeated init of completion media: mt9m111: set initial frame size other than 0x0 usb: dwc3: gadget: Fix OTG events when gadget driver isn't loaded powerpc/pseries: Perform full re-add of CPU for topology update post-migration tty: increase the default flip buffer limit to 2*640K backlight: pwm_bl: Use gpiod_get_value_cansleep() to get initial state cgroup/pids: turn cgroup_subsys->free() into cgroup_subsys->release() to fix the accounting bpf: fix missing prototype warnings ARM: avoid Cortex-A9 livelock on tight dmb loops ARM: 8830/1: NOMMU: Toggle only bits in EXC_RETURN we are really care of mt7601u: bump supported EEPROM version soc: qcom: gsbi: Fix error handling in gsbi_probe() efi/arm/arm64: Allow SetVirtualAddressMap() to be omitted ARM: dts: lpc32xx: Remove leading 0x and 0s from bindings notation efi/memattr: Don't bail on zero VA if it equals the region's PA sched/debug: Initialize sd_sysctl_cpus if !CONFIG_CPUMASK_OFFSTACK ASoC: fsl-asoc-card: fix object reference leaks in fsl_asoc_card_probe platform/x86: intel_pmc_core: Fix PCH IP sts reading e1000e: fix cyclic resets at link up with active tx cdrom: Fix race condition in cdrom_sysctl_register fbdev: fbmem: fix memory access if logo is bigger than the screen iw_cxgb4: fix srqidx leak during connection abort genirq: Avoid summation loops for /proc/stat bcache: improve sysfs_strtoul_clamp() bcache: fix input overflow to sequential_cutoff bcache: fix input overflow to cache set sysfs file io_error_halflife sched/topology: Fix percpu data types in struct sd_data & struct s_data usb: f_fs: Avoid crash due to out-of-scope stack ptr access ALSA: PCM: check if ops are defined before suspending PCM ARM: 8833/1: Ensure that NEON code always compiles with Clang netfilter: conntrack: fix cloned unconfirmed skb->_nfct race in __nf_conntrack_confirm kprobes: Prohibit probing on bsearch() ACPI / video: Refactor and fix dmi_is_desktop() iwlwifi: pcie: fix emergency path leds: lp55xx: fix null deref on firmware load failure jbd2: fix race when writing superblock HID: intel-ish-hid: avoid binding wrong ishtp_cl_device vfs: fix preadv64v2 and pwritev64v2 compat syscalls with offset == -1 media: mtk-jpeg: Correct return type for mem2mem buffer helpers media: mx2_emmaprp: Correct return type for mem2mem buffer helpers media: s5p-g2d: Correct return type for mem2mem buffer helpers media: s5p-jpeg: Correct return type for mem2mem buffer helpers media: sh_veu: Correct return type for mem2mem buffer helpers SoC: imx-sgtl5000: add missing put_device() perf test: Fix failure of 'evsel-tp-sched' test on s390 scsi: fcoe: make use of fip_mode enum complete scsi: megaraid_sas: return error when create DMA pool failed efi: cper: Fix possible out-of-bounds access cpufreq: acpi-cpufreq: Report if CPU doesn't support boost technologies clk: fractional-divider: check parent rate only if flag is set IB/mlx4: Increase the timeout for CM cache mlxsw: spectrum: Avoid -Wformat-truncation warnings e1000e: Fix -Wformat-truncation warnings mmc: omap: fix the maximum timeout setting powerpc/hugetlb: Handle mmap_min_addr correctly in get_unmapped_area callback iommu/io-pgtable-arm-v7s: Only kmemleak_ignore L2 tables ARM: 8840/1: use a raw_spinlock_t in unwind serial: 8250_pxa: honor the port number from devicetree coresight: etm4x: Add support to enable ETMv4.2 powerpc/xmon: Fix opcode being uninitialized in print_insn_powerpc scsi: core: replace GFP_ATOMIC with GFP_KERNEL in scsi_scan.c usb: chipidea: Grab the (legacy) USB PHY by phandle first crypto: cavium/zip - fix collision with generic cra_driver_name crypto: crypto4xx - add missing of_node_put after of_device_is_available wil6210: check null pointer in _wil_cfg80211_merge_extra_ies PCI/PME: Fix hotplug/sysfs remove deadlock in pcie_pme_remove() tools lib traceevent: Fix buffer overflow in arg_eval fs: fix guard_bio_eod to check for real EOD errors jbd2: fix invalid descriptor block checksum cifs: Fix NULL pointer dereference of devname dm thin: add sanity checks to thin-pool and external snapshot creation cifs: use correct format characters page_poison: play nicely with KASAN fs/file.c: initialize init_files.resize_wait f2fs: do not use mutex lock in atomic context ocfs2: fix a panic problem caused by o2cb_ctl mm/slab.c: kmemleak no scan alien caches mm/vmalloc.c: fix kernel BUG at mm/vmalloc.c:512! mm, mempolicy: fix uninit memory access mm/page_ext.c: fix an imbalance with kmemleak mm/cma.c: cma_declare_contiguous: correct err handling perf c2c: Fix c2c report for empty numa node iio: adc: fix warning in Qualcomm PM8xxx HK/XOADC driver scsi: hisi_sas: Set PHY linkrate when disconnected enic: fix build warning without CONFIG_CPUMASK_OFFSTACK sysctl: handle overflow for file-max include/linux/relay.h: fix percpu annotation in struct rchan gpio: gpio-omap: fix level interrupt idling net/mlx5: Avoid panic when setting vport mac, getting vport config net/mlx5: Avoid panic when setting vport rate tracing: kdb: Fix ftdump to not sleep f2fs: fix to avoid deadlock in f2fs_read_inline_dir() h8300: use cc-cross-prefix instead of hardcoding h8300-unknown-linux- CIFS: fix POSIX lock leak and invalid ptr deref mm: mempolicy: make mbind() return -EIO when MPOL_MF_STRICT is specified tty/serial: atmel: RS485 HD w/DMA: enable RX after TX is stopped tty/serial: atmel: Add is_half_duplex helper lib/int_sqrt: optimize initial value compute ext4: cleanup bh release code in ext4_ind_remove_space() arm64: debug: Don't propagate UNKNOWN FAR into si_code for debug signals ANDROID: cuttlefish_defconfig: Enable CONFIG_OVERLAY_FS ANDROID: cuttlefish: enable CONFIG_NET_SCH_INGRESS=y Conflicts: drivers/usb/gadget/function/f_fs.c mm/page_alloc.c net/netfilter/nf_conntrack_core.c Change-Id: I4a3db0717eb4f0f0d89e57f3167129bcd2419599 Signed-off-by:Blagovest Kolenichev <bkolenichev@codeaurora.org>