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

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

Merge 4.19.156 into android-4.19-stable 



Changes in 4.19.156
	drm/i915: Break up error capture compression loops with cond_resched()
	tipc: fix use-after-free in tipc_bcast_get_mode
	ptrace: fix task_join_group_stop() for the case when current is traced
	cadence: force nonlinear buffers to be cloned
	chelsio/chtls: fix memory leaks caused by a race
	chelsio/chtls: fix always leaking ctrl_skb
	gianfar: Replace skb_realloc_headroom with skb_cow_head for PTP
	gianfar: Account for Tx PTP timestamp in the skb headroom
	net: usb: qmi_wwan: add Telit LE910Cx 0x1230 composition
	sctp: Fix COMM_LOST/CANT_STR_ASSOC err reporting on big-endian platforms
	sfp: Fix error handing in sfp_probe()
	blktrace: fix debugfs use after free
	btrfs: extent_io: Kill the forward declaration of flush_write_bio
	btrfs: extent_io: Move the BUG_ON() in flush_write_bio() one level up
	Revert "btrfs: flush write bio if we loop in extent_write_cache_pages"
	btrfs: flush write bio if we loop in extent_write_cache_pages
	btrfs: extent_io: Handle errors better in extent_write_full_page()
	btrfs: extent_io: Handle errors better in btree_write_cache_pages()
	btrfs: extent_io: add proper error handling to lock_extent_buffer_for_io()
	Btrfs: fix unwritten extent buffers and hangs on future writeback attempts
	btrfs: Don't submit any btree write bio if the fs has errors
	btrfs: Move btrfs_check_chunk_valid() to tree-check.[ch] and export it
	btrfs: tree-checker: Make chunk item checker messages more readable
	btrfs: tree-checker: Make btrfs_check_chunk_valid() return EUCLEAN instead of EIO
	btrfs: tree-checker: Check chunk item at tree block read time
	btrfs: tree-checker: Verify dev item
	btrfs: tree-checker: Fix wrong check on max devid
	btrfs: tree-checker: Enhance chunk checker to validate chunk profile
	btrfs: tree-checker: Verify inode item
	btrfs: tree-checker: fix the error message for transid error
	Fonts: Replace discarded const qualifier
	ALSA: usb-audio: Add implicit feedback quirk for Zoom UAC-2
	ALSA: usb-audio: add usb vendor id as DSD-capable for Khadas devices
	ALSA: usb-audio: Add implicit feedback quirk for Qu-16
	ALSA: usb-audio: Add implicit feedback quirk for MODX
	mm: mempolicy: fix potential pte_unmap_unlock pte error
	lib/crc32test: remove extra local_irq_disable/enable
	kthread_worker: prevent queuing delayed work from timer_fn when it is being canceled
	mm: always have io_remap_pfn_range() set pgprot_decrypted()
	gfs2: Wake up when sd_glock_disposal becomes zero
	ring-buffer: Fix recursion protection transitions between interrupt context
	ftrace: Fix recursion check for NMI test
	ftrace: Handle tracing when switching between context
	tracing: Fix out of bounds write in get_trace_buf
	futex: Handle transient "ownerless" rtmutex state correctly
	ARM: dts: sun4i-a10: fix cpu_alert temperature
	x86/kexec: Use up-to-dated screen_info copy to fill boot params
	of: Fix reserved-memory overlap detection
	blk-cgroup: Fix memleak on error path
	blk-cgroup: Pre-allocate tree node on blkg_conf_prep
	scsi: core: Don't start concurrent async scan on same host
	vsock: use ns_capable_noaudit() on socket create
	drm/vc4: drv: Add error handding for bind
	ACPI: NFIT: Fix comparison to '-ENXIO'
	vt: Disable KD_FONT_OP_COPY
	fork: fix copy_process(CLONE_PARENT) race with the exiting ->real_parent
	serial: 8250_mtk: Fix uart_get_baud_rate warning
	serial: txx9: add missing platform_driver_unregister() on error in serial_txx9_init
	USB: serial: cyberjack: fix write-URB completion race
	USB: serial: option: add Quectel EC200T module support
	USB: serial: option: add LE910Cx compositions 0x1203, 0x1230, 0x1231
	USB: serial: option: add Telit FN980 composition 0x1055
	USB: Add NO_LPM quirk for Kingston flash drive
	usb: mtu3: fix panic in mtu3_gadget_stop()
	ARC: stack unwinding: avoid indefinite looping
	Revert "ARC: entry: fix potential EFA clobber when TIF_SYSCALL_TRACE"
	PM: runtime: Resume the device earlier in __device_release_driver()
	perf/core: Fix a memory leak in perf_event_parse_addr_filter()
	tools: perf: Fix build error in v4.19.y
	net: dsa: read mac address from DT for slave device
	arm64: dts: marvell: espressobin: Add ethernet switch aliases
	Linux 4.19.156

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I87af8871465f54de0332fa74bc1f342b7fe99061
parents fa199896 53fff24a

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 155

