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

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

Merge 3.18.93 into android-3.18 



Changes in 3.18.93
	gcov: disable for COMPILE_TEST
	scsi: sg: disable SET_FORCE_LOW_DMA
	futex: Prevent overflow by strengthen input validation
	ALSA: pcm: Remove yet superfluous WARN_ON()
	ALSA: hda - Apply the existing quirk to iMac 14,1
	af_key: fix buffer overread in verify_address_len()
	af_key: fix buffer overread in parse_exthdrs()
	pipe: avoid round_pipe_size() nr_pages overflow on 32-bit
	Input: 88pm860x-ts - fix child-node lookup
	Input: twl6040-vibra - fix DT node memory management
	Input: twl6040-vibra - fix child-node lookup
	Input: twl4030-vibra - fix ERROR: Bad of_node_put() warning
	Input: twl4030-vibra - fix sibling-node lookup
	phy: work around 'phys' references to usb-nop-xceiv devices
	ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7
	dm btree: fix serious bug in btree_split_beneath()
	dm thin metadata: THIN_MAX_CONCURRENT_LOCKS should be 6
	arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls
	MIPS: AR7: ensure the port type's FCR value is used
	x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels
	usbip: Fix implicit fallthrough warning
	can: af_can: can_rcv(): replace WARN_ONCE by pr_warn_once
	can: af_can: canfd_rcv(): replace WARN_ONCE by pr_warn_once
	mm/mmap.c: do not blow on PROT_NONE MAP_FIXED holes in the stack
	hwpoison, memcg: forcibly uncharge LRU pages
	ipc: msg, make msgrcv work with LONG_MIN
	netfilter: nf_ct_expect: remove the redundant slash when policy name is empty
	netfilter: restart search if moved to other chain
	netfilter: nf_conntrack_sip: extend request line validation
	netfilter: nfnetlink_cthelper: Add missing permission checks
	netfilter: xt_osf: Add missing permission checks
	reiserfs: fix race in prealloc discard
	reiserfs: don't preallocate blocks for extended attributes
	fs/fcntl: f_setown, avoid undefined behaviour
	scsi: libiscsi: fix shifting of DID_REQUEUE host byte
	eventpoll.h: add missing epoll event masks
	x86/microcode/intel: Extend BDW late-loading further with LLC size check
	net: tcp: close sock if net namespace is exiting
	dccp: don't restart ccid2_hc_tx_rto_expire() if sk in closed state
	net: igmp: fix source address check for IGMPv3 reports
	tcp: __tcp_hdrlen() helper
	net: qdisc_pkt_len_init() should be more robust
	pppoe: take ->needed_headroom of lower device into account on xmit
	sctp: do not allow the v4 socket to bind a v4mapped v6 address
	sctp: return error if the asoc has been peeled off in sctp_wait_for_sndbuf
	vmxnet3: repair memory leak
	net: Allow neigh contructor functions ability to modify the primary_key
	ipv6: fix udpv6 sendmsg crash caused by too small MTU
	ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY
	hrtimer: Reset hrtimer cpu base proper on CPU hotplug
	Linux 3.18.93

Change-Id: I843828f3cd866fcde50bd17f9da8f22ae28cdc74
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 44522309 90aaf2f2

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 92

SUBLEVEL = 93

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/boot/dts/kirkwood-openblocks_a7.dts

+8 −2
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ 
		};



		pinctrl: pin-controller@10000 {

			pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;

			pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header

				     &pmx_gpio_header_gpo>;

			pinctrl-names = "default";



			pmx_uart0: pmx-uart0 {
@@ -85,11 +86,16 @@ 
			 * ground.

			 */

			pmx_gpio_header: pmx-gpio-header {

				marvell,pins = "mpp17", "mpp7", "mpp29", "mpp28",

				marvell,pins = "mpp17", "mpp29", "mpp28",

					       "mpp35", "mpp34", "mpp40";

				marvell,function = "gpio";

			};



			pmx_gpio_header_gpo: pxm-gpio-header-gpo {

				marvell,pins = "mpp7";

				marvell,function = "gpo";

			};



			pmx_gpio_init: pmx-init {

				marvell,pins = "mpp38";

				marvell,function = "gpio";

arch/arm64/kvm/handle_exit.c

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run) 


	ret = kvm_psci_call(vcpu);

	if (ret < 0) {

		kvm_inject_undefined(vcpu);

		*vcpu_reg(vcpu, 0) = ~0UL;

		return 1;

	}
@@ -43,7 +43,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run) 


static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run)

{

	kvm_inject_undefined(vcpu);

	*vcpu_reg(vcpu, 0) = ~0UL;

	return 1;

}

arch/mips/ar7/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ static int __init ar7_register_uarts(void) 
	uart_port.type		= PORT_AR7;

	uart_port.uartclk	= clk_get_rate(bus_clk) / 2;

	uart_port.iotype	= UPIO_MEM32;

	uart_port.flags		= UPF_FIXED_TYPE;

	uart_port.flags		= UPF_FIXED_TYPE | UPF_BOOT_AUTOCONF;

	uart_port.regshift	= 2;



	uart_port.line		= 0;

arch/x86/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ static inline void sync_core(void) 
{

	int tmp;



#ifdef CONFIG_M486

#ifdef CONFIG_X86_32

	/*

	 * Do a CPUID if available, otherwise do a jump.  The jump

	 * can conveniently enough be the jump around CPUID.