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

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

Merge 4.4.96 into android-4.4 



Changes in 4.4.96
	workqueue: replace pool->manager_arb mutex with a flag
	ALSA: hda/realtek - Add support for ALC236/ALC3204
	ALSA: hda - fix headset mic problem for Dell machines with alc236
	ceph: unlock dangling spinlock in try_flush_caps()
	usb: xhci: Handle error condition in xhci_stop_device()
	spi: uapi: spidev: add missing ioctl header
	fuse: fix READDIRPLUS skipping an entry
	xen/gntdev: avoid out of bounds access in case of partial gntdev_mmap()
	Input: elan_i2c - add ELAN0611 to the ACPI table
	Input: gtco - fix potential out-of-bound access
	assoc_array: Fix a buggy node-splitting case
	scsi: zfcp: fix erp_action use-before-initialize in REC action trace
	scsi: sg: Re-fix off by one in sg_fill_request_table()
	can: sun4i: fix loopback mode
	can: kvaser_usb: Correct return value in printout
	can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages
	regulator: fan53555: fix I2C device ids
	x86/microcode/intel: Disable late loading on model 79
	ecryptfs: fix dereference of NULL user_key_payload
	Revert "drm: bridge: add DT bindings for TI ths8135"
	Linux 4.4.96

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 9e293db0 27e68f1b

Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
THS8135 Video DAC

-----------------



This is the binding for Texas Instruments THS8135 Video DAC bridge.



Required properties:



- compatible: Must be "ti,ths8135"



Required nodes:



This device has two video ports. Their connections are modelled using the OF

graph bindings specified in Documentation/devicetree/bindings/graph.txt.



- Video port 0 for RGB input

- Video port 1 for VGA output



Example

-------



vga-bridge {

	compatible = "ti,ths8135";

	#address-cells = <1>;

	#size-cells = <0>;



	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			reg = <0>;



			vga_bridge_in: endpoint {

				remote-endpoint = <&lcdc_out_vga>;

			};

		};



		port@1 {

			reg = <1>;



			vga_bridge_out: endpoint {

				remote-endpoint = <&vga_con_in>;

			};

		};

	};

};

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 95

SUBLEVEL = 96

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/x86/kernel/cpu/microcode/intel.c

+18 −0
Original line number Diff line number Diff line
@@ -990,6 +990,18 @@ static int get_ucode_fw(void *to, const void *from, size_t n) 
	return 0;

}



static bool is_blacklisted(unsigned int cpu)

{

	struct cpuinfo_x86 *c = &cpu_data(cpu);



	if (c->x86 == 6 && c->x86_model == 79) {

		pr_err_once("late loading on model 79 is disabled.\n");

		return true;

	}



	return false;

}



static enum ucode_state request_microcode_fw(int cpu, struct device *device,

					     bool refresh_fw)

{
@@ -998,6 +1010,9 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device, 
	const struct firmware *firmware;

	enum ucode_state ret;



	if (is_blacklisted(cpu))

		return UCODE_NFOUND;



	sprintf(name, "intel-ucode/%02x-%02x-%02x",

		c->x86, c->x86_model, c->x86_mask);
@@ -1022,6 +1037,9 @@ static int get_ucode_user(void *to, const void *from, size_t n) 
static enum ucode_state

request_microcode_user(int cpu, const void __user *buf, size_t size)

{

	if (is_blacklisted(cpu))

		return UCODE_NFOUND;



	return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);

}

drivers/input/mouse/elan_i2c_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1240,6 +1240,7 @@ static const struct acpi_device_id elan_acpi_id[] = { 
	{ "ELAN0605", 0 },

	{ "ELAN0609", 0 },

	{ "ELAN060B", 0 },

	{ "ELAN0611", 0 },

	{ "ELAN1000", 0 },

	{ }

};

drivers/input/tablet/gtco.c

+10 −7
Original line number Diff line number Diff line
@@ -231,13 +231,17 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report, 


	/* Walk  this report and pull out the info we need */

	while (i < length) {

		prefix = report[i];



		/* Skip over prefix */

		i++;

		prefix = report[i++];



		/* Determine data size and save the data in the proper variable */

		size = PREF_SIZE(prefix);

		size = (1U << PREF_SIZE(prefix)) >> 1;

		if (i + size > length) {

			dev_err(ddev,

				"Not enough data (need %d, have %d)\n",

				i + size, length);

			break;

		}



		switch (size) {

		case 1:

			data = report[i];
@@ -245,8 +249,7 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report, 
		case 2:

			data16 = get_unaligned_le16(&report[i]);

			break;

		case 3:

			size = 4;

		case 4:

			data32 = get_unaligned_le32(&report[i]);

			break;

		}