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

Commit 7a365d34 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.71 into android-3.18 



Changes in 3.18.71
	usb: quirks: add delay init quirk for Corsair Strafe RGB keyboard
	USB: serial: option: add support for D-Link DWM-157 C1
	usb: Add device quirk for Logitech HD Pro Webcam C920-C
	usb:xhci:Fix regression when ATI chipsets detected
	USB: core: Avoid race of async_completed() w/ usbdev_release()
	staging/rts5208: fix incorrect shift to extract upper nybble
	driver core: bus: Fix a potential double free
	Input: trackpoint - assume 3 buttons when buttons detection fails
	dlm: avoid double-free on error path in dlm_device_{register,unregister}
	cma: fix calculation of aligned offset
	workqueue: Fix flag collision
	cs5536: add support for IDE controller variant
	scsi: sg: protect against races between mmap() and SG_SET_RESERVED_SIZE
	scsi: sg: recheck MMAP_IO request length with lock held
	btrfs: resume qgroup rescan on rw remount
	locktorture: Fix potential memory leak with rw lock test
	ALSA: msnd: Optimize / harden DSP and MIDI loops
	Bluetooth: Properly check L2CAP config option output buffer length
	ARM: 8692/1: mm: abort uaccess retries upon fatal signal
	xfs: XFS_IS_REALTIME_INODE() should be false if no rt device present
	Linux 3.18.71

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 64ab9859 60a8261b

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 70

SUBLEVEL = 71

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/mm/fault.c

+4 −1
Original line number Diff line number Diff line
@@ -315,8 +315,11 @@ retry: 
	 * signal first. We do not need to release the mmap_sem because

	 * it would already be released in __lock_page_or_retry in

	 * mm/filemap.c. */

	if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))

	if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) {

		if (!user_mode(regs))

			goto no_context;

		return 0;

	}



	/*

	 * Major/minor page fault accounting is only done on the

drivers/ata/pata_amd.c

+1 −0
Original line number Diff line number Diff line
@@ -616,6 +616,7 @@ static const struct pci_device_id amd[] = { 
	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE),	8 },

	{ PCI_VDEVICE(NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE),	8 },

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE),		9 },

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_CS5536_DEV_IDE),	9 },



	{ },

};

drivers/ata/pata_cs5536.c

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id) 


static const struct pci_device_id cs5536[] = {

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE), },

	{ PCI_VDEVICE(AMD,	PCI_DEVICE_ID_AMD_CS5536_DEV_IDE), },

	{ },

};

drivers/base/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ int bus_add_driver(struct device_driver *drv) 


out_unregister:

	kobject_put(&priv->kobj);

	kfree(drv->p);

	/* drv->p is freed in driver_release()  */

	drv->p = NULL;

out_put_bus:

	bus_put(bus);