Merge android-4.9.125 (a925dfbd) into msm-4.9
* refs/heads/tmp-a925dfbd: Linux 4.9.125 staging: android: ion: check for kref overflow cdrom: Fix info leak/OOB read in cdrom_ioctl_drive_status power: generic-adc-battery: check for duplicate properties copied from iio channels power: generic-adc-battery: fix out-of-bounds write when copying channel properties PM / clk: signedness bug in of_pm_clk_add_clks() clk: rockchip: fix clk_i2sout parent selection bits on rk3399 iscsi target: fix session creation failure handling scsi: core: Avoid that SCSI device removal through sysfs triggers a deadlock scsi: sysfs: Introduce sysfs_{un,}break_active_protection() MIPS: lib: Provide MIPS64r6 __multi3() for GCC < 7 MIPS: Correct the 64-bit DSP accumulator register size kprobes: Make list and blacklist root user read only s390/pci: fix out of bounds access during irq setup s390/numa: move initial setup of node_to_cpumask_map s390/qdio: reset old sbal_state flags s390: fix br_r1_trampoline for machines without exrl x86/entry/64: Wipe KASAN stack shadow before rewind_stack_do_exit() x86/speculation/l1tf: Increase l1tf memory limit for Nehalem+ x86/spectre: Add missing family 6 check to microcode check x86/irqflags: Mark native_restore_fl extern inline pinctrl: freescale: off by one in imx1_pinconf_group_dbg_show() ASoC: sirf: Fix potential NULL pointer dereference ASoC: dpcm: don't merge format from invalid codec dai b43/leds: Ensure NUL-termination of LED name string b43legacy/leds: Ensure NUL-termination of LED name string udl-kms: fix crash due to uninitialized memory udl-kms: handle allocation failure udl-kms: change down_interruptible to down fuse: Add missed unlock_page() to fuse_readpages_fill() fuse: Fix oops at process_init_reply() fuse: umount should wait for all requests fuse: fix unlocked access to processing queue fuse: fix double request_end() fuse: fix initial parallel dirops fuse: Don't access pipe->buffers without pipe_lock() x86/kvm/vmx: Remove duplicate l1d flush definitions KVM: x86: SVM: Call x86_spec_ctrl_set_guest/host() with interrupts disabled x86/process: Re-export start_thread() x86/speculation/l1tf: Suggest what to do on systems with too much RAM x86/speculation/l1tf: Fix off-by-one error when warning that system has too much RAM x86/speculation/l1tf: Fix overflow in l1tf_pfn_limit() on 32bit sparc: kernel/pcic: silence gcc 7.x warning in pcibios_fixup_bus() KVM: arm/arm64: Skip updating PMD entry if no change KVM: arm/arm64: Skip updating PTE entry if no change staging: android: ion: fix ION_IOC_{MAP,SHARE} use-after-free ext4: reset error code in ext4_find_entry in fallback ext4: sysfs: print ext4_super_block fields as little-endian ext4: check for NUL characters in extended attribute's name s390/kvm: fix deadlock when killed by oom arm64: mm: check for upper PAGE_SHIFT bits in pfn_valid() kprobes/arm64: Fix %p uses in error messages smb3: don't request leases in symlink creation and query smb3: Do not send SMB3 SET_INFO if nothing changed smb3: enumerating snapshots was leaving part of the data off end cifs: check kmalloc before use cifs: add missing debug entries for kconfig options mei: don't update offset in write Cipso: cipso_v4_optptr enter infinite loop sched/sysctl: Check user input value of sysctl_sched_time_avg mm/memory.c: check return value of ioremap_prot scsi: vmw_pvscsi: Return DID_RESET for status SAM_STAT_COMMAND_TERMINATED scsi: fcoe: clear FC_RP_STARTED flags when receiving a LOGO scsi: fcoe: drop frames in ELS LOGO error path memcg: remove memcg_cgroup::id from IDR on mem_cgroup_css_alloc() failure drivers: net: lmc: fix case value for target abort error Squashfs: Compute expected length from inode size rather than block length squashfs metadata 2: electric boogaloo arc: fix type warnings in arc/mm/cache.c arc: fix build errors in arc/include/asm/delay.h arc: [plat-eznps] fix data type errors in platform headers enic: handle mtu change for vf properly Revert "MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum" tools/power turbostat: Read extended processor family from CPUID zswap: re-check zswap_is_full() after do zswap_shrink() selftests/ftrace: Add snapshot and tracing_on test case cachefiles: Wait rather than BUG'ing on "Unexpected object collision" cachefiles: Fix refcounting bug in backing-file read monitoring fscache: Allow cancelled operations to be enqueued x86/boot: Fix if_changed build flip/flop bug net: axienet: Fix double deregister of mdio qmi_wwan: fix interface number for DW5821e production firmware bnx2x: Fix invalid memory access in rss hash config path. media: staging: omap4iss: Include asm/cacheflush.h after generic includes perf/x86/amd/ibs: Don't access non-started event i2c: davinci: Avoid zero value of CLKH can: mpc5xxx_can: check of_iomap return before use net: prevent ISA drivers from building on PPC32 atl1c: reserve min skb headroom qed: Correct Multicast API to reflect existence of 256 approximate buckets. qed: Fix possible race for the link state value. net: caif: Add a missing rcu_read_unlock() in caif_flow_cb tools/power turbostat: fix -S on UP systems bpf, ppc64: fix unexpected r0=0 exit path inside bpf_xadd usb: gadget: f_uac2: fix endianness of 'struct cntrl_*_lay3' tools: usb: ffs-test: Fix build on big endian systems usb/phy: fix PPC64 build errors in phy-fsl-usb.c usb: gadget: r8a66597: Fix a possible sleep-in-atomic-context bugs in r8a66597_queue() usb: gadget: r8a66597: Fix two possible sleep-in-atomic-context bugs in init_controller() drm/imx: imx-ldb: check if channel is enabled before printing warning drm/imx: imx-ldb: disable LDB on driver bind scsi: libiscsi: fix possible NULL pointer dereference in case of TMF drm/bridge: adv7511: Reset registers on hotplug nl80211: Add a missing break in parse_station_flags mac80211: add stations tied to AP_VLANs during hw reconfig xfrm: free skb if nlsk pointer is NULL xfrm: fix missing dst_release() after policy blocking lbcast and multicast vti6: fix PMTU caching and reporting on xmit BACKPORT: zram: drop max_zpage_size and use zs_huge_class_size() UPSTREAM: zsmalloc: introduce zs_huge_class_size() ANDROID: tracing: fix race condition reading saved tgids ANDROID: x86_64_cuttlefish_defconfig: Enable lz4 compression for zram UPSTREAM: drivers/block/zram/zram_drv.c: fix bug storing backing_dev ANDROID: squashfs: resolve merge conflict with 4.14.68 Conflicts: drivers/staging/android/ion/ion-ioctl.c drivers/staging/android/ion/ion.c drivers/staging/android/ion/ion_priv.h kernel/trace/trace.c Change-Id: I56743332c746c1a3e74d1ddd0c3ef56cd0b9bbf2 Signed-off-by:Minming Qi <mqi@codeaurora.org>
Loading
Please register or sign in to comment