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

Commit 624c0959 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.4.159 into android-4.4 



Changes in 4.4.159
	NFC: Fix possible memory corruption when handling SHDLC I-Frame commands
	NFC: Fix the number of pipes
	ASoC: cs4265: fix MMTLR Data switch control
	ALSA: bebob: use address returned by kmalloc() instead of kernel stack for streaming DMA mapping
	ALSA: emu10k1: fix possible info leak to userspace on SNDRV_EMU10K1_IOCTL_INFO
	platform/x86: alienware-wmi: Correct a memory leak
	xen/netfront: don't bug in case of too many frags
	xen/x86/vpmu: Zero struct pt_regs before calling into sample handling code
	ring-buffer: Allow for rescheduling when removing pages
	mm: shmem.c: Correctly annotate new inodes for lockdep
	gso_segment: Reset skb->mac_len after modifying network header
	ipv6: fix possible use-after-free in ip6_xmit()
	net/appletalk: fix minor pointer leak to userspace in SIOCFINDIPDDPRT
	net: hp100: fix always-true check for link up state
	neighbour: confirm neigh entries when ARP packet is received
	scsi: target: iscsi: Use hex2bin instead of a re-implementation
	ocfs2: fix ocfs2 read block panic
	drm/nouveau/drm/nouveau: Use pm_runtime_get_noresume() in connector_detect()
	tty: vt_ioctl: fix potential Spectre v1
	ext4: avoid divide by zero fault when deleting corrupted inline directories
	ext4: recalucate superblock checksum after updating free blocks/inodes
	ext4: fix online resize's handling of a too-small final block group
	ext4: fix online resizing for bigalloc file systems with a 1k block size
	ext4: don't mark mmp buffer head dirty
	arm64: Add trace_hardirqs_off annotation in ret_to_user
	HID: sony: Update device ids
	HID: sony: Support DS4 dongle
	iw_cxgb4: only allow 1 flush on user qps
	Linux 4.4.159

Change-Id: I98239ca60783ca69147f2f11034138fc22e2af65
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 85b352c4 9c6cd3f3

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 158

SUBLEVEL = 159

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/x86/xen/pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static void xen_convert_regs(const struct xen_pmu_regs *xen_regs, 
irqreturn_t xen_pmu_irq_handler(int irq, void *dev_id)

{

	int err, ret = IRQ_NONE;

	struct pt_regs regs;

	struct pt_regs regs = {0};

	const struct xen_pmu_data *xenpmu_data = get_xenpmu_data();

	uint8_t xenpmu_flags = get_xenpmu_flags();

drivers/gpu/drm/nouveau/nouveau_connector.c

+11 −9
Original line number Diff line number Diff line
@@ -253,12 +253,16 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) 
		nv_connector->edid = NULL;

	}



	/* Outputs are only polled while runtime active, so acquiring a

	 * runtime PM ref here is unnecessary (and would deadlock upon

	 * runtime suspend because it waits for polling to finish).

	/* Outputs are only polled while runtime active, so resuming the

	 * device here is unnecessary (and would deadlock upon runtime suspend

	 * because it waits for polling to finish). We do however, want to

	 * prevent the autosuspend timer from elapsing during this operation

	 * if possible.

	 */

	if (!drm_kms_helper_is_poll_worker()) {

		ret = pm_runtime_get_sync(connector->dev->dev);

	if (drm_kms_helper_is_poll_worker()) {

		pm_runtime_get_noresume(dev->dev);

	} else {

		ret = pm_runtime_get_sync(dev->dev);

		if (ret < 0 && ret != -EACCES)

			return conn_status;

	}
@@ -329,10 +333,8 @@ detect_analog: 


 out:



	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

		pm_runtime_put_autosuspend(connector->dev->dev);

	}

	pm_runtime_mark_last_busy(dev->dev);

	pm_runtime_put_autosuspend(dev->dev);



	return conn_status;

}

drivers/hid/hid-core.c

+3 −0
Original line number Diff line number Diff line
@@ -2011,6 +2011,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },

drivers/hid/hid-ids.h

+2 −0
Original line number Diff line number Diff line
@@ -879,6 +879,8 @@ 
#define USB_DEVICE_ID_SONY_PS3_BDREMOTE		0x0306

#define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268

#define USB_DEVICE_ID_SONY_PS4_CONTROLLER	0x05c4

#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2	0x09cc

#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE	0x0ba0

#define USB_DEVICE_ID_SONY_MOTION_CONTROLLER	0x03d5

#define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER	0x042f

#define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER		0x0002