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

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

Merge 4.14.273 into android-4.14-stable 



Changes in 4.14.273
	sctp: fix the processing for INIT chunk
	sctp: fix the processing for INIT_ACK chunk
	xfrm: Fix xfrm migrate issues when address family changes
	arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity
	ARM: dts: rockchip: fix a typo on rk3288 crypto-controller
	MIPS: smp: fill in sibling and core maps earlier
	ARM: 9178/1: fix unmet dependency on BITREVERSE for HAVE_ARCH_BITREVERSE
	can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready
	atm: firestream: check the return value of ioremap() in fs_init()
	nl80211: Update bss channel on channel switch for P2P_CLIENT
	tcp: make tcp_read_sock() more robust
	sfc: extend the locking on mcdi->seqno
	kselftest/vm: fix tests build with old libc
	fs: sysfs_emit: Remove PAGE_SIZE alignment check
	efi: fix return value of __setup handlers
	net/packet: fix slab-out-of-bounds access in packet_recvmsg()
	atm: eni: Add check for dma_map_single
	net: handle ARPHRD_PIMREG in dev_is_mac_header_xmit()
	usb: gadget: rndis: prevent integer overflow in rndis_set_response()
	usb: gadget: Fix use-after-free bug by not setting udc->dev.driver
	Input: aiptek - properly check endpoint type
	perf symbols: Fix symbol size calculation condition
	Linux 4.14.273

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I98286ffad5f40e4f41f7001ec0ba5c6ccaf2532b
parents 00973e13 004bfaaf

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 272

SUBLEVEL = 273

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/boot/dts/rk3288.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ 
		status = "disabled";

	};



	crypto: cypto-controller@ff8a0000 {

	crypto: crypto@ff8a0000 {

		compatible = "rockchip,rk3288-crypto";

		reg = <0x0 0xff8a0000 0x0 0x4000>;

		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -484,6 +484,12 @@ 
};



&sdhci {

	/*

	 * Signal integrity isn't great at 200MHz but 100MHz has proven stable

	 * enough.

	 */

	max-frequency = <100000000>;



	bus-width = <8>;

	mmc-hs400-1_8v;

	mmc-hs400-enhanced-strobe;

arch/mips/kernel/smp.c

+3 −3
Original line number Diff line number Diff line
@@ -372,6 +372,9 @@ asmlinkage void start_secondary(void) 
	cpu = smp_processor_id();

	cpu_data[cpu].udelay_val = loops_per_jiffy;



	set_cpu_sibling_map(cpu);

	set_cpu_core_map(cpu);



	cpumask_set_cpu(cpu, &cpu_coherent_mask);

	notify_cpu_starting(cpu);
@@ -383,9 +386,6 @@ asmlinkage void start_secondary(void) 
	/* The CPU is running and counters synchronised, now mark it online */

	set_cpu_online(cpu, true);



	set_cpu_sibling_map(cpu);

	set_cpu_core_map(cpu);



	calculate_cpu_foreign_map();



	/*

drivers/atm/eni.c

+2 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,8 @@ DPRINTK("iovcnt = %d\n",skb_shinfo(skb)->nr_frags); 
	}

	paddr = dma_map_single(&eni_dev->pci_dev->dev,skb->data,skb->len,

			       DMA_TO_DEVICE);

	if (dma_mapping_error(&eni_dev->pci_dev->dev, paddr))

		return enq_next;

	ENI_PRV_PADDR(skb) = paddr;

	/* prepare DMA queue entries */

	j = 0;