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

Commit bc94b7ac authored Nov 15, 2017 by Greg Kroah-Hartman

Merge 3.18.81 into android-3.18



Changes in 3.18.81
	video: fbdev: pmag-ba-fb: Remove bad `__init' annotation
	xen/netback: set default upper limit of tx/rx queues to 8
	ARM: dts: imx53-qsb-common: fix FEC pinmux config
	drm: drm_minor_register(): Clean up debugfs on failure
	ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
	iio: trigger: free trigger resource correctly
	dt-bindings: Add LEGO MINDSTORMS EV3 compatible specification
	dt-bindings: Add vendor prefix for LEGO
	phy: increase size of MII_BUS_ID_SIZE and bus_id
	serial: sh-sci: Fix register offsets for the IRDA serial port
	usb: hcd: initialize hcd->flags to 0 when rm hcd
	IPsec: do not ignore crypto err in ah4 input
	Input: mpr121 - handle multiple bits change of status register
	Input: mpr121 - set missing event capability
	IB/ipoib: Change list_del to list_del_init in the tx object
	KEYS: trusted: sanitize all key material
	KEYS: trusted: fix writing past end of buffer in trusted_read()
	crypto: x86/sha1-mb - fix panic due to unaligned access
	KEYS: fix NULL pointer dereference during ASN.1 parsing [ver #2]
	ARM: 8720/1: ensure dump_instr() checks addr_limit
	ALSA: seq: Fix OSS sysex delivery in OSS emulation
	ALSA: seq: Avoid invalid lockdep class warning
	MIPS: microMIPS: Fix incorrect mask in insn_table_MM
	MIPS: Fix CM region target definitions
	MIPS: AR7: Ensure that serial ports are properly set up
	rbd: use GFP_NOIO for parent stat and data requests
	can: c_can: don't indicate triple sampling support for D_CAN
	x86/oprofile/ppro: Do not use __this_cpu*() in preemptible context
	Linux 3.18.81

Change-Id: Ib1bc42de6a3fd1b291cc5c6d0a74e40fd0b2c4d6
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents 2c7126d2 37cdf969

Documentation/devicetree/bindings/arm/davinci.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,10 @@ EnBW AM1808 based CMC board
		Required root node properties:
		- compatible = "enbw,cmc", "ti,da850;

		LEGO MINDSTORMS EV3 (AM1808 based)
		Required root node properties:
		- compatible = "lego,ev3", "ti,da850";

		Generic DaVinci Boards
		----------------------

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ karo Ka-Ro electronics GmbH
		keymile Keymile GmbH
		lacie LaCie
		lantiq Lantiq Semiconductor
		lego LEGO Systems A/S
		lenovo Lenovo Group Ltd.
		lg LG Corporation
		linux Linux-specific binding

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 18
		SUBLEVEL = 80
		SUBLEVEL = 81
		EXTRAVERSION =
		NAME = Diseased Newt

arch/arm/boot/dts/imx53-qsb-common.dtsi

+10 −10

Original line number	Diff line number	Diff line
		@@ -215,16 +215,16 @@

		pinctrl_fec: fecgrp {
		fsl,pins = <
		MX53_PAD_FEC_MDC__FEC_MDC 0x80000000
		MX53_PAD_FEC_MDIO__FEC_MDIO 0x80000000
		MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x80000000
		MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x80000000
		MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x80000000
		MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x80000000
		MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x80000000
		MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
		MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x80000000
		MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x80000000
		MX53_PAD_FEC_MDC__FEC_MDC 0x4
		MX53_PAD_FEC_MDIO__FEC_MDIO 0x1fc
		MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x180
		MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x180
		MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x180
		MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x180
		MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x180
		MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x4
		MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x4
		MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x4
		>;
		};

arch/arm/configs/omap2plus_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,7 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=y
		CONFIG_SERIAL_8250=y
		CONFIG_SERIAL_8250_CONSOLE=y
		CONFIG_SERIAL_8250_NR_UARTS=32
		CONFIG_SERIAL_8250_RUNTIME_UARTS=6
		CONFIG_SERIAL_8250_EXTENDED=y
		CONFIG_SERIAL_8250_MANY_PORTS=y
		CONFIG_SERIAL_8250_SHARE_IRQ=y