SUBLEVEL = 156

EXTRAVERSION =

NAME = "People's Front"

arch/arc/kernel/entry.S

+11 −5
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ END(EV_Extension) 
tracesys:

	; save EFA in case tracer wants the PC of traced task

	; using ERET won't work since next-PC has already committed

	lr  r12, [efa]

	GET_CURR_TASK_FIELD_PTR   TASK_THREAD, r11

	st  r12, [r11, THREAD_FAULT_ADDR]	; thread.fault_address
@@ -198,9 +199,15 @@ tracesys_exit: 
; Breakpoint TRAP

; ---------------------------------------------

trap_with_param:

	mov r0, r12	; EFA in case ptracer/gdb wants stop_pc



	; stop_pc info by gdb needs this info

	lr  r0, [efa]

	mov r1, sp



	; Now that we have read EFA, it is safe to do "fake" rtie

	;   and get out of CPU exception mode

	FAKE_RET_FROM_EXCPN



	; Save callee regs in case gdb wants to have a look

	; SP will grow up by size of CALLEE Reg-File

	; NOTE: clobbers r12
@@ -227,10 +234,6 @@ ENTRY(EV_Trap) 


	EXCEPTION_PROLOGUE



	lr  r12, [efa]



	FAKE_RET_FROM_EXCPN



	;============ TRAP 1   :breakpoints

	; Check ECR for trap with arg (PROLOGUE ensures r9 has ECR)

	bmsk.f 0, r9, 7
@@ -238,6 +241,9 @@ ENTRY(EV_Trap) 


	;============ TRAP  (no param): syscall top level



	; First return from Exception to pure K mode (Exception/IRQs renabled)

	FAKE_RET_FROM_EXCPN



	; If syscall tracing ongoing, invoke pre-post-hooks

	GET_CURR_THR_INFO_FLAGS   r10

	btst r10, TIF_SYSCALL_TRACE

arch/arc/kernel/stacktrace.c

+6 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs, 
		int (*consumer_fn) (unsigned int, void *), void *arg)

{

#ifdef CONFIG_ARC_DW2_UNWIND

	int ret = 0;

	int ret = 0, cnt = 0;

	unsigned int address;

	struct unwind_frame_info frame_info;
@@ -135,6 +135,11 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs, 
			break;



		frame_info.regs.r63 = frame_info.regs.r31;



		if (cnt++ > 128) {

			printk("unwinder looping too long, aborting !\n");

			return 0;

		}

	}



	return address;		/* return the last address it saw */

arch/arm/boot/dts/sun4i-a10.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ 
			trips {

				cpu_alert0: cpu-alert0 {

					/* milliCelsius */

					temperature = <850000>;

					temperature = <85000>;

					hysteresis = <2000>;

					type = "passive";

				};

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts

+8 −4
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ 


	aliases {

		ethernet0 = &eth0;

		/* for dsa slave device */

		ethernet1 = &switch0port1;

		ethernet2 = &switch0port2;

		ethernet3 = &switch0port3;

		serial0 = &uart0;

		serial1 = &uart1;

	};
@@ -136,25 +140,25 @@ 
			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

			switch0port0: port@0 {

				reg = <0>;

				label = "cpu";

				ethernet = <&eth0>;

			};



			port@1 {

			switch0port1: port@1 {

				reg = <1>;

				label = "wan";

				phy-handle = <&switch0phy0>;

			};



			port@2 {

			switch0port2: port@2 {

				reg = <2>;

				label = "lan0";

				phy-handle = <&switch0phy1>;

			};



			port@3 {

			switch0port3: port@3 {

				reg = <3>;

				label = "lan1";

				phy-handle = <&switch0phy2>;