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

Unverified Commit dec5e5f3 authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.295 kernel 

Changes in 4.4.295: (38 commits)
        HID: introduce hid_is_using_ll_driver
        HID: add hid_is_usb() function to make it simpler for USB detection
        HID: add USB_HID dependancy to hid-prodikeys
        HID: add USB_HID dependancy to hid-chicony
        HID: add USB_HID dependancy on some USB HID drivers
        HID: wacom: fix problems when device is not a valid USB device
        HID: check for valid USB device for many HID drivers
        can: sja1000: fix use after free in ems_pcmcia_add_card()
        nfc: fix potential NULL pointer deref in nfc_genl_dump_ses_done
        mm: bdi: initialize bdi_min_ratio when bdi is unregistered
        ALSA: ctl: Fix copy of updated id with element read/write
        ALSA: pcm: oss: Fix negative period/buffer sizes
        ALSA: pcm: oss: Limit the period size to 16MB
        ALSA: pcm: oss: Handle missing errors in snd_pcm_oss_change_params*()
        tracefs: Have new files inherit the ownership of their parent
        can: pch_can: pch_can_rx_normal: fix use after free
        libata: add horkage for ASMedia 1092
        wait: add wake_up_pollfree()
        binder: use wake_up_pollfree()
        signalfd: use wake_up_pollfree()
        tracefs: Set all files to the same group ownership as the mount option
        block: fix ioprio_get(IOPRIO_WHO_PGRP) vs setuid(2)
        net: cdc_ncm: Allow for dwNtbOutMaxSize to be unset or zero
        net: altera: set a couple error code in probe()
        net: fec: only clear interrupt of handling queue in fec_enet_rx_queue()
        net, neigh: clear whole pneigh_entry at alloc time
        net/qla3xxx: fix an error code in ql_adapter_up()
        USB: gadget: detect too-big endpoint 0 requests
        USB: gadget: zero allocate endpoint 0 buffers
        usb: core: config: fix validation of wMaxPacketValue entries
        iio: stk3310: Don't return error code in interrupt handler
        iio: mma8452: Fix trigger reference couting
        iio: ltr501: Don't return error code in trigger handler
        iio: itg3200: Call iio_trigger_notify_done() on error
        iio: accel: kxcjk-1013: Fix possible memory leak in probe and remove
        irqchip/irq-gic-v3-its.c: Force synchronisation when issuing INVALL
        irqchip: nvic: Fix offset for Interrupt Priority Offsets
        Linux 4.4.295

Conflicts:
	drivers/android/binder.c
parents 86ca7d11 87ae08ae

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 294

SUBLEVEL = 295

EXTRAVERSION =

NAME = Blurry Fish Butt

block/ioprio.c

+3 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ SYSCALL_DEFINE2(ioprio_get, int, which, int, who) 
				pgrp = task_pgrp(current);

			else

				pgrp = find_vpid(who);

			read_lock(&tasklist_lock);

			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {

				tmpio = get_task_ioprio(p);

				if (tmpio < 0)
@@ -211,6 +212,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, int, who) 
				else

					ret = ioprio_best(ret, tmpio);

			} while_each_pid_thread(pgrp, PIDTYPE_PGID, p);

			read_unlock(&tasklist_lock);



			break;

		case IOPRIO_WHO_USER:

			uid = make_kuid(current_user_ns(), who);

drivers/android/binder.c

+9 −12
Original line number Diff line number Diff line
@@ -4626,23 +4626,20 @@ static int binder_thread_release(struct binder_proc *proc, 
	}



	/*

	 * If this thread used poll, make sure we remove the waitqueue

	 * from any epoll data structures holding it with POLLFREE.

	 * waitqueue_active() is safe to use here because we're holding

	 * the inner lock.

	 * If this thread used poll, make sure we remove the waitqueue from any

	 * poll data structures holding it.

	 */

	if ((thread->looper & BINDER_LOOPER_STATE_POLL) &&

	    waitqueue_active(&thread->wait)) {

		wake_up_poll(&thread->wait, POLLHUP | POLLFREE);

	}

	if (thread->looper & BINDER_LOOPER_STATE_POLL)

		wake_up_pollfree(&thread->wait);



	binder_inner_proc_unlock(thread->proc);



	/*

	 * This is needed to avoid races between wake_up_poll() above and

	 * and ep_remove_waitqueue() called for other reasons (eg the epoll file

	 * descriptor being closed); ep_remove_waitqueue() holds an RCU read

	 * lock, so we can be sure it's done after calling synchronize_rcu().

	 * This is needed to avoid races between wake_up_pollfree() above and

	 * someone else removing the last entry from the queue for other reasons

	 * (e.g. ep_remove_wait_queue() being called due to an epoll file

	 * descriptor being closed).  Such other users hold an RCU read lock, so

	 * we can be sure they're done after we call synchronize_rcu().

	 */

	if (thread->looper & BINDER_LOOPER_STATE_POLL)

		synchronize_rcu();

drivers/ata/libata-core.c

+2 −0
Original line number Diff line number Diff line
@@ -4153,6 +4153,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	{ " 2GB ATA Flash Disk", "ADMA428M",	ATA_HORKAGE_NODMA },

	/* Odd clown on sil3726/4726 PMPs */

	{ "Config  Disk",	NULL,		ATA_HORKAGE_DISABLE },

	/* Similar story with ASMedia 1092 */

	{ "ASMT109x- Config",	NULL,		ATA_HORKAGE_DISABLE },



	/* Weird ATAPI devices */

	{ "TORiSAN DVD-ROM DRD-N216", NULL,	ATA_HORKAGE_MAX_SEC_128 },

drivers/hid/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -172,14 +172,14 @@ config HID_CHERRY 


config HID_CHICONY

	tristate "Chicony devices"

	depends on HID

	depends on USB_HID

	default !EXPERT

	---help---

	Support for Chicony Tactical pad and special keys on Chicony keyboards.



config HID_CORSAIR

	tristate "Corsair devices"

	depends on HID && USB && LEDS_CLASS

	depends on USB_HID && LEDS_CLASS

	---help---

	Support for Corsair devices that are not fully compliant with the

	HID standard.
@@ -189,7 +189,7 @@ config HID_CORSAIR 


config HID_PRODIKEYS

	tristate "Prodikeys PC-MIDI Keyboard support"

	depends on HID && SND

	depends on USB_HID && SND

	select SND_RAWMIDI

	---help---

	Support for Prodikeys PC-MIDI Keyboard device support.
@@ -395,7 +395,7 @@ config HID_LENOVO 


config HID_LOGITECH

	tristate "Logitech devices"

	depends on HID

	depends on USB_HID

	default !EXPERT

	---help---

	Support for Logitech devices that are not fully compliant with HID standard.
@@ -710,7 +710,7 @@ config HID_SAITEK 


config HID_SAMSUNG

	tristate "Samsung InfraRed remote control or keyboards"

	depends on HID

	depends on USB_HID

	---help---

	Support for Samsung InfraRed remote control or keyboards.