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

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

Merge 4.14.160 into android-4.14 



Changes in 4.14.160
	net: bridge: deny dev_set_mac_address() when unregistering
	net: dsa: fix flow dissection on Tx path
	net: ethernet: ti: cpsw: fix extra rx interrupt
	net: thunderx: start phy before starting autonegotiation
	openvswitch: support asymmetric conntrack
	tcp: md5: fix potential overestimation of TCP option space
	tipc: fix ordering of tipc module init and exit routine
	tcp: fix rejected syncookies due to stale timestamps
	tcp: tighten acceptance of ACKs not matching a child socket
	tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE()
	inet: protect against too small mtu values.
	nvme: host: core: fix precedence of ternary operator
	Revert "regulator: Defer init completion for a while after late_initcall"
	PCI/PM: Always return devices to D0 when thawing
	PCI: Fix Intel ACS quirk UPDCR register address
	PCI/MSI: Fix incorrect MSI-X masking on resume
	PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3
	xtensa: fix TLB sanity checker
	rpmsg: glink: Set tail pointer to 0 at end of FIFO
	rpmsg: glink: Fix reuse intents memory leak issue
	rpmsg: glink: Fix use after free in open_ack TIMEOUT case
	rpmsg: glink: Put an extra reference during cleanup
	rpmsg: glink: Fix rpmsg_register_device err handling
	rpmsg: glink: Don't send pending rx_done during remove
	rpmsg: glink: Free pending deferred work on remove
	CIFS: Respect O_SYNC and O_DIRECT flags during reconnect
	ARM: dts: s3c64xx: Fix init order of clock providers
	ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume()
	vfio/pci: call irq_bypass_unregister_producer() before freeing irq
	dma-buf: Fix memory leak in sync_file_merge()
	dm btree: increase rebalance threshold in __rebalance2()
	scsi: iscsi: Fix a potential deadlock in the timeout handler
	drm/radeon: fix r1xx/r2xx register checker for POT textures
	xhci: fix USB3 device initiated resume race with roothub autosuspend
	net: stmmac: use correct DMA buffer size in the RX descriptor
	net: stmmac: don't stop NAPI processing when dropping a packet
	Linux 4.14.160

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

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 159

SUBLEVEL = 160

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/boot/dts/s3c6410-mini6410.dts

+4 −0
Original line number Diff line number Diff line
@@ -167,6 +167,10 @@ 
	};

};



&clocks {

	clocks = <&fin_pll>;

};



&sdhci0 {

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

arch/arm/boot/dts/s3c6410-smdk6410.dts

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ 
	};

};



&clocks {

	clocks = <&fin_pll>;

};



&sdhci0 {

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

arch/arm/mach-tegra/reset-handler.S

+3 −3
Original line number Diff line number Diff line
@@ -56,16 +56,16 @@ ENTRY(tegra_resume) 
	cmp	r6, #TEGRA20

	beq	1f				@ Yes

	/* Clear the flow controller flags for this CPU. */

	cpu_to_csr_reg r1, r0

	cpu_to_csr_reg r3, r0

	mov32	r2, TEGRA_FLOW_CTRL_BASE

	ldr	r1, [r2, r1]

	ldr	r1, [r2, r3]

	/* Clear event & intr flag */

	orr	r1, r1, \

		#FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG

	movw	r0, #0x3FFD	@ enable, cluster_switch, immed, bitmaps

				@ & ext flags for CPU power mgnt

	bic	r1, r1, r0

	str	r1, [r2]

	str	r1, [r2, r3]

1:



	mov32	r9, 0xc09

arch/xtensa/mm/tlb.c

+2 −2
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ static int check_tlb_entry(unsigned w, unsigned e, bool dtlb) 
	unsigned tlbidx = w | (e << PAGE_SHIFT);

	unsigned r0 = dtlb ?

		read_dtlb_virtual(tlbidx) : read_itlb_virtual(tlbidx);

	unsigned r1 = dtlb ?

		read_dtlb_translation(tlbidx) : read_itlb_translation(tlbidx);

	unsigned vpn = (r0 & PAGE_MASK) | (e << PAGE_SHIFT);

	unsigned pte = get_pte_for_vaddr(vpn);

	unsigned mm_asid = (get_rasid_register() >> 8) & ASID_MASK;
@@ -233,8 +235,6 @@ static int check_tlb_entry(unsigned w, unsigned e, bool dtlb) 
	}



	if (tlb_asid == mm_asid) {

		unsigned r1 = dtlb ? read_dtlb_translation(tlbidx) :

			read_itlb_translation(tlbidx);

		if ((pte ^ r1) & PAGE_MASK) {

			pr_err("%cTLB: way: %u, entry: %u, mapping: %08x->%08x, PTE: %08x\n",

					dtlb ? 'D' : 'I', w, e, r0, r1, pte);