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

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

Merge 5.4.169 into android11-5.4-lts 



Changes in 5.4.169
	net: usb: lan78xx: add Allied Telesis AT29M2-AF
	serial: 8250_fintek: Fix garbled text for console
	HID: holtek: fix mouse probing
	arm64: dts: allwinner: orangepi-zero-plus: fix PHY mode
	spi: change clk_disable_unprepare to clk_unprepare
	IB/qib: Fix memory leak in qib_user_sdma_queue_pkts()
	netfilter: fix regression in looped (broad|multi)cast's MAC handling
	qlcnic: potential dereference null pointer of rx_queue->page_ring
	net: accept UFOv6 packages in virtio_net_hdr_to_skb
	net: skip virtio_net_hdr_set_proto if protocol already set
	ipmi: Fix UAF when uninstall ipmi_si and ipmi_msghandler module
	bonding: fix ad_actor_system option setting to default
	fjes: Check for error irq
	drivers: net: smc911x: Check for error irq
	sfc: falcon: Check null pointer of rx_queue->page_ring
	Input: elantech - fix stack out of bound access in elantech_change_report_id()
	hwmon: (lm90) Fix usage of CONFIG2 register in detect function
	hwmon: (lm90) Add max6654 support to lm90 driver
	hwmon: (lm90) Add basic support for TI TMP461
	hwmon: (lm90) Introduce flag indicating extended temperature support
	hwmon: (lm90) Drop critical attribute support for MAX6654
	ALSA: jack: Check the return value of kstrdup()
	ALSA: drivers: opl3: Fix incorrect use of vp->state
	ALSA: hda/realtek: Amp init fixup for HP ZBook 15 G6
	Input: atmel_mxt_ts - fix double free in mxt_read_info_block
	ipmi: bail out if init_srcu_struct fails
	ipmi: ssif: initialize ssif_info->client early
	ipmi: fix initialization when workqueue allocation fails
	parisc: Correct completer in lws start
	x86/pkey: Fix undefined behaviour with PKRU_WD_BIT
	pinctrl: stm32: consider the GPIO offset to expose all the GPIO lines
	mmc: sdhci-tegra: Fix switch to HS400ES mode
	mmc: core: Disable card detect during shutdown
	ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling
	tee: optee: Fix incorrect page free bug
	f2fs: fix to do sanity check on last xattr entry in __f2fs_setxattr()
	usb: gadget: u_ether: fix race in setting MAC address in setup phase
	KVM: VMX: Fix stale docs for kvm-intel.emulate_invalid_guest_state
	mm: mempolicy: fix THP allocations escaping mempolicy restrictions
	pinctrl: mediatek: fix global-out-of-bounds issue
	hwmom: (lm90) Fix citical alarm status for MAX6680/MAX6681
	hwmon: (lm90) Do not report 'busy' status bit as alarm
	ax25: NPD bug when detaching AX25 device
	hamradio: defer ax25 kfree after unregister_netdev
	hamradio: improve the incomplete fix to avoid NPD
	phonet/pep: refuse to enable an unbound pipe
	Linux 5.4.169

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia0ba21539e02c0f161dcc058d6b1d6c99110f113
parents 3cd0728e 4ca2eaf1

Documentation/admin-guide/kernel-parameters.txt

+6 −2
Original line number Diff line number Diff line
@@ -2112,8 +2112,12 @@ 
			Default is 1 (enabled)



	kvm-intel.emulate_invalid_guest_state=

			[KVM,Intel] Enable emulation of invalid guest states

			Default is 0 (disabled)

			[KVM,Intel] Disable emulation of invalid guest state.

			Ignored if kvm-intel.enable_unrestricted_guest=1, as

			guest state is never invalid for unrestricted guests.

			This param doesn't apply to nested guests (L2), as KVM

			never emulates invalid L2 guest state.

			Default is 1 (enabled)



	kvm-intel.flexpriority=

			[KVM,Intel] Disable FlexPriority feature (TPR shadow).

Documentation/hwmon/lm90.rst

