Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6328e647 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.145 into android-4.9 



Changes in 4.9.145
	media: omap3isp: Unregister media device as first
	iommu/vt-d: Fix NULL pointer dereference in prq_event_thread()
	brcmutil: really fix decoding channel info for 160 MHz bandwidth
	iommu/ipmmu-vmsa: Fix crash on early domain free
	can: rcar_can: Fix erroneous registration
	HID: input: Ignore battery reported by Symbol DS4308
	batman-adv: Expand merged fragment buffer for full packet
	bnx2x: Assign unique DMAE channel number for FW DMAE transactions.
	qed: Fix PTT leak in qed_drain()
	qed: Fix reading wrong value in loop condition
	net/mlx4_core: Zero out lkey field in SW2HW_MPT fw command
	net/mlx4_core: Fix uninitialized variable compilation warning
	net/mlx4: Fix UBSAN warning of signed integer overflow
	mtd: rawnand: qcom: Namespace prefix some commands
	net: faraday: ftmac100: remove netif_running(netdev) check before disabling interrupts
	iommu/vt-d: Use memunmap to free memremap
	team: no need to do team_notify_peers or team_mcast_rejoin when disabling port
	net: amd: add missing of_node_put()
	mm: don't warn about allocations which stall for too long
	ARC: [zebu] Remove CONFIG_INITRAMFS_SOURCE from defconfigs
	usb: quirk: add no-LPM quirk on SanDisk Ultra Flair device
	usb: appledisplay: Add 27" Apple Cinema Display
	USB: check usb_get_extra_descriptor for proper size
	ALSA: usb-audio: Fix UAF decrement if card has no live interfaces in card.c
	ALSA: hda: Add support for AMD Stoney Ridge
	ALSA: pcm: Fix starvation on down_write_nonblock()
	ALSA: pcm: Call snd_pcm_unlink() conditionally at closing
	ALSA: pcm: Fix interval evaluation with openmin/max
	ALSA: hda/realtek - Fix speaker output regression on Thinkpad T570
	virtio/s390: avoid race on vcdev->config
	virtio/s390: fix race in ccw_io_helper()
	SUNRPC: Fix leak of krb5p encode pages
	dmaengine: cppi41: delete channel from pending list when stop channel
	xhci: Prevent U1/U2 link pm states if exit latency is too long
	sr: pass down correctly sized SCSI sense buffer
	swiotlb: clean up reporting
	vsock: lookup and setup guest_cid inside vhost_vsock_lock
	vhost/vsock: fix use-after-free in network stack callers
	Staging: lustre: remove two build warnings
	cifs: Fix separator when building path from dentry
	staging: rtl8712: Fix possible buffer overrun
	tty: serial: 8250_mtk: always resume the device in probe.
	tty: do not set TTY_IO_ERROR flag if console port
	kgdboc: fix KASAN global-out-of-bounds bug in param_set_kgdboc_var()
	mac80211_hwsim: Timer should be initialized before device registered
	mac80211: Clear beacon_int in ieee80211_do_stop
	mac80211: ignore tx status for PS stations in ieee80211_tx_status_ext
	mac80211: fix reordering of buffered broadcast packets
	mac80211: ignore NullFunc frames in the duplicate detection
	kbuild: fix linker feature test macros when cross compiling with Clang
	kbuild: allow to use GCC toolchain not in Clang search path
	Linux 4.9.145

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 605e2ec6 9c2f007c

Makefile

+3 −3
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 144

SUBLEVEL = 145

EXTRAVERSION =

NAME = Roaring Lionus
@@ -522,8 +522,8 @@ endif 
ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_TOOLCHAIN)

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable)

KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)

arch/arc/configs/zebu_hs_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y 
# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"

CONFIG_EXPERT=y

CONFIG_PERF_EVENTS=y

# CONFIG_COMPAT_BRK is not set

arch/arc/configs/zebu_hs_smp_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y 
# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

# CONFIG_VM_EVENT_COUNTERS is not set

drivers/dma/cppi41.c

+15 −1
Original line number Diff line number Diff line
@@ -717,8 +717,22 @@ static int cppi41_stop_chan(struct dma_chan *chan) 


	desc_phys = lower_32_bits(c->desc_phys);

	desc_num = (desc_phys - cdd->descs_phys) / sizeof(struct cppi41_desc);

	if (!cdd->chan_busy[desc_num])

	if (!cdd->chan_busy[desc_num]) {

		struct cppi41_channel *cc, *_ct;



		/*

		 * channels might still be in the pendling list if

		 * cppi41_dma_issue_pending() is called after

		 * cppi41_runtime_suspend() is called

		 */

		list_for_each_entry_safe(cc, _ct, &cdd->pending, node) {

			if (cc != c)

				continue;

			list_del(&cc->node);

			break;

		}

		return 0;

	}



	ret = cppi41_tear_down_chan(c);

	if (ret)

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -965,6 +965,7 @@ 
#define USB_VENDOR_ID_SYMBOL		0x05e0

#define USB_DEVICE_ID_SYMBOL_SCANNER_1	0x0800

#define USB_DEVICE_ID_SYMBOL_SCANNER_2	0x1300

#define USB_DEVICE_ID_SYMBOL_SCANNER_3	0x1200



#define USB_VENDOR_ID_SYNAPTICS		0x06cb

#define USB_DEVICE_ID_SYNAPTICS_TP	0x0001