5 Commits

Author SHA1 Message Date
Nathan Chancellor
a1dbed8f62 Merge 4.4.170 into android-msm-wahoo-4.4
Changes in 4.4.170: (86 commits)
        USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data
        xhci: Don't prevent USB2 bus suspend in state check intended for USB3 only
        USB: serial: option: add GosunCn ZTE WeLink ME3630
        USB: serial: option: add HP lt4132
        USB: serial: option: add Simcom SIM7500/SIM7600 (MBIM mode)
        USB: serial: option: add Fibocom NL668 series
        USB: serial: option: add Telit LN940 series
        mmc: core: Reset HPI enabled state during re-init and in case of errors
        mmc: omap_hsmmc: fix DMA API warning
        gpio: max7301: fix driver for use with CONFIG_VMAP_STACK
        Drivers: hv: vmbus: Return -EINVAL for the sys files for unopened channels
        x86/mtrr: Don't copy uninitialized gentry fields back to userspace
        drm/ioctl: Fix Spectre v1 vulnerabilities
        ip6mr: Fix potential Spectre v1 vulnerability
        ipv4: Fix potential Spectre v1 vulnerability
        ax25: fix a use-after-free in ax25_fillin_cb()
        ibmveth: fix DMA unmap error in ibmveth_xmit_start error path
        ieee802154: lowpan_header_create check must check daddr
        ipv6: explicitly initialize udp6_addr in udp_sock_create6()
        isdn: fix kernel-infoleak in capi_unlocked_ioctl
        netrom: fix locking in nr_find_socket()
        packet: validate address length
        packet: validate address length if non-zero
        sctp: initialize sin6_flowinfo for ipv6 addrs in sctp_inet6addr_event
        vhost: make sure used idx is seen before log in vhost_add_used_n()
        VSOCK: Send reset control packet when socket is partially bound
        xen/netfront: tolerate frags with no data
        gro_cell: add napi_disable in gro_cells_destroy
        sock: Make sock->sk_stamp thread-safe
        ALSA: rme9652: Fix potential Spectre v1 vulnerability
        ALSA: emu10k1: Fix potential Spectre v1 vulnerabilities
        ALSA: pcm: Fix potential Spectre v1 vulnerability
        ALSA: emux: Fix potential Spectre v1 vulnerabilities
        ALSA: hda: add mute LED support for HP EliteBook 840 G4
        ALSA: hda/tegra: clear pending irq handlers
        USB: serial: pl2303: add ids for Hewlett-Packard HP POS pole displays
        USB: serial: option: add Fibocom NL678 series
        usb: r8a66597: Fix a possible concurrency use-after-free bug in r8a66597_endpoint_disable()
        Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G
        KVM: x86: Use jmp to invoke kvm_spurious_fault() from .fixup
        perf pmu: Suppress potential format-truncation warning
        ext4: fix possible use after free in ext4_quota_enable
        ext4: missing unlock/put_page() in ext4_try_to_write_inline_data()
        ext4: fix EXT4_IOC_GROUP_ADD ioctl
        ext4: force inode writes when nfsd calls commit_metadata()
        spi: bcm2835: Fix race on DMA termination
        spi: bcm2835: Fix book-keeping of DMA termination
        spi: bcm2835: Avoid finishing transfer prematurely in IRQ mode
        cdc-acm: fix abnormal DATA RX issue for Mediatek Preloader.
        media: vivid: free bitmap_cap when updating std/timings/etc.
        MIPS: Ensure pmd_present() returns false after pmd_mknotpresent()
        MIPS: Align kernel load address to 64KB
        CIFS: Fix error mapping for SMB2_LOCK command which caused OFD lock problem
        x86/kvm/vmx: do not use vm-exit instruction length for fast MMIO when running nested
        spi: bcm2835: Unbreak the build of esoteric configs
        powerpc: Fix COFF zImage booting on old powermacs
        ARM: imx: update the cpu power up timing setting on i.mx6sx
        Input: restore EV_ABS ABS_RESERVED
        checkstack.pl: fix for aarch64
        xfrm: Fix bucket count reported to userspace
        scsi: bnx2fc: Fix NULL dereference in error handling
        Input: omap-keypad - fix idle configuration to not block SoC idle states
        scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
        fork: record start_time late
        hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
        mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL
        mm, devm_memremap_pages: kill mapping "System RAM" support
        sunrpc: fix cache_head leak due to queued request
        sunrpc: use SVC_NET() in svcauth_gss_* functions
        crypto: x86/chacha20 - avoid sleeping with preemption disabled
        ALSA: cs46xx: Potential NULL dereference in probe
        ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
        ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
        dlm: fixed memory leaks after failed ls_remove_names allocation
        dlm: possible memory leak on error path in create_lkb()
        dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
        dlm: memory leaks on error path in dlm_user_request()
        gfs2: Fix loop in gfs2_rbm_find
        b43: Fix error in cordic routine
        9p/net: put a lower bound on msize
        iommu/vt-d: Handle domain agaw being less than iommu agaw
        ceph: don't update importing cap's mseq when handing cap export
        genwqe: Fix size check
        intel_th: msu: Fix an off-by-one in attribute store
        power: supply: olpc_battery: correct the temperature units
        Linux 4.4.170

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Conflicts:
	mm/memory_hotplug.c
2019-01-13 10:04:52 -07:00
Peter Hutterer
38a3371158 Input: restore EV_ABS ABS_RESERVED
[ Upstream commit c201e3808e0e4be9b98d192802085a9f491bd80c ]

ABS_RESERVED was added in d9ca1c990a7 and accidentally removed as part of
ffe0e7cf290f5c9 when the high-resolution scrolling code was removed.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Martin Kepplinger <martin.kepplinger@ginzinger.com>
Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-01-13 10:05:31 +01:00
Sudheer Papothi
5d092152c9 ALSA: jack: Add support to report second microphone
ALSA jack framework currently supports reporting only
one single microphone. Add support to report presence of
second microphone to userspace.

Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2016-03-23 20:09:53 -07:00
Sudheer Papothi
545e868e05 ALSA: jack: Update supported jack switch types
Change adds support for jack switch types supported
by platform.

Signed-off-by: Gopikrishnaiah Anandan <agopik@codeaurora.org>
Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2016-03-23 20:09:52 -07:00
Hans de Goede
f902dd8934 Input: add input-event-codes header file
Add input-event-codes header file and move all type and axis defines
there.

The purpose of this new header file is to have a single canonical source
for event-codes which can be used outside of C-code too. One example of
such usage is the use of event-codes in devicetree source files.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
2015-10-16 15:32:05 -07:00