+31 −2
Original line number Diff line number Diff line
@@ -123,6 +123,18 @@ Supported chips: 


	       http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497



  * Maxim MAX6654



    Prefix: 'max6654'



    Addresses scanned: I2C 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b,



			   0x4c, 0x4d and 0x4e



    Datasheet: Publicly available at the Maxim website



	       https://www.maximintegrated.com/en/products/sensors/MAX6654.html



  * Maxim MAX6657



    Prefix: 'max6657'
@@ -253,6 +265,16 @@ Supported chips: 


	       http://www.ti.com/litv/pdf/sbos686



  * Texas Instruments TMP461



    Prefix: 'tmp461'



    Addresses scanned: I2C 0x48 through 0x4F



    Datasheet: Publicly available at TI website



	       https://www.ti.com/lit/gpn/tmp461



Author: Jean Delvare <jdelvare@suse.de>
@@ -301,6 +323,13 @@ ADT7461, ADT7461A, NCT1008: 
  * Extended temperature range (breaks compatibility)

  * Lower resolution for remote temperature



MAX6654:

  * Better local resolution

  * Selectable address

  * Remote sensor type selection

  * Extended temperature range

  * Extended resolution only available when conversion rate <= 1 Hz



MAX6657 and MAX6658:

  * Better local resolution

  * Remote sensor type selection
@@ -336,8 +365,8 @@ SA56004X: 


All temperature values are given in degrees Celsius. Resolution

is 1.0 degree for the local temperature, 0.125 degree for the remote

temperature, except for the MAX6657, MAX6658 and MAX6659 which have a

resolution of 0.125 degree for both temperatures.

temperature, except for the MAX6654, MAX6657, MAX6658 and MAX6659 which have

a resolution of 0.125 degree for both temperatures.



Each sensor has its own high and low limits, plus a critical limit.

Additionally, there is a relative hysteresis value common to both critical

Documentation/networking/bonding.txt

+6 −5
Original line number Diff line number Diff line
@@ -191,11 +191,12 @@ ad_actor_sys_prio 
ad_actor_system



	In an AD system, this specifies the mac-address for the actor in

	protocol packet exchanges (LACPDUs). The value cannot be NULL or

	multicast. It is preferred to have the local-admin bit set for this

	mac but driver does not enforce it. If the value is not given then

	system defaults to using the masters' mac address as actors' system

	address.

	protocol packet exchanges (LACPDUs). The value cannot be a multicast

	address. If the all-zeroes MAC is specified, bonding will internally

	use the MAC of the bond itself. It is preferred to have the

	local-admin bit set for this mac but driver does not enforce it. If

	the value is not given then system defaults to using the masters'

	mac address as actors' system address.



	This parameter has effect only in 802.3ad mode and is available through

	SysFs interface.

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 168

SUBLEVEL = 169

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/kernel/entry-armv.S

+3 −5
Original line number Diff line number Diff line
@@ -596,11 +596,9 @@ call_fpe: 
	tstne	r0, #0x04000000			@ bit 26 set on both ARM and Thumb-2

	reteq	lr

	and	r8, r0, #0x00000f00		@ mask out CP number

 THUMB(	lsr	r8, r8, #8		)

	mov	r7, #1

	add	r6, r10, #TI_USED_CP

 ARM(	strb	r7, [r6, r8, lsr #8]	)	@ set appropriate used_cp[]

 THUMB(	strb	r7, [r6, r8]		)	@ set appropriate used_cp[]

	add	r6, r10, r8, lsr #8		@ add used_cp[] array offset first

	strb	r7, [r6, #TI_USED_CP]		@ set appropriate used_cp[]

#ifdef CONFIG_IWMMXT

	@ Test if we need to give access to iWMMXt coprocessors

	ldr	r5, [r10, #TI_FLAGS]
@@ -609,7 +607,7 @@ call_fpe: 
	bcs	iwmmxt_task_enable

#endif

 ARM(	add	pc, pc, r8, lsr #6	)

 THUMB(	lsl	r8, r8, #2		)

 THUMB(	lsr	r8, r8, #6		)

 THUMB(	add	pc, r8			)

	nop