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

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

Merge 3.18.82 into android-3.18 



Changes in 3.18.82
	Revert "ceph: unlock dangling spinlock in try_flush_caps()"
	mac80211: accept key reinstall without changing anything
	mac80211: use constant time comparison with keys
	mac80211: don't compare TKIP TX MIC key in reinstall prevention
	usb: usbtest: fix NULL pointer dereference
	Input: ims-psu - check if CDC union descriptor is sane
	Revert "ARM: dts: imx53-qsb-common: fix FEC pinmux config"
	tun/tap: sanitize TUNSETSNDBUF input
	tcp: fix tcp_mtu_probe() vs highest_sack
	l2tp: check ps->sock before running pppol2tp_session_ioctl()
	tun: call dev_get_valid_name() before register_netdevice()
	sctp: add the missing sock_owned_by_user check in sctp_icmp_redirect
	net/unix: don't show information about sockets from other namespaces
	tun: allow positive return values on dev_get_valid_name() call
	sctp: reset owner sk for data chunks on out queues when migrating a sock
	ipv6: flowlabel: do not leave opt->tot_len with garbage
	ipip: only increase err_count for some certain type icmp in ipip_err
	ip6_gre: only increase err_count for some certain type icmpv6 in ip6gre_err
	security/keys: add CONFIG_KEYS_COMPAT to Kconfig
	target/iscsi: Fix iSCSI task reassignment handling
	Linux 3.18.82

Change-Id: I860d49ec77ab43d00514c308fcec80a8ea73c993
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 458359bf 2f95dcc3

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 81

SUBLEVEL = 82

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		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

				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

			>;

		};

arch/powerpc/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -1070,11 +1070,6 @@ source "arch/powerpc/Kconfig.debug" 


source "security/Kconfig"



config KEYS_COMPAT

	bool

	depends on COMPAT && KEYS

	default y



source "crypto/Kconfig"



config PPC_LIB_RHEAP

arch/s390/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -332,9 +332,6 @@ config COMPAT 
config SYSVIPC_COMPAT

	def_bool y if COMPAT && SYSVIPC



config KEYS_COMPAT

	def_bool y if COMPAT && KEYS



config SMP

	def_bool y

	prompt "Symmetric multi-processing support"

arch/sparc/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -542,9 +542,6 @@ config SYSVIPC_COMPAT 
	depends on COMPAT && SYSVIPC

	default y



config KEYS_COMPAT

	def_bool y if COMPAT && KEYS



endmenu



source "net/Kconfig"