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

Commit 3bda2b55 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.4.96 (aed4c54a) into msm-4.4 



* refs/heads/tmp-aed4c54a
  Linux 4.4.96
  Revert "drm: bridge: add DT bindings for TI ths8135"
  ecryptfs: fix dereference of NULL user_key_payload
  x86/microcode/intel: Disable late loading on model 79
  regulator: fan53555: fix I2C device ids
  can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages
  can: kvaser_usb: Correct return value in printout
  can: sun4i: fix loopback mode
  scsi: sg: Re-fix off by one in sg_fill_request_table()
  scsi: zfcp: fix erp_action use-before-initialize in REC action trace
  assoc_array: Fix a buggy node-splitting case
  Input: gtco - fix potential out-of-bound access
  Input: elan_i2c - add ELAN0611 to the ACPI table
  xen/gntdev: avoid out of bounds access in case of partial gntdev_mmap()
  fuse: fix READDIRPLUS skipping an entry
  spi: uapi: spidev: add missing ioctl header
  usb: xhci: Handle error condition in xhci_stop_device()
  ceph: unlock dangling spinlock in try_flush_caps()
  ALSA: hda - fix headset mic problem for Dell machines with alc236
  ALSA: hda/realtek - Add support for ALC236/ALC3204
  workqueue: replace pool->manager_arb mutex with a flag
  sched: EAS: upmigrate misfit current task
  sched: avoid pushing tasks to an offline CPU
  sched: Extend active balance to accept 'push_task' argument
  Revert "sched/core: Warn if ENERGY_AWARE is enabled but data is missing"
  Revert "sched/core: fix have_sched_energy_data build warning"
  FROMLIST: kbuild: clang: fix build failures with sparse check
  Revert "Revert "UPSTREAM: efi/libstub/arm64: Set -fpie when building the EFI stub""
  BACKPORT: efi/libstub: Unify command line param parsing

Conflicts:
	drivers/usb/host/xhci-hub.c
	kernel/sched/core.c
	kernel/sched/fair.c

Change-Id: Ie36ce5de516f02b2d553043009d9afee64e7ff24
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents aaf4841e aed4c54a

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

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

PATCHLEVEL = 4

SUBLEVEL = 95

SUBLEVEL = 96

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -700,11 +700,11 @@ KBUILD_CFLAGS += $(stackp-flag) 
ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TRIPLE    ?= $(CROSS_COMPILE)

CLANG_TARGET	:= -target $(notdir $(CLANG_TRIPLE:%-=%))

CLANG_TARGET	:= --target=$(notdir $(CLANG_TRIPLE:%-=%))

GCC_TOOLCHAIN	:= $(realpath $(dir $(shell which $(LD)))/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= -gcc-toolchain $(GCC_TOOLCHAIN)

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

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

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/firmware/efi/libstub/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 \ 
				   -fPIC -fno-strict-aliasing -mno-red-zone \

				   -mno-mmx -mno-sse



cflags-$(CONFIG_ARM64)		:= $(subst -pg,,$(KBUILD_CFLAGS))

cflags-$(CONFIG_ARM64)		:= $(subst -pg,,$(KBUILD_CFLAGS)) -fpie

cflags-$(CONFIG_ARM)		:= $(subst -pg,,$(KBUILD_CFLAGS)) \

				   -fno-builtin -fpic -mno-single-pic-base

drivers/firmware/efi/libstub/arm-stub.c

+7 −17
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 


#include "efistub.h"



bool __nokaslr;



static int efi_secureboot_enabled(efi_system_table_t *sys_table_arg)

{

	static efi_guid_t const var_guid = EFI_GLOBAL_VARIABLE_GUID;
@@ -221,18 +219,6 @@ unsigned long efi_entry(void *handle, efi_system_table_t *sys_table, 
		goto fail;

	}



	/* check whether 'nokaslr' was passed on the command line */

	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) {

		static const u8 default_cmdline[] = CONFIG_CMDLINE;

		const u8 *str, *cmdline = cmdline_ptr;



		if (IS_ENABLED(CONFIG_CMDLINE_FORCE))

			cmdline = default_cmdline;

		str = strstr(cmdline, "nokaslr");

		if (str == cmdline || (str > cmdline && *(str - 1) == ' '))

			__nokaslr = true;

	}



	status = handle_kernel_image(sys_table, image_addr, &image_size,

				     &reserve_addr,

				     &reserve_size,
@@ -242,9 +228,13 @@ unsigned long efi_entry(void *handle, efi_system_table_t *sys_table, 
		goto fail_free_cmdline;

	}



	status = efi_parse_options(cmdline_ptr);

	if (status != EFI_SUCCESS)

		pr_efi_err(sys_table, "Failed to parse EFI cmdline options\n");

	if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) ||

	    IS_ENABLED(CONFIG_CMDLINE_FORCE) ||

	    cmdline_size == 0)

		efi_parse_options(CONFIG_CMDLINE);



	if (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && cmdline_size > 0)

		efi_parse_options(cmdline_ptr);



	/*

	 * Unauthenticated device tree data is a security hazard, so