Makefile
100644 → 100755
+29
−14
+11
−0
+12
−2
Loading
Merge android-4.9.163 (429c144a) into msm-4.9
* tmp-429c144a: Linux 4.9.163 x86: Add TSX Force Abort CPUID/MSR perf/x86/intel: Generalize dynamic constraint creation perf/x86/intel: Make cpuc allocations consistent ARM: dts: exynos: Do not ignore real-world fuse values for thermal zone 0 on Exynos5420 ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+ drm: disable uncached DMA optimization for ARM and arm64 ARM: dts: exynos: Add minimal clkout parameters to Exynos3250 PMU ARM: dts: exynos: Fix pinctrl definition for eMMC RTSN line on Odroid X2/U3 futex,rt_mutex: Restructure rt_mutex_finish_proxy_lock() scsi: aacraid: Fix missing break in switch statement iscsi_ibft: Fix missing break in switch statement Input: elan_i2c - add id for touchpad found in Lenovo s21e-20 Input: wacom_serial4 - add support for Wacom ArtPad II tablet fs: ratelimit __find_get_block_slow() failure message. MIPS: Remove function size check in get_frame_info() perf symbols: Filter out hidden symbols from labels s390/qeth: fix use-after-free in error path netfilter: nf_nat: skip nat clash resolution for same-origin entries selftests: netfilter: add simple masq/redirect test cases selftests: netfilter: fix config fragment CONFIG_NF_TABLES_INET dmaengine: dmatest: Abort test in case of mapping error vsock/virtio: reset connected sockets on device removal vsock/virtio: fix kernel panic after device hot-unplug dmaengine: at_xdmac: Fix wrongfull report of a channel as in use drm/sun4i: tcon: Prepare and enable TCON channel 0 clock at init irqchip/mmp: Only touch the PJ4 IRQ & FIQ bits on enable/disable usb: phy: fix link errors arm64: dts: add msm8996 compatible to gicv3 ARM: pxa: ssp: unneeded to free devm_ allocated data soc: fsl: qbman: avoid race in clearing QMan interrupt autofs: fix error return in autofs_fill_super() autofs: drop dentry reference only when it is never used fs/drop_caches.c: avoid softlockups in drop_pagecache_sb() mm, memory_hotplug: test_pages_in_a_zone do not pass the end of zone mm, memory_hotplug: is_mem_section_removable do not pass the end of a zone x86_64: increase stack size for KASAN_EXTRA x86/kexec: Don't setup EFI info if EFI runtime is not enabled arm64: kprobe: Always blacklist the KVM world-switch code cifs: fix computation for MAX_SMB2_HDR_SIZE platform/x86: Fix unmet dependency warning for SAMSUNG_Q10 scsi: libfc: free skb when receiving invalid flogi resp qed: Fix VF probe failure while FLR nfs: Fix NULL pointer dereference of dev_name gpio: vf610: Mask all GPIO interrupts net: stmmac: dwmac-rk: fix error handling in rk_gmac_powerup() net: hns: Fix wrong read accesses via Clause 45 MDIO protocol net: hns: Fix for missing of_node_put() after of_parse_phandle() net: altera_tse: fix msgdma_tx_completion on non-zero fill_level case xtensa: SMP: limit number of possible CPUs by NR_CPUS xtensa: SMP: mark each possible CPU as present xtensa: smp_lx200_defconfig: fix vectors clash xtensa: SMP: fix secondary CPU initialization xtensa: SMP: fix ccount_timer_shutdown iommu/amd: Fix IOMMU page flush when detach device from a domain ipvs: Fix signed integer overflow when setsockopt timeout iommu/amd: Unmap all mapped pages in error path of map_sg iommu/amd: Call free_iova_fast with pfn in map_sg IB/{hfi1, qib}: Fix WC.byte_len calculation for UD_SEND_WITH_IMM perf tools: Handle TOPOLOGY headers with no CPU perf core: Fix perf_proc_update_handler() bug vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel media: uvcvideo: Fix 'type' check leading to overflow exec: Fix mem leak in kernel_read_file hugetlbfs: fix races and page leaks during migration MIPS: irq: Allocate accurate order pages for irq stack applicom: Fix potential Spectre v1 vulnerabilities x86/CPU/AMD: Set the CPB bit unconditionally on F17h net: phy: Micrel KSZ8061: link failure after cable connect tun: remove unnecessary memory barrier tun: fix blocking read net: avoid use IPCB in cipso_v4_error net: Add __icmp_send helper. xen-netback: fix occasional leak of grant ref mappings under memory pressure xen-netback: don't populate the hash cache on XenBus disconnect net: sit: fix memory leak in sit_init_net() net: nfc: Fix NULL dereference on nfc_llcp_build_tlv fails net: netem: fix skb length BUG_ON in __skb_to_sgvec netlabel: fix out-of-bounds memory accesses net: dsa: mv88e6xxx: Fix u64 statistics hv_netvsc: Fix IP header checksum for coalesced packets bnxt_en: Drop oversize TX packets to prevent errors. team: Free BPF filter when unregistering netdev sky2: Disable MSI on Dell Inspiron 1545 and Gateway P-79 net-sysfs: Fix mem leak in netdev_register_kobject ip6mr: Do not call __IP6_INC_STATS() from preemptible context staging: android: ion: fix sys heap pool's gfp_flags staging: wilc1000: fix to set correct value for 'vif_num' staging: comedi: ni_660x: fix missing break in switch statement isdn: isdn_tty: fix build warning of strncpy ncpfs: fix build warning of strncpy cpufreq: Use struct kobj_attribute instead of struct global_attr USB: serial: ftdi_sio: add ID for Hjelmslund Electronics USB485 USB: serial: cp210x: add ID for Ingenico 3070 USB: serial: option: add Telit ME910 ECM composition ANDROID: cuttlefish: enable CONFIG_INET_UDP_DIAG=y ANDROID: cpufreq: times: don't copy invalid freqs from freq table ANDROID: cuttlefish: enable CONFIG_USB_RTL8152=y ANDROID: cpufreq: times: record fast switch frequency transitions ANDROID: cuttlefish_defconfig: Add support for AC97 audio Revert "ANDROID: arm: process: Add display of memory around registers when displaying regs." Revert "arm: fix show_data fallout from KERN_CONT changes" ANDROID: cfi: Remove unused variable in ptr_to_check_fn ANDROID: cuttlefish: enable CONFIG_NETFILTER_XT_TARGET_CT=y ANDROID: overlayfs: override_creds=off option bypass creator_cred Linux 4.9.162 x86/uaccess: Don't leak the AC flag into __put_user() value evaluation mm: enforce min addr even if capable() in expand_downwards() mmc: spi: Fix card detection during probe powerpc: Always initialize input array when calling epapr_hypercall() KVM: nSVM: clear events pending from svm_complete_interrupts() when exiting to L1 svm: Fix AVIC incomplete IPI emulation cfg80211: extend range deviation for DMG mac80211: Add attribute aligned(2) to struct 'action' mac80211: don't initiate TDLS connection if station is not associated to AP ibmveth: Do not process frames after calling napi_reschedule net: usb: asix: ax88772_bind return error when hw_reset fail net: altera_tse: fix connect_local_phy error path scsi: csiostor: fix NULL pointer dereference in csio_vport_set_state() direct-io: allow direct writes to empty inodes serial: fsl_lpuart: fix maximum acceptable baud rate with over-sampling locking/rwsem: Fix (possible) missed wakeup mac80211: fix miscounting of ttl-dropped frames drivers: thermal: int340x_thermal: Fix sysfs race condition ARC: fix __ffs return value to avoid build warnings ASoC: imx-audmux: change snprintf to scnprintf for possible overflow ASoC: dapm: change snprintf to scnprintf for possible overflow usb: gadget: Potential NULL dereference on allocation error usb: dwc3: gadget: Fix the uninitialized link_state when udc starts usb: dwc3: gadget: synchronize_irq dwc irq in suspend thermal: int340x_thermal: Fix a NULL vs IS_ERR() check ALSA: compress: prevent potential divide by zero bugs ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field drm/msm: Unblock writer if reader closes file scsi: libsas: Fix rphy phy_identifier for PHYs with end devices attached Revert "loop: Fold __loop_release into loop_release" Revert "loop: Get rid of loop_index_mutex" Revert "loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl()" FROMGIT: binder: create node flag to request sender's security context ANDROID: revert "sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size" Makefile: Fix 4.9.161 merge Linux 4.9.161 kbuild: consolidate Clang compiler flags sched/sysctl: Fix attributes of some extern declarations phy: tegra: remove redundant self assignment of 'map' pinctrl: max77620: Use define directive for max77620_pinconf_param values netfilter: nf_tables: fix flush after rule deletion in the same batch Revert "bridge: do not add port to router list when receives query with source 0.0.0.0" mm/zsmalloc.c: fix -Wunneeded-internal-declaration warning mm/zsmalloc.c: change stat type parameter to int irqchip/gic-v3: Convert arm64 GIC accessors to {read,write}_sysreg_s kbuild: add -no-integrated-as Clang option unconditionally kbuild: set no-integrated-as before incl. arch Makefile kbuild: clang: disable unused variable warnings only when constant kbuild: clang: remove crufty HOSTCFLAGS kbuild: clang: fix build failures with sparse check kbuild: move cc-option and cc-disable-warning after incl. arch Makefile drm/i915: Fix enum pipe vs. enum transcoder for the PCH transcoder drm/i915: Consistently use enum pipe for PCH transcoders x86/boot: Disable the address-of-packed-member compiler warning tracing: Use cpumask_available() to check if cpumask variable may be used netpoll: Fix device name check in netpoll_setup() clocksource: Use GENMASK_ULL in definition of CLOCKSOURCE_MASK hpet: Make cmd parameter of hpet_ioctl_common() unsigned ARC: define ARCH_SLAB_MINALIGN = 8 ARC: U-boot: check arguments paranoidly ARCv2: Enable unaligned access in early ASM code parisc: Fix ptrace syscall number modification net/mlx4_en: Force CHECKSUM_NONE for short ethernet frames sctp: call gso_reset_checksum when computing checksum in sctp_gso_segment sit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach() team: avoid complex list operations in team_nl_cmd_options_set() net/packet: fix 4gb buffer limit due to overflow check batman-adv: fix uninit-value in batadv_interface_tx() KEYS: always initialize keyring_index_key::desc_len KEYS: user: Align the payload buffer RDMA/srp: Rework SCSI device reset handling net: ethernet: stmmac: change dma descriptors to __le32 isdn: avm: Fix string plus integer warning from Clang net/mlx5e: Fix wrong (zero) TX drop counter indication for representor mlxsw: spectrum_switchdev: Do not treat static FDB entries as sticky leds: lp5523: fix a missing check of return value of lp55xx_read atm: he: fix sign-extension overflow on large shift isdn: i4l: isdn_tty: Fix some concurrency double-free bugs net: stmmac: Fix PCI module removal leak MIPS: jazz: fix 64bit build scsi: isci: initialize shost fully before calling scsi_add_host() scsi: qla4xxx: check return code of qla4xxx_copy_from_fwddb_param MIPS: ath79: Enable OF serial ports in the default config net: hns: Fix use after free identified by SLUB debug qed: Fix qed_ll2_post_rx_buffer_notify_fw() by adding a write memory barrier mfd: mc13xxx: Fix a missing check of a register-read failure mfd: wm5110: Add missing ASRC rate register mfd: qcom_rpm: write fw_version to CTRL_REG mfd: ab8500-core: Return zero in get_register_interruptible() mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported mfd: db8500-prcmu: Fix some section annotations mfd: twl-core: Fix section annotations on {,un}protect_pm_master mfd: ti_am335x_tscadc: Use PLATFORM_DEVID_AUTO while registering mfd cells KEYS: allow reaching the keys quotas exactly proc, oom: do not report alien mms when setting oom_score_adj numa: change get_mempolicy() to use nr_node_ids instead of MAX_NUMNODES ceph: avoid repeatedly adding inode to mdsc->snap_flush_list libceph: handle an empty authorize reply mac80211: Free mpath object when rhashtable insertion fails ANDROID: cpufreq: times: optimize proc files Conflicts: Makefile arch/arm/kernel/process.c drivers/gpu/drm/msm/msm_rd.c drivers/staging/android/ion/ion_system_heap.c include/linux/sched/sysctl.h sound/core/compress_offload.c Change-Id: I1673f8e76b4863f8cebc8ead8bf24f659ce6ce44 Signed-off-by:jianzhou <jianzhou@codeaurora.org>