+36
−0
+1
−0
+3
−3
+1
−1
Loading
Merge android-4.14-p.85 (e48b7f2d) into msm-4.14
* remotes/origin/tmp-e48b7f2d: Linux 4.14.85 ima: re-initialize iint->atomic_flags ima: re-introduce own integrity cache lock EVM: Add support for portable signature format ima: always measure and audit files in policy net: ieee802154: 6lowpan: fix frag reassembly rcu: Make need_resched() respond to urgent RCU-QS needs s390/mm: Check for valid vma before zapping in gmap_discard lan78xx: Read MAC address from DT if present namei: allow restricted O_CREAT of FIFOs and regular files usb: xhci: fix uninitialized completion when USB3 port got wrong status tty: wipe buffer if not echoing data tty: wipe buffer. include/linux/pfn_t.h: force '~' to be parsed as an unary operator driver core: Move device_links_purge() after bus_remove_device() ARM: dts: exynos: Fix invalid node referenced by i2c20 alias in Peach Pit and Pi clk: samsung: exynos5250: Add missing clocks for FIMC LITE SYSMMU devices rtc: omap: fix error path when pinctrl_register fails i40iw: Fix memory leak in error path of create QP net/mlx4_core: Fix wrong calculation of free counters PCI: endpoint: Populate func_no before calling pci_epc_add_epf() kbuild: allow to use GCC toolchain not in Clang search path iwlwifi: fix wrong WGDS_WIFI_DATA_SIZE Input: xpad - add support for Xbox1 PDP Camo series gamepad Input: xpad - avoid using __set_bit() for capabilities Input: xpad - fix some coding style issues Input: xpad - add PDP device id 0x02a4 ubi: fastmap: Check each mapping only once mtd: rawnand: atmel: fix OF child-node lookup xhci: Add quirk to workaround the errata seen on Cavium Thunder-X2 Soc xhci: Allow more than 32 quirks arm64: remove no-op -p linker flag power: supply: twl4030-charger: fix OF sibling-node lookup drm/mediatek: fix OF sibling-node lookup net: bcmgenet: fix OF child-node lookup NFC: nfcmrvl_uart: fix OF child-node lookup of: add helper to lookup compatible child node mm, page_alloc: check for max order in hot path tmpfs: make lseek(SEEK_DATA/SEK_HOLE) return ENXIO with a negative offset z3fold: fix possible reclaim races efi/arm: Revert deferred unmap of early memmap mapping powerpc/numa: Suppress "VPHN is not supported" messages kdb: Use strscpy with destination buffer size SUNRPC: Fix a bogus get/put in generic_key_to_expire() perf/x86/intel/uncore: Add more IMC PCI IDs for KabyLake and CoffeeLake CPUs powerpc/io: Fix the IO workarounds code to work with Radix floppy: fix race condition in __floppy_read_block_0() crypto: simd - correctly take reqsize of wrapped skcipher into account rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write cpufreq: imx6q: add return value check for voltage scale KVM: PPC: Move and undef TRACE_INCLUDE_PATH/FILE pinctrl: meson: fix pinconf bias disable IB/hfi1: Eliminate races in the SDMA send error path can: hi311x: Use level-triggered interrupt can: raw: check for CAN FD capable netdev in raw_sendmsg() can: rx-offload: rename can_rx_offload_irq_queue_err_skb() to can_rx_offload_queue_tail() can: rx-offload: introduce can_rx_offload_get_echo_skb() and can_rx_offload_queue_sorted() functions can: dev: __can_get_echo_skb(): print error message, if trying to echo non existing skb can: dev: __can_get_echo_skb(): Don't crash the kernel if can_priv::echo_skb is accessed out of bounds can: dev: __can_get_echo_skb(): replace struct can_frame by canfd_frame to access frame length can: dev: can_get_echo_skb(): factor out non sending code to __can_get_echo_skb() drm/ast: Remove existing framebuffers before loading driver drm/ast: fixed cursor may disappear sometimes drm/ast: change resolution may cause screen blurred usb: xhci: Prevent bus suspend if a port connect change or polling state is detected IB/core: Perform modify QP on real one tcp: do not release socket ownership in tcp_close() mm/memory.c: recheck page table entry with page table lock held mm: don't warn about large allocations for slab llc: do not use sk_eat_skb() gfs2: Don't leave s_fs_info pointing to freed memory in init_sbd sctp: clear the transport of some out_chunk_list chunks in sctp_assoc_rm_peer bfs: add sanity check at bfs_fill_super() Input: synaptics - avoid using uninitialized variable when probing selinux: Add __GFP_NOWARN to allocation at str_read() v9fs_dir_readdir: fix double-free on p9stat_read error tools/power/cpupower: fix compilation with STATIC=true brcmfmac: fix reporting support for 160 MHz channels iwlwifi: mvm: don't use SAR Geo if basic SAR is not used iwlwifi: mvm: fix regulatory domain update when the firmware starts iwlwifi: mvm: support sta_statistics() even on older firmware gpio: don't free unallocated ida on gpiochip_add_data_with_key() error path mmc: sdhci-pci: Try "cd" for card-detect lookup before using NULL MAINTAINERS: Add Sasha as a stable branch maintainer ALSA: oss: Use kvzalloc() for local buffer allocations usb: xhci: fix timeout for transition from RExit to U0 xhci: Add check for invalid byte size error when UAS devices are connected. usb: dwc3: core: Clean up ULPI device usb: dwc3: gadget: Properly check last unaligned/zero chain TRB usb: dwc3: gadget: fix ISOC TRB type on unaligned transfers usb: core: Fix hub port connection events lost ARM: trusted_foundations: do not use naked function bus: arm-cci: remove unnecessary unreachable() ARM: 8767/1: add support for building ARM kernel with clang ARM: 8766/1: drop no-thumb-interwork in EABI mode efi/libstub: arm: support building with clang Conflicts: arch/arm/Makefile drivers/usb/dwc3/core.c Change-Id: Ifce193a4ab04355448ddd2a6896d229555c27c5d Signed-off-by:Blagovest Kolenichev <bkolenichev@codeaurora.org> Signed-off-by: