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

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

Merge 3.18.74 into android-3.18 



Changes in 3.18.74
	drm: bridge: add DT bindings for TI ths8135
	RDS: RDMA: Fix the composite message user notification
	MIPS: Ensure bss section ends on a long-aligned address
	sh_eth: use correct name for ECMR_MPDE bit
	hwmon: (gl520sm) Fix overflows and crash seen when writing into limit attributes
	ARM: 8635/1: nommu: allow enabling REMAP_VECTORS_TO_RAM
	tty: goldfish: Fix a parameter of a call to free_irq
	IB/ipoib: Fix deadlock over vlan_mutex
	IB/ipoib: rtnl_unlock can not come after free_netdev
	IB/ipoib: Replace list_del of the neigh->list with list_del_init
	USB: serial: mos7720: fix control-message error handling
	USB: serial: mos7840: fix control-message error handling
	partitions/efi: Fix integer overflow in GPT size calculation
	audit: log 32-bit socketcalls
	net: core: Prevent from dereferencing null pointer when releasing SKB
	net/packet: check length in getsockopt() called with PACKET_HDRLEN
	team: fix memory leaks
	usb: plusb: Add support for PL-27A1
	mmc: sdio: fix alignment issue in struct sdio_func
	netfilter: invoke synchronize_rcu after set the _hook_ to NULL
	exynos-gsc: Do not swap cb/cr for semi planar formats
	netfilter: nfnl_cthelper: fix incorrect helper->expect_class_max
	parisc: perf: Fix potential NULL pointer dereference
	rds: ib: add error handle
	md/raid10: submit bio directly to replacement disk
	xfs: remove kmem_zalloc_greedy
	libata: transport: Remove circular dependency at free time
	IB/qib: fix false-postive maybe-uninitialized warning
	ALSA: au88x0: avoid theoretical uninitialized access
	ttpci: address stringop overflow warning
	staging: nvec: remove duplicated const
	crypto: algif_skcipher - Load TX SG list after waiting
	mpi: Fix NULL ptr dereference in mpi_powm() [ver #3]
	Linux 3.18.74

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents dc2ed84e ac005830

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

0 → 100644
+46 −0
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 = 3

PATCHLEVEL = 18

SUBLEVEL = 73

SUBLEVEL = 74

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/Kconfig-nommu

+1 −2
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ config PROCESSOR_ID 
	  used instead of the auto-probing which utilizes the register.



config REMAP_VECTORS_TO_RAM

	bool 'Install vectors to the beginning of RAM' if DRAM_BASE

	depends on DRAM_BASE

	bool 'Install vectors to the beginning of RAM'

	help

	  The kernel needs to change the hardware exception vectors.

	  In nommu mode, the hardware exception vectors are normally

arch/mips/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ SECTIONS 
	 * Force .bss to 64K alignment so that .bss..swapper_pg_dir

	 * gets that alignment.	 .sbss should be empty, so there will be

	 * no holes after __init_end. */

	BSS_SECTION(0, 0x10000, 0)

	BSS_SECTION(0, 0x10000, 8)



	_end = . ;

arch/parisc/kernel/perf.c

+49 −45
Original line number Diff line number Diff line
@@ -195,8 +195,8 @@ static int perf_config(uint32_t *image_ptr); 
static int perf_release(struct inode *inode, struct file *file);

static int perf_open(struct inode *inode, struct file *file);

static ssize_t perf_read(struct file *file, char __user *buf, size_t cnt, loff_t *ppos);

static ssize_t perf_write(struct file *file, const char __user *buf, size_t count, 

	loff_t *ppos);

static ssize_t perf_write(struct file *file, const char __user *buf,

	size_t count, loff_t *ppos);

static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

static void perf_start_counters(void);

static int perf_stop_counters(uint32_t *raddr);
@@ -298,8 +298,8 @@ static ssize_t perf_read(struct file *file, char __user *buf, size_t cnt, loff_t 
 * called on the processor that the download should happen

 * on.

 */

static ssize_t perf_write(struct file *file, const char __user *buf, size_t count, 

	loff_t *ppos)

static ssize_t perf_write(struct file *file, const char __user *buf,

	size_t count, loff_t *ppos)

{

	int err;

	size_t image_size;
@@ -808,6 +808,10 @@ static int perf_write_image(uint64_t *memaddr) 
	}



	runway = ioremap_nocache(cpu_device->hpa.start, 4096);

	if (!runway) {

		pr_err("perf_write_image: ioremap failed!\n");

		return -ENOMEM;

	}



	/* Merge intrigue bits into Runway STATUS 0 */

	tmp64 = __raw_readq(runway + RUNWAY_STATUS) & 0xffecfffffffffffful;